summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-06-11 18:40:13 +0200
committerLennert Buytenhek <buytenh@marvell.com>2008-06-22 22:44:37 +0200
commit4c4925c1f4ccd72002957c3e73b4f117f2bcf712 (patch)
treed9f45dc842ecdb143910bfaf8a920e2a88fb7073
parent[ARM] latencytop support (diff)
downloadlinux-4c4925c1f4ccd72002957c3e73b4f117f2bcf712.tar.xz
linux-4c4925c1f4ccd72002957c3e73b4f117f2bcf712.zip
[ARM] fix cache alignment code in memset.S
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>
-rw-r--r--arch/arm/lib/memmove.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S
index ef7fddc14ac9..018522c3ff26 100644
--- 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 )