]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc: Fix 32-bit SMP build
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>
Fri, 20 May 2011 20:22:25 +0000 (16:22 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 23 Jun 2011 22:05:34 +0000 (15:05 -0700)
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 <richardcochran@gmail.com>
Tested-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/powerpc/kernel/head_32.S

index c5c24beb838797c9aa0c2891f82754fef7b9009b..727f40a5447b4a889bbdfd2a924e423c376d0566 100644 (file)
@@ -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 */