Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a53a4fe authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

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



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

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent b527d071

arch/powerpc/include/asm/machdep.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/kernel/smp.c

+0 −10
Original line number Diff line number Diff line
@@ -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)))

arch/powerpc/platforms/powermac/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -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

};