From 1cc594a723b705804b3935617d913a1edab4b76d Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Sat, 7 Nov 2009 07:35:06 +0100 Subject: [PATCH] --- yaml --- r: 168502 b: refs/heads/master c: 158bc5af3d49be49c33dc06ff90c4f754c7d4f1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/head-common.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab7c455ff7f3..7ae506755960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c742239866250a5690485ab775b942c85c6bee63 +refs/heads/master: 158bc5af3d49be49c33dc06ff90c4f754c7d4f1b diff --git a/trunk/arch/arm/kernel/head-common.S b/trunk/arch/arm/kernel/head-common.S index 885a7214418d..b9505aa267c0 100644 --- a/trunk/arch/arm/kernel/head-common.S +++ b/trunk/arch/arm/kernel/head-common.S @@ -97,7 +97,7 @@ __error_a: bl printhex8 adr r0, str_a2 bl printascii - adr r3, 3f + adr r3, 4f ldmia r3, {r4, r5, r6} @ get machine desc list sub r4, r3, r4 @ get offset between virt&phys add r5, r5, r4 @ convert virt addresses to