diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:28:08 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-07-18 15:29:57 -0400 |
commit | 4fddcaebb9014b4814f859420595cc419400fba6 (patch) | |
tree | 367d45a9bb5ed931c47c217182bf51e7a555b501 /arch/arm/kernel | |
parent | 650320181a08b64d4421c65c639cf47ad8cc2cd6 (diff) |
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.c | 6 |
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) | |||
916 | cpu_init(); | 916 | cpu_init(); |
917 | tcm_init(); | 917 | tcm_init(); |
918 | 918 | ||
919 | #ifdef CONFIG_ZONE_DMA | ||
920 | if (mdesc->dma_zone_size) { | ||
921 | extern unsigned long arm_dma_zone_size; | ||
922 | arm_dma_zone_size = mdesc->dma_zone_size; | ||
923 | } | ||
924 | #endif | ||
919 | #ifdef CONFIG_MULTI_IRQ_HANDLER | 925 | #ifdef CONFIG_MULTI_IRQ_HANDLER |
920 | handle_arch_irq = mdesc->handle_irq; | 926 | handle_arch_irq = mdesc->handle_irq; |
921 | #endif | 927 | #endif |