---

yaml --- r: 189811 b: refs/heads/master c: d4d9959 h: refs/heads/master i: 189809: b8079a5 189807: 5927857 v: v3
git-mirror · Apr 7, 2010 · 260d4e3 · 260d4e3
1 parent 1dd8e24
commit 260d4e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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