Commit 34d92626 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Fix SMP booting

Processor support files now use r6 in their CPU setup code, so
we can't rely on r6 being preserved.  Use r7 instead.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d8ca3d11
...@@ -114,9 +114,9 @@ ENTRY(secondary_startup) ...@@ -114,9 +114,9 @@ ENTRY(secondary_startup)
* Use the page tables supplied from __cpu_up. * Use the page tables supplied from __cpu_up.
*/ */
adr r4, __secondary_data adr r4, __secondary_data
ldmia r4, {r5, r6, r13} @ address to jump to after ldmia r4, {r5, r7, r13} @ address to jump to after
sub r4, r4, r5 @ mmu has been enabled sub r4, r4, r5 @ mmu has been enabled
ldr r4, [r6, r4] @ get secondary_data.pgdir ldr r4, [r7, r4] @ get secondary_data.pgdir
adr lr, __enable_mmu @ return address adr lr, __enable_mmu @ return address
add pc, r10, #12 @ initialise processor add pc, r10, #12 @ initialise processor
@ (return control reg) @ (return control reg)
...@@ -125,7 +125,7 @@ ENTRY(secondary_startup) ...@@ -125,7 +125,7 @@ ENTRY(secondary_startup)
* r6 = &secondary_data * r6 = &secondary_data
*/ */
ENTRY(__secondary_switched) ENTRY(__secondary_switched)
ldr sp, [r6, #4] @ get secondary_data.stack ldr sp, [r7, #4] @ get secondary_data.stack
mov fp, #0 mov fp, #0
b secondary_start_kernel b secondary_start_kernel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment