diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-27 10:50:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-27 10:50:31 -0700 |
| commit | 1fa8cb0b7b11f3bbfe799d73f351e44a441903ca (patch) | |
| tree | 951ff96a43613a6ffb8c8141b4c9ee8e27f73212 /arch | |
| parent | 527630fbf4f194c5d71e75b2d3cb3d2f406bc5d0 (diff) | |
| parent | 6f5459da2b8736720afdbd67c4bd2d1edba7d0e3 (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Will Deacon:
"Fix defconfig build when using Clang's integrated assembler"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: alternative: fix build with clang integrated assembler
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/alternative.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 324e7d5ab37e..5e5dc05d63a0 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -221,7 +221,7 @@ alternative_endif .macro user_alt, label, oldinstr, newinstr, cond 9999: alternative_insn "\oldinstr", "\newinstr", \cond - _ASM_EXTABLE 9999b, \label + _asm_extable 9999b, \label .endm /* |