---

yaml
---
r: 243583
b: refs/heads/master
c: 7a53a4f
h: refs/heads/master
i:
  243581: f75fddc
  243579: b3a1e53
  243575: b1b9b3e
  243567: a4e8bd2
  243551: 640cefb
  243519: ad9ed42
  243455: 52c587e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b527d07114fdab83f39040c69b4b0a4b1b232c16
+refs/heads/master: 7a53a4fe707a93a33f6c5d42173bf213cb6ff71d

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);

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)))

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
 };