[ARM] fix cache alignment code in memset.S

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

diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S
index ef7fddc14ac989bd6dca30f204cadeb92317b133..018522c3ff2606e12422b6ce751f2fb391e06fa5 100644 (file)
--- a/arch/arm/lib/memmove.S
+++ b/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                     )