---

yaml --- r: 188408 b: refs/heads/master c: 8e4971f h: refs/heads/master v: v3
git-mirror · Mar 15, 2010 · 344f7a7 · 344f7a7
1 parent 2677816
commit 344f7a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d8614cc5d6c5c02b7995ed97303481d4e3a8cc7
+refs/heads/master: 8e4971f2fb2380ce66196136e113d04196b80fcd
diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S
@@ -102,6 +102,8 @@
 	.else
 	ldmdb	sp, {r0 - lr}^			@ get calling r0 - lr
 	.endif
+	mov	r0, r0				@ ARMv5T and earlier require a nop
+						@ after ldm {}^
 	add	sp, sp, #S_FRAME_SIZE - S_PC
 	movs	pc, lr				@ return & move spsr_svc into cpsr
 	.endm