ARM: mach-shmobile: Allow SoC specific CPU kill code

Add the function shmobile_platform_kill_cpu() to allow
SoC specific code to tie in their CPU shutdown code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/arm/mach-shmobile/hotplug.c b/arch/arm/mach-shmobile/hotplug.c
index 238a0d97d2d5d110ba6a8d70762c8fa26d62e474..aee3a1088a5a5995f0ff9ee322f8b55a2bd151ed 100644 (file)
--- a/arch/arm/mach-shmobile/hotplug.c
+++ b/arch/arm/mach-shmobile/hotplug.c
@@ -12,10 +12,11 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/smp.h>
+#include <mach/common.h>
 
 int platform_cpu_kill(unsigned int cpu)
 {
-       return 1;
+       return shmobile_platform_cpu_kill(cpu);
 }
 
 void platform_cpu_die(unsigned int cpu)

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index be78a2c73db4784a598f180b076cc239e693e0c9..8b8d80c2a51005cf0976a824ee73184d1a2cb966 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -4,6 +4,7 @@
 extern struct sys_timer shmobile_timer;
 extern void shmobile_setup_console(void);
 extern void shmobile_secondary_vector(void);
+extern int shmobile_platform_cpu_kill(unsigned int cpu);
 struct clk;
 extern int clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index c49a833bf9bbf123d0313390b65ba85c9a9f669c..3f3325d4206d8592ab861ee951267aa83ebeaa3f 100644 (file)
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -37,6 +37,11 @@ static void __init shmobile_smp_prepare_cpus(void)
                sh73a0_smp_prepare_cpus();
 }
 
+int shmobile_platform_cpu_kill(unsigned int cpu)
+{
+       return 1;
+}
+
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
        trace_hardirqs_off();