]> err.no Git - linux-2.6/commitdiff
[ARM] fix cache alignment code in memset.S
authorNicolas Pitre <nico@cam.org>
Wed, 11 Jun 2008 16:40:13 +0000 (12:40 -0400)
committerLennert Buytenhek <buytenh@marvell.com>
Sun, 22 Jun 2008 20:44:37 +0000 (22:44 +0200)
This code is currently disabled, which explains why no one was affected.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
arch/arm/lib/memmove.S

index ef7fddc14ac989bd6dca30f204cadeb92317b133..018522c3ff2606e12422b6ce751f2fb391e06fa5 100644 (file)
@@ -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                     )