git.samba.org
/
sfrench
/
cifs-2.6.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+
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
sleep44xx.S
diff --git
a/arch/arm/mach-omap2/sleep44xx.S
b/arch/arm/mach-omap2/sleep44xx.S
index 9086ce03ae12a00fa500553b80f68902c0fc852a..b84a0122d823a88b8655b0a4c761a460e3cf4cbc 100644
(file)
--- a/
arch/arm/mach-omap2/sleep44xx.S
+++ b/
arch/arm/mach-omap2/sleep44xx.S
@@
-10,6
+10,7
@@
*/
#include <linux/linkage.h>
+#include <asm/assembler.h>
#include <asm/smp_scu.h>
#include <asm/memory.h>
#include <asm/hardware/cache-l2x0.h>
@@
-334,7
+335,7
@@
ENDPROC(omap4_cpu_resume)
#ifndef CONFIG_OMAP4_ERRATA_I688
ENTRY(omap_bus_sync)
-
mov pc,
lr
+
ret
lr
ENDPROC(omap_bus_sync)
#endif