From b15898b543324920d4e62ee0ab0d53d75ca2db5c Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 28 Dec 2011 16:47:16 +0900
Subject: [PATCH] --- yaml --- r: 283643 b: refs/heads/master c:
 8b306796995609c281f6d32b3cbaa814551ad5ac h: refs/heads/master i:   283641:
 4f5340770cd9c1d3fbf5ca9085fdd960e31391a0   283639:
 7cb2c132e9d118e2ab7eb6cd16d823b39e2d0701 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-shmobile/hotplug.c             | 3 ++-
 trunk/arch/arm/mach-shmobile/include/mach/common.h | 1 +
 trunk/arch/arm/mach-shmobile/platsmp.c             | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fdb845d24fb8..3ddbccc93247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0eab3889e4b5b71e1609c9850f652f06a812cf5
+refs/heads/master: 8b306796995609c281f6d32b3cbaa814551ad5ac
diff --git a/trunk/arch/arm/mach-shmobile/hotplug.c b/trunk/arch/arm/mach-shmobile/hotplug.c
index 238a0d97d2d5..aee3a1088a5a 100644
--- a/trunk/arch/arm/mach-shmobile/hotplug.c
+++ b/trunk/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/trunk/arch/arm/mach-shmobile/include/mach/common.h b/trunk/arch/arm/mach-shmobile/include/mach/common.h
index be78a2c73db4..8b8d80c2a510 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/common.h
+++ b/trunk/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/trunk/arch/arm/mach-shmobile/platsmp.c b/trunk/arch/arm/mach-shmobile/platsmp.c
index c49a833bf9bb..3f3325d4206d 100644
--- a/trunk/arch/arm/mach-shmobile/platsmp.c
+++ b/trunk/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();