From 344f7a7f3011f8dc41a93a8cfdd78241bc41bde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Grafstr=C3=B6m?= <grfstrm@users.sourceforge.net>
Date: Mon, 15 Mar 2010 16:04:14 +0100
Subject: [PATCH] --- yaml --- r: 188408 b: refs/heads/master c:
 8e4971f2fb2380ce66196136e113d04196b80fcd h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/kernel/entry-header.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 71a6634ef8ad..24359c0030b2 100644
--- 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
index 7e9ed1eea40a..d93f976fb389 100644
--- 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