aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-02-10 20:46:41 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-04-01 00:37:12 -0400
commitb527d07114fdab83f39040c69b4b0a4b1b232c16 (patch)
tree7b264e427fcf71d829c8469a0720fe81974a0bb7 /arch
parent4fcb8833af3355065bd8bffcd338eabc6f3a38a0 (diff)
powerpc/smp: Remove unused generic_cpu_enable()
Nobody uses it, besides we should always use the normal __cpu_up path anyways Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/smp.h1
-rw-r--r--arch/powerpc/kernel/smp.c22
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 1de0e97a394f..a629b6fef882 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -43,7 +43,6 @@ DECLARE_PER_CPU(unsigned int, cpu_pvr);
43#ifdef CONFIG_HOTPLUG_CPU 43#ifdef CONFIG_HOTPLUG_CPU
44extern void fixup_irqs(const struct cpumask *map); 44extern void fixup_irqs(const struct cpumask *map);
45int generic_cpu_disable(void); 45int generic_cpu_disable(void);
46int generic_cpu_enable(unsigned int cpu);
47void generic_cpu_die(unsigned int cpu); 46void generic_cpu_die(unsigned int cpu);
48void generic_mach_cpu_die(void); 47void generic_mach_cpu_die(void);
49#endif 48#endif
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 3c0fab5e1e16..19d0c2576282 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -322,28 +322,6 @@ int generic_cpu_disable(void)
322 return 0; 322 return 0;
323} 323}
324 324
325int generic_cpu_enable(unsigned int cpu)
326{
327 /* Do the normal bootup if we haven't
328 * already bootstrapped. */
329 if (system_state != SYSTEM_RUNNING)
330 return -ENOSYS;
331
332 /* get the target out of it's holding state */
333 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
334 smp_wmb();
335
336 while (!cpu_online(cpu))
337 cpu_relax();
338
339#ifdef CONFIG_PPC64
340 fixup_irqs(cpu_online_mask);
341 /* counter the irq disable in fixup_irqs */
342 local_irq_enable();
343#endif
344 return 0;
345}
346
347void generic_cpu_die(unsigned int cpu) 325void generic_cpu_die(unsigned int cpu)
348{ 326{
349 int i; 327 int i;