Commit 084bb5bc authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Russell King
Browse files

ARM: 8131/1: arm/smp: Absorb boot_secondary() 



After becoming a mandatory function, boot_secondary() is no longer used
outside arch/arm/kernel/smp.c. Hence remove its public prototype, and,
as suggested by Arnd, let it be absorbed by its single caller.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 31e1a602

arch/arm/include/asm/smp.h

+0 −6
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ extern void smp_init_cpus(void); 
 */

extern void set_smp_cross_call(void (*)(const struct cpumask *, unsigned int));



/*

 * Boot a secondary CPU, and assign it the specified idle task.

 * This also gives us the initial stack to use for this CPU.

 */

extern int boot_secondary(unsigned int cpu, struct task_struct *);



/*

 * Called from platform specific assembly code, this is the

 * secondary CPU entry point.

arch/arm/kernel/smp.c

+4 −8
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) 
{

	int ret;



	if (!smp_ops.smp_boot_secondary)

		return -ENOSYS;



	/*

	 * We need to tell the secondary core where to find

	 * its stack and the page tables.
@@ -113,7 +116,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) 
	/*

	 * Now bring the CPU into our world.

	 */

	ret = boot_secondary(cpu, idle);

	ret = smp_ops.smp_boot_secondary(cpu, idle);

	if (ret == 0) {

		/*

		 * CPU was successfully started, wait for it
@@ -142,13 +145,6 @@ void __init smp_init_cpus(void) 
		smp_ops.smp_init_cpus();

}



int boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	if (smp_ops.smp_boot_secondary)

		return smp_ops.smp_boot_secondary(cpu, idle);

	return -ENOSYS;

}



int platform_can_cpu_hotplug(void)

{

#ifdef CONFIG_HOTPLUG_CPU

CRA Git | Maintained and supported by SUSTech CRA and CCSE