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

Commit 69e3cea8 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/smp: Make start_secondary_resume available to all CPU variants 



This should fix SMP & Hotplug builds on FSL BookE and 476

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

arch/powerpc/kernel/head_32.S

+0 −9
Original line number Diff line number Diff line
@@ -890,15 +890,6 @@ __secondary_start: 
	mtspr	SPRN_SRR1,r4

	SYNC

	RFI



_GLOBAL(start_secondary_resume)

	/* Reset stack */

	rlwinm	r1,r1,0,0,(31-THREAD_SHIFT)	/* current_thread_info() */

	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD

	li	r3,0

	std	r3,0(r1)		/* Zero the stack frame pointer	*/

	bl	start_secondary

	b	.

#endif /* CONFIG_SMP */



#ifdef CONFIG_KVM_BOOK3S_HANDLER

arch/powerpc/kernel/misc_32.S

+11 −0
Original line number Diff line number Diff line
@@ -694,6 +694,17 @@ _GLOBAL(kernel_thread) 
	addi	r1,r1,16

	blr



#ifdef CONFIG_SMP

_GLOBAL(start_secondary_resume)

	/* Reset stack */

	rlwinm	r1,r1,0,0,(31-THREAD_SHIFT)	/* current_thread_info() */

	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD

	li	r3,0

	std	r3,0(r1)		/* Zero the stack frame pointer	*/

	bl	start_secondary

	b	.

#endif /* CONFIG_SMP */

	

/*

 * This routine is just here to keep GCC happy - sigh...

 */