From f15562b0dd29f9286eb9a25020aaa3cc6c246c03 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 18 Aug 2006 15:34:46 +0100 Subject: [PATCH] --- yaml --- r: 33439 b: refs/heads/master c: 90af774ab150b97c0aa8ed0375f4652be986bdce h: refs/heads/master i: 33437: 2b3d68c276fa00e02450c9ab3a5d9d9cfae12a95 33435: d2093b35d5ec48c0010adf1be0b93b22c0c95011 33431: 038d8b0fbf76f5865da1d3b304e53334eadf010e 33423: be41c3f7e51163823108fceac6d6ffa0ece29270 33407: a74fec07b12e29640457d3d275555d59e31c93f9 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 252d854c66f2..1d984d1205f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a834635e8953839dba3f417a26414039b0c7c48 +refs/heads/master: 90af774ab150b97c0aa8ed0375f4652be986bdce diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 4fe386eea4b4..5365d4e5949e 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -118,7 +118,7 @@ ENTRY(secondary_startup) sub r4, r4, r5 @ mmu has been enabled ldr r4, [r7, r4] @ get secondary_data.pgdir adr lr, __enable_mmu @ return address - add pc, r10, #12 @ initialise processor + add pc, r10, #PROCINFO_INITFUNC @ initialise processor @ (return control reg) /*