summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-06 04:28:08 +0200
committerNicolas Pitre <nico@fluxnic.net>2011-07-18 21:29:57 +0200
commit4fddcaebb9014b4814f859420595cc419400fba6 (patch)
tree367d45a9bb5ed931c47c217182bf51e7a555b501 /arch/arm/kernel
parentARM: change ARM_DMA_ZONE_SIZE into a variable (diff)
downloadlinux-4fddcaebb9014b4814f859420595cc419400fba6.tar.xz
linux-4fddcaebb9014b4814f859420595cc419400fba6.zip
ARM: add dma_zone_size to the machine_desc structure
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index ed11fb08b05a..e0db84d7e384 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -916,6 +916,12 @@ void __init setup_arch(char **cmdline_p)
cpu_init();
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