From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 13 Dec 2011 08:53:08 +0000 (+0000)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: next-20111214~100^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17f2d402ec71f45a866643ca0e93157b12f2e190;p=karo-tx-linux.git

Merge branch 'devel-stable' into for-next

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

17f2d402ec71f45a866643ca0e93157b12f2e190
diff --cc arch/arm/kernel/setup.c
index 8fc2c8fcbdc6,5c7094e8f6e9..095d6611c84e
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -902,14 -911,8 +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;