evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc/smp: Remove unused smp_ops->cpu_enable()

Browse source 
Remove the last remnants of cpu_enable(), everybody uses the normal
__cpu_up() path now

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2011-02-11 12:49:01 +11:00
parent b527d07114
commit 7a53a4fe70
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/powerpc/include/asm/machdep.h
View file

@ -37,7 +37,6 @@ struct smp_ops_t {
void (*setup_cpu)(int nr); void (*setup_cpu)(int nr);
void (*take_timebase)(void); void (*take_timebase)(void);
void (*give_timebase)(void); void (*give_timebase)(void);
int (*cpu_enable)(unsigned int nr);
int (*cpu_disable)(void); int (*cpu_disable)(void);
void (*cpu_die)(unsigned int nr); void (*cpu_die)(unsigned int nr);
int (*cpu_bootable)(unsigned int nr); int (*cpu_bootable)(unsigned int nr);

10
arch/powerpc/kernel/smp.c
View file

@ -350,21 +350,11 @@ void generic_mach_cpu_die(void)
} }
#endif #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 __cpuinit __cpu_up(unsigned int cpu)
{ {
int c; int c;
secondary_ti = current_set[cpu]; secondary_ti = current_set[cpu];
if (!cpu_enable(cpu))
return 0;
if (smp_ops == NULL || if (smp_ops == NULL ||
(smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))) (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))

2
arch/powerpc/platforms/powermac/smp.c
View file

@ -923,8 +923,6 @@ struct smp_ops_t core99_smp_ops = {
# if defined(CONFIG_PPC64) # if defined(CONFIG_PPC64)
.cpu_disable = generic_cpu_disable, .cpu_disable = generic_cpu_disable,
.cpu_die = generic_cpu_die, .cpu_die = generic_cpu_die,
/* intentionally do *NOT* assign cpu_enable,
* the generic code will use kick_cpu then! */
# endif # endif
#endif #endif
}; };