From 260d4e351d63fad008cc8f6cf6f2cca034252ffc Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Wed, 7 Apr 2010 18:10:20 +0100 Subject: [PATCH] --- yaml --- r: 189811 b: refs/heads/master c: d4d9959c099751158c5cf14813fe378e206339c6 h: refs/heads/master i: 189809: b8079a587b285fb1ec1bc299bf7eb2cdfa6fec6a 189807: 5927857534f2363ec7308acba7bf118d07a24bea v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8572b352c1e9..3183cd743363 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4742723cbce519773e4560f5cab11163eaa0c889 +refs/heads/master: d4d9959c099751158c5cf14813fe378e206339c6 diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 0f23009170a1..6ab6b337a913 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -172,7 +172,7 @@ not_angel: adr r0, LC0 ARM( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip, sp}) THUMB( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip} ) - THUMB( ldr sp, [r0, #28] ) + THUMB( ldr sp, [r0, #32] ) subs r0, r0, r1 @ calculate the delta offset @ if delta is zero, we are