git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
memset.S
diff --git
a/arch/arm/lib/memset.S
b/arch/arm/lib/memset.S
index
94b0650
..
671455c
100644
(file)
--- a/
arch/arm/lib/memset.S
+++ b/
arch/arm/lib/memset.S
@@
-110,7
+110,7
@@
ENTRY(memset)
strneb r1, [ip], #1
tst r2, #1
strneb r1, [ip], #1
-
mov pc,
lr
+
ret
lr
6: subs r2, r2, #4 @ 1 do we have enough
blt 5b @ 1 bytes to align with?