linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / lib / memset.S

diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index 95b110b..a1795f5 100644 (file)
--- 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)