Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into...

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

diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S
index 12549187088c03de84a77c4150bcc001ffe31793..5025c863713d60decb20d5924109bef0a7c48ef9 100644 (file)
--- a/arch/arm/lib/memmove.S
+++ b/arch/arm/lib/memmove.S
@@ -75,24 +75,24 @@ ENTRY(memmove)
                addne   pc, pc, ip              @ C is always clear here
                b       7f
 6:             nop
-               ldr     r3, [r1, #-4]!
-               ldr     r4, [r1, #-4]!
-               ldr     r5, [r1, #-4]!
-               ldr     r6, [r1, #-4]!
-               ldr     r7, [r1, #-4]!
-               ldr     r8, [r1, #-4]!
-               ldr     lr, [r1, #-4]!
+               W(ldr)  r3, [r1, #-4]!
+               W(ldr)  r4, [r1, #-4]!
+               W(ldr)  r5, [r1, #-4]!
+               W(ldr)  r6, [r1, #-4]!
+               W(ldr)  r7, [r1, #-4]!
+               W(ldr)  r8, [r1, #-4]!
+               W(ldr)  lr, [r1, #-4]!
 
                add     pc, pc, ip
                nop
                nop
-               str     r3, [r0, #-4]!
-               str     r4, [r0, #-4]!
-               str     r5, [r0, #-4]!
-               str     r6, [r0, #-4]!
-               str     r7, [r0, #-4]!
-               str     r8, [r0, #-4]!
-               str     lr, [r0, #-4]!
+               W(str)  r3, [r0, #-4]!
+               W(str)  r4, [r0, #-4]!
+               W(str)  r5, [r0, #-4]!
+               W(str)  r6, [r0, #-4]!
+               W(str)  r7, [r0, #-4]!
+               W(str)  r8, [r0, #-4]!
+               W(str)  lr, [r0, #-4]!
 
        CALGN(  bcs     2b                      )