From: Olof Johansson Date: Tue, 20 Dec 2011 05:17:02 +0000 (-0800) Subject: Merge branch 'fixes' into for-next X-Git-Tag: next-20111221~100^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87b22f773f5953f11ad4d41749b5c1780eb09dcc;p=karo-tx-linux.git Merge branch 'fixes' into for-next Conflicts: arch/arm/kernel/setup.c --- 87b22f773f5953f11ad4d41749b5c1780eb09dcc diff --cc arch/arm/kernel/setup.c index 5c7094e8f6e9,8fc2c8fcbdc6..095d6611c84e --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@@ -911,8 -902,14 +909,14 @@@ void __init setup_arch(char **cmdline_p machine_desc = mdesc; machine_name = mdesc->name; + #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 - if (mdesc->soft_reboot) - reboot_setup("s"); + if (mdesc->restart_mode) + reboot_setup(&mdesc->restart_mode); init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext;