Skip to content

Commit

Permalink
powerpc/smp: Remove unused smp_ops->cpu_enable()
Browse files Browse the repository at this point in the history
Remove the last remnants of cpu_enable(), everybody uses the normal
__cpu_up() path now

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Benjamin Herrenschmidt committed Apr 1, 2011
1 parent b527d07 commit 7a53a4f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/machdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 0 additions & 10 deletions arch/powerpc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/powermac/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down

0 comments on commit 7a53a4f

Please sign in to comment.