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
/
mach-imx
/
suspend-imx6.S
diff --git
a/arch/arm/mach-imx/suspend-imx6.S
b/arch/arm/mach-imx/suspend-imx6.S
index
fe123b0
..
74b50f1
100644
(file)
--- a/
arch/arm/mach-imx/suspend-imx6.S
+++ b/
arch/arm/mach-imx/suspend-imx6.S
@@
-10,6
+10,7
@@
*/
#include <linux/linkage.h>
*/
#include <linux/linkage.h>
+#include <asm/assembler.h>
#include <asm/asm-offsets.h>
#include <asm/hardware/cache-l2x0.h>
#include "hardware.h"
#include <asm/asm-offsets.h>
#include <asm/hardware/cache-l2x0.h>
#include "hardware.h"
@@
-301,7
+302,7
@@
rbc_loop:
resume_mmdc
/* return to suspend finish */
resume_mmdc
/* return to suspend finish */
-
mov pc,
lr
+
ret
lr
resume:
/* invalidate L1 I-cache first */
resume:
/* invalidate L1 I-cache first */
@@
-325,7
+326,7
@@
resume:
mov r5, #0x1
resume_mmdc
mov r5, #0x1
resume_mmdc
-
mov pc,
lr
+
ret
lr
ENDPROC(imx6_suspend)
/*
ENDPROC(imx6_suspend)
/*