summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 22:18:38 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 22:18:38 +0200
commit05c9ca8843cdf688275df891d512e204359717c5 (patch)
tree9d9139d62a818ab8d59744fb1211612053d29f98 /arch/arm/boot/compressed
parentMerge branch 'sa1100' into for-next (diff)
parentARM: replace BSYM() with badr assembly macro (diff)
downloadlinux-05c9ca8843cdf688275df891d512e204359717c5.tar.xz
linux-05c9ca8843cdf688275df891d512e204359717c5.zip
Merge branch 'bsym' into for-next
Conflicts: arch/arm/kernel/head.S
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r--arch/arm/boot/compressed/head.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 2c45b5709fa4..06e983f59980 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -130,7 +130,7 @@ start:
.endr
ARM( mov r0, r0 )
ARM( b 1f )
- THUMB( adr r12, BSYM(1f) )
+ THUMB( badr r12, 1f )
THUMB( bx r12 )
.word _magic_sig @ Magic numbers to help the loader
@@ -447,7 +447,7 @@ dtb_check_done:
bl cache_clean_flush
- adr r0, BSYM(restart)
+ badr r0, restart
add r0, r0, r6
mov pc, r0