projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[~shefty/rdma-dev.git]
/
arch
/
arm
/
mm
/
proc-v7.S
diff --git
a/arch/arm/mm/proc-v7.S
b/arch/arm/mm/proc-v7.S
index 7cd0028cab8efbdd71a8e658348cbe2734d6d589..350f6a74992b9200618e52ed07a2ec9dd1bde407 100644
(file)
--- a/
arch/arm/mm/proc-v7.S
+++ b/
arch/arm/mm/proc-v7.S
@@
-57,7
+57,7
@@
ENTRY(cpu_v7_reset)
THUMB( bic r1, r1, #1 << 30 ) @ SCTLR.TE (Thumb exceptions)
mcr p15, 0, r1, c1, c0, 0 @ disable MMU
isb
-
mov pc,
r0
+
bx
r0
ENDPROC(cpu_v7_reset)
.popsection