From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 7 Jan 2011 01:51:35 +0000 (+0900)
Subject: Merge branch 'rmobile/smp' into rmobile-latest
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9d728f528f9548c8dd013899b23e662fa7b6bca;p=linux-beck.git

Merge branch 'rmobile/smp' into rmobile-latest

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-shmobile/include/mach/entry-macro-intc.S

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

e9d728f528f9548c8dd013899b23e662fa7b6bca
diff --cc arch/arm/Kconfig
index 7daab42eb54f,05675c14ddf5..e2f801167593
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1256,11 -1210,11 +1256,11 @@@ config SM
  	depends on EXPERIMENTAL
  	depends on GENERIC_CLOCKEVENTS
  	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 -		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
 +		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
  		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
- 		 ARCH_MSM_SCORPIONMP
 -		 ARCH_SHMOBILE
++		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
  	select USE_GENERIC_SMP_HELPERS
 -	select HAVE_ARM_SCU
 +	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
  	help
  	  This enables support for systems with more than one CPU. If you have
  	  a system with only one CPU, like most personal computers, say N. If
diff --cc arch/arm/mach-shmobile/Makefile
index d16165a7b487,995f39bde909..e2507f66f9d5
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -9,8 -9,14 +9,14 @@@ obj-y				:= timer.o console.o clock.o p
  obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o
  obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o
  obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o
 -obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o
 +obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
  
+ # SMP objects
+ smp-y				:= platsmp.o headsmp.o
+ smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
+ smp-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o
+ smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o
+ 
  # Pinmux setup
  pfc-y				:=
  pfc-$(CONFIG_ARCH_SH7367)	+= pfc-sh7367.o
diff --cc arch/arm/mach-shmobile/include/mach/common.h
index 9f46cf5ca75f,b8f1f62bce97..013ac0ee8256
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -3,10 -3,9 +3,11 @@@
  
  extern struct sys_timer shmobile_timer;
  extern void shmobile_setup_console(void);
+ extern void shmobile_secondary_vector(void);
  struct clk;
  extern int clk_init(void);
 +extern void shmobile_handle_irq_intc(struct pt_regs *);
 +extern void shmobile_handle_irq_gic(struct pt_regs *);
  
  extern void sh7367_init_irq(void);
  extern void sh7367_add_early_devices(void);