summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:38 +0100
commit05c9ca8843cdf688275df891d512e204359717c5 (patch)
tree9d9139d62a818ab8d59744fb1211612053d29f98 /arch/arm/common
parentc62af70ff3015a4412c6655de602fdf7f1ecdaa6 (diff)
parent14327c662822e5e874cb971a7162067519300ca8 (diff)
downloadlinux-05c9ca8843cdf688275df891d512e204359717c5.tar.bz2
Merge branch 'bsym' into for-next
Conflicts: arch/arm/kernel/head.S
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/mcpm_head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/mcpm_head.S b/arch/arm/common/mcpm_head.S
index e02db4b81a66..08b3bb9bc6a2 100644
--- a/arch/arm/common/mcpm_head.S
+++ b/arch/arm/common/mcpm_head.S
@@ -49,7 +49,7 @@
ENTRY(mcpm_entry_point)
ARM_BE8(setend be)
- THUMB( adr r12, BSYM(1f) )
+ THUMB( badr r12, 1f )
THUMB( bx r12 )
THUMB( .thumb )
1: