Skip to content

Commit

Permalink
[ARM] fix cache alignment code in memset.S
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Pitre authored and Lennert Buytenhek committed Jun 22, 2008
1 parent f76e915 commit 4c4925c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/lib/memmove.S
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit 4c4925c

Please sign in to comment.