From bc91628fdf8651f96190de168d6c4112fa8c7e85 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 11 Jun 2008 12:40:13 -0400
Subject: [PATCH] --- yaml --- r: 100723 b: refs/heads/master c:
 4c4925c1f4ccd72002957c3e73b4f117f2bcf712 h: refs/heads/master i:   100721:
 91b3e260e5ee2fb52c1c111fadeb7b66f229faeb   100719:
 ba5792a9e7d563bcd984f7e9092f9874a636e494 v: v3

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

diff --git a/[refs] b/[refs]
index 031070c14e59..951e71935554 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f76e9154736e9ab47b64940d0062f19c80225b7f
+refs/heads/master: 4c4925c1f4ccd72002957c3e73b4f117f2bcf712
diff --git a/trunk/arch/arm/lib/memmove.S b/trunk/arch/arm/lib/memmove.S
index ef7fddc14ac9..018522c3ff26 100644
--- a/trunk/arch/arm/lib/memmove.S
+++ b/trunk/arch/arm/lib/memmove.S
@@ -60,6 +60,7 @@ ENTRY(memmove)
 	CALGN(	bcs	2f			)
 	CALGN(	adr	r4, 6f			)
 	CALGN(	subs	r2, r2, ip		)  @ C is set here
+	CALGN(	rsb	ip, ip, #32		)
 	CALGN(	add	pc, r4, ip		)
 
 	PLD(	pld	[r1, #-4]		)
@@ -139,7 +140,6 @@ ENTRY(memmove)
 		blt	14f
 
 	CALGN(	ands	ip, r1, #31		)
-	CALGN(	rsb	ip, ip, #32		)
 	CALGN(	sbcnes	r4, ip, r2		)  @ C is always set here
 	CALGN(	subcc	r2, r2, ip		)
 	CALGN(	bcc	15f			)