diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-19 00:00:42 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-19 00:00:42 +0200 |
| commit | 07f1c295de593ec0b0dca3092299c048c03374da (patch) | |
| tree | ad8f291e550b3315f84c07e9f543e25adcf95dc3 /arch/arm/kernel/setup.c | |
| parent | Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable (diff) | |
| parent | ARM: ARM_DMA_ZONE_SIZE is no more (diff) | |
| download | linux-07f1c295de593ec0b0dca3092299c048c03374da.tar.xz linux-07f1c295de593ec0b0dca3092299c048c03374da.zip | |
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -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 7cc11c07adda..f59653d67652 100644 --- 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 |