diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
| commit | 13ea3300100ec3461560b1e061033cd167333a86 (patch) | |
| tree | c60a016a06c488adada6959516e2a2de96d6d7d3 /arch/arm/kernel/setup.c | |
| parent | b7ed6b88b2a5e961eeb939ef637a3cbb435a23a7 (diff) | |
| parent | 68e67d97e1f91ed11e041b67f3a1336f518c608f (diff) | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 6a1b8a81b1a..987a7f5bce5 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -873,8 +873,6 @@ void __init setup_arch(char **cmdline_p) machine_desc = mdesc; machine_name = mdesc->name; - setup_dma_zone(mdesc); - if (mdesc->reboot_mode != REBOOT_HARD) reboot_mode = mdesc->reboot_mode; @@ -892,6 +890,7 @@ void __init setup_arch(char **cmdline_p) sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL); early_paging_init(mdesc, lookup_processor_type(read_cpuid_id())); + setup_dma_zone(mdesc); sanity_check_meminfo(); arm_memblock_init(&meminfo, mdesc); |