From accd19051d6d5889fe219ded1f9dd1201527d241 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 11 Feb 2011 12:49:01 +1100
Subject: [PATCH] --- yaml --- r: 243583 b: refs/heads/master c:
 7a53a4fe707a93a33f6c5d42173bf213cb6ff71d h: refs/heads/master i:   243581:
 f75fddcdef580e047aa6fe9d01f16ab82891257e   243579:
 b3a1e532eb0f4760d771fde9ca6c2a2f1e8b5f20   243575:
 b1b9b3e20cf6a03af3c32d301aa0d054e0897ba1   243567:
 a4e8bd2f912fcd42f480e14f57653b81c927fe57   243551:
 640cefbd3b52610f85348f3a56866d0a8578cefa   243519:
 ad9ed421ac852fc3d3d0f6175a108befb6d33374   243455:
 52c587e01eb751a345b56d240978782d066c9698 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/powerpc/include/asm/machdep.h    |  1 -
 trunk/arch/powerpc/kernel/smp.c             | 10 ----------
 trunk/arch/powerpc/platforms/powermac/smp.c |  2 --
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index feec106d33f2..35e57adb340a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b527d07114fdab83f39040c69b4b0a4b1b232c16
+refs/heads/master: 7a53a4fe707a93a33f6c5d42173bf213cb6ff71d
diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h
index fe56a23e1ff0..bcfc0da2cef1 100644
--- a/trunk/arch/powerpc/include/asm/machdep.h
+++ b/trunk/arch/powerpc/include/asm/machdep.h
@@ -37,7 +37,6 @@ struct smp_ops_t {
 	void  (*setup_cpu)(int nr);
 	void  (*take_timebase)(void);
 	void  (*give_timebase)(void);
-	int   (*cpu_enable)(unsigned int nr);
 	int   (*cpu_disable)(void);
 	void  (*cpu_die)(unsigned int nr);
 	int   (*cpu_bootable)(unsigned int nr);
diff --git a/trunk/arch/powerpc/kernel/smp.c b/trunk/arch/powerpc/kernel/smp.c
index 19d0c2576282..be7d7282341c 100644
--- a/trunk/arch/powerpc/kernel/smp.c
+++ b/trunk/arch/powerpc/kernel/smp.c
@@ -350,21 +350,11 @@ void generic_mach_cpu_die(void)
 }
 #endif
 
-static int __devinit cpu_enable(unsigned int cpu)
-{
-	if (smp_ops && smp_ops->cpu_enable)
-		return smp_ops->cpu_enable(cpu);
-
-	return -ENOSYS;
-}
-
 int __cpuinit __cpu_up(unsigned int cpu)
 {
 	int c;
 
 	secondary_ti = current_set[cpu];
-	if (!cpu_enable(cpu))
-		return 0;
 
 	if (smp_ops == NULL ||
 	    (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))
diff --git a/trunk/arch/powerpc/platforms/powermac/smp.c b/trunk/arch/powerpc/platforms/powermac/smp.c
index c95215f4f8b6..ebd2b7e037f0 100644
--- a/trunk/arch/powerpc/platforms/powermac/smp.c
+++ b/trunk/arch/powerpc/platforms/powermac/smp.c
@@ -923,8 +923,6 @@ struct smp_ops_t core99_smp_ops = {
 # if defined(CONFIG_PPC64)
 	.cpu_disable	= generic_cpu_disable,
 	.cpu_die	= generic_cpu_die,
-	/* intentionally do *NOT* assign cpu_enable,
-	 * the generic code will use kick_cpu then! */
 # endif
 #endif
 };