Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c

diff --cc arch/arm/include/asm/mach/arch.h
Simple merge

diff --cc arch/arm/kernel/machine_kexec.c
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/kernel/setup.c
index a753880e984b9c74822763963a0ec43e5db8d60a,8fc2c8fcbdc646a4a8babecbf4a758f88e6d8d60..8b13930cdb0a689c1900a7ad2e568d2bdedda1b8
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -902,8 -902,14 +902,14 @@@ void __init setup_arch(char **cmdline_p
        machine_desc = mdesc;
        machine_name = mdesc->name;
  
 -      if (mdesc->soft_reboot)
 -              reboot_setup("s");
+ #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->restart_mode)
 +              reboot_setup(&mdesc->restart_mode);
  
        init_mm.start_code = (unsigned long) _text;
        init_mm.end_code   = (unsigned long) _etext;

diff --cc arch/arm/plat-mxc/system.c
Simple merge