commit 4fddcaebb9014b4814f859420595cc419400fba6
author Nicolas Pitre <nicolas.pitre@linaro.org> Tue Jul 05 22:28:08 2011 -0400
committer Nicolas Pitre <nico@fluxnic.net> Mon Jul 18 15:29:57 2011 -0400
tree 367d45a9bb5ed931c47c217182bf51e7a555b501
parent 650320181a08b64d4421c65c639cf47ad8cc2cd6

ARM: add dma_zone_size to the machine_desc structure

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>

arch/arm/kernel/setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index ed11fb0..e0db84d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -916,6 +916,12 @@
 	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