From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jan 2012 12:56:44 +0000 (+0000)
Subject: Merge branch 'restart-cleanup' into restart
X-Git-Tag: v3.3-rc1~144^2^2~54
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4045407fd7740642b18bc802e8bab064e79a61e5;p=linux.git

Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c
---

4045407fd7740642b18bc802e8bab064e79a61e5
diff --cc arch/arm/kernel/setup.c
index a753880e984b,8fc2c8fcbdc6..8b13930cdb0a
--- a/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;
  
+ #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;