diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-21 15:17:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-05-08 18:33:50 +0200 |
| commit | 14327c662822e5e874cb971a7162067519300ca8 (patch) | |
| tree | 3d3424072fa6ef753c8ffaa2eb79005574149a3e /arch/arm/common/mcpm_head.S | |
| parent | ARM: kvm: fix a bad BSYM() usage (diff) | |
| download | linux-14327c662822e5e874cb971a7162067519300ca8.tar.xz linux-14327c662822e5e874cb971a7162067519300ca8.zip | |
ARM: replace BSYM() with badr assembly macro
BSYM() was invented to allow us to work around a problem with the
assembler, where local symbols resolved by the assembler for the 'adr'
instruction did not take account of their ISA.
Since we don't want BSYM() used elsewhere, replace BSYM() with a new
macro 'badr', which is like the 'adr' pseudo-op, but with the BSYM()
mechanics integrated into it. This ensures that the BSYM()-ification
is only used in conjunction with 'adr'.
Acked-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common/mcpm_head.S')
| -rw-r--r-- | arch/arm/common/mcpm_head.S | 2 |
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: |