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
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
relocate_kernel.S
diff --git
a/arch/arm/kernel/relocate_kernel.S
b/arch/arm/kernel/relocate_kernel.S
index
9cf4cbf
..
d0cdedf
100644
(file)
--- a/
arch/arm/kernel/relocate_kernel.S
+++ b/
arch/arm/kernel/relocate_kernel.S
@@
-57,7
+57,8
@@
relocate_new_kernel:
mov r0,#0
ldr r1,kexec_mach_type
ldr r2,kexec_boot_atags
- mov pc,lr
+ ARM( mov pc, lr )
+ THUMB( bx lr )
.align