X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fmemset.S;fp=arch%2Farm%2Flib%2Fmemset.S;h=a1795f599937f275eee439399ac6a824e4bba401;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=95b110b07a89bda56ef79d29673bd5e870bad13a;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index 95b110b07..a1795f599 100644
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -53,7 +53,7 @@ ENTRY(memset)
 	stmgeia	r0!, {r1, r3, ip, lr}
 	stmgeia	r0!, {r1, r3, ip, lr}
 	bgt	2b
-	ldmeqfd	sp!, {pc}		@ Now <64 bytes to go.
+	LOADREGS(eqfd, sp!, {pc})	@ Now <64 bytes to go.
 /*
  * No need to correct the count; we're only testing bits from now on
  */
@@ -77,4 +77,4 @@ ENTRY(memset)
 	strneb	r1, [r0], #1
 	tst	r2, #1
 	strneb	r1, [r0], #1
-	mov	pc, lr
+	RETINSTR(mov,pc,lr)