diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/mach/arch.h | 4 | ||||
-rw-r--r-- | arch/arm/kernel/setup.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 946f4d778f71..3281fb4b12e3 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h | |||
@@ -23,6 +23,10 @@ struct machine_desc { | |||
23 | 23 | ||
24 | unsigned int nr_irqs; /* number of IRQs */ | 24 | unsigned int nr_irqs; /* number of IRQs */ |
25 | 25 | ||
26 | #ifdef CONFIG_ZONE_DMA | ||
27 | unsigned long dma_zone_size; /* size of DMA-able area */ | ||
28 | #endif | ||
29 | |||
26 | unsigned int video_start; /* start of video RAM */ | 30 | unsigned int video_start; /* start of video RAM */ |
27 | unsigned int video_end; /* end of video RAM */ | 31 | unsigned int video_end; /* end of video RAM */ |
28 | 32 | ||
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 |