2.6.39-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Josh Boyer <[email protected]>

commit 6de06f313a65d0ecabf055e708d082002b568866 upstream.

Commit 69e3cea8d5fd526 ("powerpc/smp: Make start_secondary_resume
available to all CPU variants") introduced start_secondary_resume to
misc_32.S, however it uses a 64-bit instruction which is not valid on
32-bit platforms.  Use 'stw' instead.

Reported-by: Richard Cochran <[email protected]>
Tested-by: Richard Cochran <[email protected]>
Signed-off-by: Josh Boyer <[email protected]>
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/powerpc/kernel/head_32.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 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 */


_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to