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
/
crypto
/
aes-armv4.S
diff --git
a/arch/arm/crypto/aes-armv4.S
b/arch/arm/crypto/aes-armv4.S
index
3a14ea8
..
ebb9761
100644
(file)
--- a/
arch/arm/crypto/aes-armv4.S
+++ b/
arch/arm/crypto/aes-armv4.S
@@
-35,6
+35,7
@@
@ that is being targetted.
#include <linux/linkage.h>
+#include <asm/assembler.h>
.text
@@
-648,7
+649,7
@@
_armv4_AES_set_encrypt_key:
.Ldone: mov r0,#0
ldmia sp!,{r4-r12,lr}
-.Labrt:
mov pc,
lr
+.Labrt:
ret
lr
ENDPROC(private_AES_set_encrypt_key)
.align 5