git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
lib
/
memset.S
diff --git
a/arch/arm/lib/memset.S
b/arch/arm/lib/memset.S
index
a1795f5
..
95b110b
100644
(file)
--- a/
arch/arm/lib/memset.S
+++ b/
arch/arm/lib/memset.S
@@
-53,7
+53,7
@@
ENTRY(memset)
stmgeia r0!, {r1, r3, ip, lr}
stmgeia r0!, {r1, r3, ip, lr}
bgt 2b
stmgeia r0!, {r1, r3, ip, lr}
stmgeia r0!, {r1, r3, ip, lr}
bgt 2b
-
LOADREGS(eqfd, sp!, {pc})
@ Now <64 bytes to go.
+
ldmeqfd sp!, {pc}
@ Now <64 bytes to go.
/*
* No need to correct the count; we're only testing bits from now on
*/
/*
* No need to correct the count; we're only testing bits from now on
*/
@@
-77,4
+77,4
@@
ENTRY(memset)
strneb r1, [r0], #1
tst r2, #1
strneb r1, [r0], #1
strneb r1, [r0], #1
tst r2, #1
strneb r1, [r0], #1
- RETINSTR(mov,pc,lr)
+ mov pc, lr