diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2011-05-20 16:22:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:23:19 -0700 |
| commit | 6de06f313a65d0ecabf055e708d082002b568866 (patch) | |
| tree | 4d2d8196a9682a399790ea1ac86f24bcf1f4270d | |
| parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
| download | linux-3.10-6de06f313a65d0ecabf055e708d082002b568866.tar.gz linux-3.10-6de06f313a65d0ecabf055e708d082002b568866.tar.bz2 linux-3.10-6de06f313a65d0ecabf055e708d082002b568866.zip | |
powerpc: Fix 32-bit SMP build
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>
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 402560e957b..998a1002860 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -700,7 +700,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 */ |