From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jan 2012 13:24:33 +0000 (+0000)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: v3.12-rc1~4154^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e0e943436912ffe0848ece58167edfe754edb96;p=kernel%2Fkernel-generic.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
---

2e0e943436912ffe0848ece58167edfe754edb96
diff --cc arch/arm/kernel/setup.c
index 8fc2c8f,5c7094e..095d661
--- 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;
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
index 7119b87,83c2709..a4e6ca0
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@@ -607,9 -605,8 +605,9 @@@ struct sys_timer ag5evm_timer = 
  
  MACHINE_START(AG5EVM, "ag5evm")
  	.map_io		= ag5evm_map_io,
 +	.nr_irqs	= NR_IRQS_LEGACY,
  	.init_irq	= sh73a0_init_irq,
- 	.handle_irq	= shmobile_handle_irq_gic,
+ 	.handle_irq	= gic_handle_irq,
  	.init_machine	= ag5evm_init,
  	.timer		= &ag5evm_timer,
  MACHINE_END
diff --cc arch/arm/mach-shmobile/board-kota2.c
index f44150b,1b4439d..857ceee
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@@ -549,9 -447,8 +549,9 @@@ struct sys_timer kota2_timer = 
  
  MACHINE_START(KOTA2, "kota2")
  	.map_io		= kota2_map_io,
 -	.init_irq	= kota2_init_irq,
 +	.nr_irqs	= NR_IRQS_LEGACY,
 +	.init_irq	= sh73a0_init_irq,
- 	.handle_irq	= shmobile_handle_irq_gic,
+ 	.handle_irq	= gic_handle_irq,
  	.init_machine	= kota2_init,
  	.timer		= &kota2_timer,
  MACHINE_END