Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6de06f313a65d0ecabf055e708d082002b568866

Authored by Josh Boyer
Committed by Linus Torvalds
1 parent 557eed6031
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/powerpc/kernel/misc_32.S
Diff comments   View file @ 6de06f3
... ... @@ -700,7 +700,7 @@
700 700 rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */
701 701 addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
702 702 li r3,0
703   - std r3,0(r1) /* Zero the stack frame pointer */
  703 + stw r3,0(r1) /* Zero the stack frame pointer */
704 704 bl start_secondary
705 705 b .
706 706 #endif /* CONFIG_SMP */