From 8543f478e424e7e239dbc3eb643dd76d3828c7f6 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 26 Jul 2006 18:57:40 +0100 Subject: [PATCH] --- yaml --- r: 32901 b: refs/heads/master c: 34d926266500919a43520d3d52a4f7020b9f0687 h: refs/heads/master i: 32899: 868dd4f4db4128cdb68a4f9e7e81b9808cf24beb v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/head.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 28cb66a6b31c..b2e2b411a96c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8ca3d11c6611685ea7783b4acb623bf08496f94 +refs/heads/master: 34d926266500919a43520d3d52a4f7020b9f0687 diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 2242f5f7cb7d..4fe386eea4b4 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/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