diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
| commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
| tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /arch/arm/kernel/head.S | |
| parent | 95916edd02e3a7752315422f386c55723d4a3637 (diff) | |
| parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) | |
| download | op-kernel-dev-36a2c6b28003dd0592b8ece5e9409991e0820f50.zip op-kernel-dev-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.gz | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 2242f5f..4fe386e 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -114,9 +114,9 @@ ENTRY(secondary_startup) * Use the page tables supplied from __cpu_up. */ 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 - ldr r4, [r6, r4] @ get secondary_data.pgdir + ldr r4, [r7, r4] @ get secondary_data.pgdir adr lr, __enable_mmu @ return address add pc, r10, #12 @ initialise processor @ (return control reg) @@ -125,7 +125,7 @@ ENTRY(secondary_startup) * r6 = &secondary_data */ ENTRY(__secondary_switched) - ldr sp, [r6, #4] @ get secondary_data.stack + ldr sp, [r7, #4] @ get secondary_data.stack mov fp, #0 b secondary_start_kernel |
