From 24b370ca055d3345c8f2891bb39913bdb24b35b6 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 29 Mar 2010 10:29:46 +0100
Subject: [PATCH] --- yaml --- r: 189414 b: refs/heads/master c:
 fd522a8dec11a08b5fdd23982193808e268be19e h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/lib/memmove.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 58fdb398a889..559d24991771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 782a0fd16723bfc0e765d789e82853d5dc424e76
+refs/heads/master: fd522a8dec11a08b5fdd23982193808e268be19e
diff --git a/trunk/arch/arm/lib/memmove.S b/trunk/arch/arm/lib/memmove.S
index 5025c863713d..938fc14f962d 100644
--- a/trunk/arch/arm/lib/memmove.S
+++ b/trunk/arch/arm/lib/memmove.S
@@ -74,7 +74,7 @@ ENTRY(memmove)
 		rsb	ip, ip, #32
 		addne	pc, pc, ip		@ C is always clear here
 		b	7f
-6:		nop
+6:		W(nop)
 		W(ldr)	r3, [r1, #-4]!
 		W(ldr)	r4, [r1, #-4]!
 		W(ldr)	r5, [r1, #-4]!
@@ -85,7 +85,7 @@ ENTRY(memmove)
 
 		add	pc, pc, ip
 		nop
-		nop
+		W(nop)
 		W(str)	r3, [r0, #-4]!
 		W(str)	r4, [r0, #-4]!
 		W(str)	r5, [r0, #-4]!