Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable

2011-07-18 23:00:42 +01:00
parent 4aa96ccf9e fb89fcfb15
commit 07f1c295de
55 changed files with 309 additions and 293 deletions
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -918,6 +918,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