diff options
author | Nicolas Pitre <nico@cam.org> | 2008-06-11 12:40:13 -0400 |
---|---|---|
committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-06-22 16:44:37 -0400 |
commit | 4c4925c1f4ccd72002957c3e73b4f117f2bcf712 (patch) | |
tree | d9f45dc842ecdb143910bfaf8a920e2a88fb7073 | |
parent | f76e9154736e9ab47b64940d0062f19c80225b7f (diff) |
[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.S | 2 |
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) | |||
60 | CALGN( bcs 2f ) | 60 | CALGN( bcs 2f ) |
61 | CALGN( adr r4, 6f ) | 61 | CALGN( adr r4, 6f ) |
62 | CALGN( subs r2, r2, ip ) @ C is set here | 62 | CALGN( subs r2, r2, ip ) @ C is set here |
63 | CALGN( rsb ip, ip, #32 ) | ||
63 | CALGN( add pc, r4, ip ) | 64 | CALGN( add pc, r4, ip ) |
64 | 65 | ||
65 | PLD( pld [r1, #-4] ) | 66 | PLD( pld [r1, #-4] ) |
@@ -139,7 +140,6 @@ ENTRY(memmove) | |||
139 | blt 14f | 140 | blt 14f |
140 | 141 | ||
141 | CALGN( ands ip, r1, #31 ) | 142 | CALGN( ands ip, r1, #31 ) |
142 | CALGN( rsb ip, ip, #32 ) | ||
143 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here | 143 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here |
144 | CALGN( subcc r2, r2, ip ) | 144 | CALGN( subcc r2, r2, ip ) |
145 | CALGN( bcc 15f ) | 145 | CALGN( bcc 15f ) |