[PATCH] 2.6.39 powerpc: Fix 32-bit SMP build

Josh Boyer jwboyer at linux.vnet.ibm.com
Mon May 30 22:26:21 EST 2011


Backport upstream commit 6de06f313a65d0ec
    
Commit fa3f82c8bb7acb ("powerpc/smp: soft-replugged CPUs must go back to
start_secondary") introduced start_secondary_resume to head_32.S, however
it uses a 64-bit instruction which is not valid on 32-bit platforms.  Use
'stw' instead.
    
CC: stable at kernel.org
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>

---

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c5c24be..727f40a 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -896,7 +896,7 @@ _GLOBAL(start_secondary_resume)
 	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 */
+	stw     r3,0(r1)                /* Zero the stack frame pointer */
 	bl      start_secondary
 	b       .
 #endif /* CONFIG_SMP */



More information about the Linuxppc-dev mailing list