From f559c2b22178b05a605b1396de81117a9b02000c Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 13 Feb 2013 00:44:57 +0900
Subject: [PATCH] --- yaml --- r: 370517 b: refs/heads/master c:
 d62242d7f63d6c874f783d8a691534080df1cb59 h: refs/heads/master i:   370515:
 0e0a014d57413b8dc56a9b757b22511f6cc9e5fb v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-shmobile/smp-emev2.c | 28 ------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index b02a8684783a..1d964b3a76da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e12121f9f46dbeda1017cac4615c96ffe16c6d
+refs/heads/master: d62242d7f63d6c874f783d8a691534080df1cb59
diff --git a/trunk/arch/arm/mach-shmobile/smp-emev2.c b/trunk/arch/arm/mach-shmobile/smp-emev2.c
index 953eb1f9388d..72620b1f87c8 100644
--- a/trunk/arch/arm/mach-shmobile/smp-emev2.c
+++ b/trunk/arch/arm/mach-shmobile/smp-emev2.c
@@ -62,29 +62,6 @@ static unsigned int __init emev2_get_core_count(void)
 	return scu_base ? scu_get_core_count(scu_base) : 1;
 }
 
-static int emev2_platform_cpu_kill(unsigned int cpu)
-{
-	return 0; /* not supported yet */
-}
-
-static int __maybe_unused emev2_cpu_kill(unsigned int cpu)
-{
-	int k;
-
-	/* this function is running on another CPU than the offline target,
-	 * here we need wait for shutdown code in platform_cpu_die() to
-	 * finish before asking SoC-specific code to power off the CPU core.
-	 */
-	for (k = 0; k < 1000; k++) {
-		if (shmobile_cpu_is_dead(cpu))
-			return emev2_platform_cpu_kill(cpu);
-		mdelay(1);
-	}
-
-	return 0;
-}
-
-
 static void __cpuinit emev2_secondary_init(unsigned int cpu)
 {
 	gic_secondary_init(0);
@@ -126,9 +103,4 @@ struct smp_operations emev2_smp_ops __initdata = {
 	.smp_prepare_cpus	= emev2_smp_prepare_cpus,
 	.smp_secondary_init	= emev2_secondary_init,
 	.smp_boot_secondary	= emev2_boot_secondary,
-#ifdef CONFIG_HOTPLUG_CPU
-	.cpu_kill		= emev2_cpu_kill,
-	.cpu_die		= shmobile_cpu_die,
-	.cpu_disable		= shmobile_cpu_disable,
-#endif
 };