diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-13 09:28:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-13 09:28:23 -0800 |
| commit | 442ee5a942834431ccf0b412e3cf7bb9ae97ff4e (patch) | |
| tree | 77a9f87265c97e0df5449fe6888df393f028aea2 /arch/arm/kernel/setup.c | |
| parent | linux/log2.h: Fix rounddown_pow_of_two(1) (diff) | |
| parent | ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier (diff) | |
| download | linux-442ee5a942834431ccf0b412e3cf7bb9ae97ff4e.tar.gz linux-442ee5a942834431ccf0b412e3cf7bb9ae97ff4e.zip | |
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
ARM: 7185/1: perf: don't assign platform_device on unsupported CPUs
ARM: 7187/1: fix unwinding for XIP kernels
ARM: 7186/1: fix Kconfig issue with PHYS_OFFSET and !MMU
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 3448a3f9cc8c..8fc2c8fcbdc6 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -895,8 +895,6 @@ void __init setup_arch(char **cmdline_p) { struct machine_desc *mdesc; - unwind_init(); - setup_processor(); mdesc = setup_machine_fdt(__atags_pointer); if (!mdesc) @@ -904,6 +902,12 @@ void __init setup_arch(char **cmdline_p) machine_desc = mdesc; machine_name = mdesc->name; +#ifdef CONFIG_ZONE_DMA + if (mdesc->dma_zone_size) { + extern unsigned long arm_dma_zone_size; + arm_dma_zone_size = mdesc->dma_zone_size; + } +#endif if (mdesc->soft_reboot) reboot_setup("s"); @@ -934,12 +938,6 @@ void __init setup_arch(char **cmdline_p) tcm_init(); -#ifdef CONFIG_ZONE_DMA - if (mdesc->dma_zone_size) { - extern unsigned long arm_dma_zone_size; - arm_dma_zone_size = mdesc->dma_zone_size; - } -#endif #ifdef CONFIG_MULTI_IRQ_HANDLER handle_arch_irq = mdesc->handle_irq; #endif |