diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-26 12:47:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-26 12:47:07 +0100 |
| commit | 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 (patch) | |
| tree | 140ab988587f2909b890b30c689669aa2a4ad82d /arch/arm/include/asm/assembler.h | |
| parent | 3866f217aaa81bf7165c7f27362eee5d7919c496 (diff) | |
| parent | fb597f2a393294f3d3012ecb314f43b60fa48359 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 3546d294d55f..feac2c8b86f2 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -269,10 +269,9 @@ .endif ;\ .popsection #define ALT_UP_B(label) \ - .equ up_b_offset, label - 9998b ;\ .pushsection ".alt.smp.init", "a" ;\ .long 9998b ;\ - W(b) . + up_b_offset ;\ + W(b) . + (label - 9998b) ;\ .popsection #else #define ALT_SMP(instr...) |