41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
Queued as http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7204%2F1
|
|
|
|
arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
|
|
|
|
arm_dma_zone_size is used by arm_bootmem_free() which is called by
|
|
paging_init(). Thus it needs to be set before calling it.
|
|
|
|
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
|
|
Acked-by: Nicolas Pitre <nico@linaro.org>
|
|
CC: stable@kernel.org
|
|
Index: linux-2.6/arch/arm/kernel/setup.c
|
|
===================================================================
|
|
--- linux-2.6.orig/arch/arm/kernel/setup.c 2011-12-11 17:48:29.000000000 +0100
|
|
+++ linux-2.6/arch/arm/kernel/setup.c 2011-12-11 17:57:03.000000000 +0100
|
|
@@ -904,6 +904,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 +940,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
|