aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-16 09:45:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-16 09:45:30 -0700
commit06c2aac4014c38247256fe49c61b7f55890271e7 (patch)
tree62c3eb8b69fb5086b530a9e04eccecd214da15f4
parent2f7b98d1e55ccd34e4998bf5f321ec7b9d6b451b (diff)
parent22315a2296f4c251fa92aec45fbbae37e9301b6c (diff)
downloadlinux-yocto-06c2aac4014c38247256fe49c61b7f55890271e7.tar.gz
linux-yocto-06c2aac4014c38247256fe49c61b7f55890271e7.tar.bz2
linux-yocto-06c2aac4014c38247256fe49c61b7f55890271e7.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix kernel compilation when using the LLVM integrated assembly. A recent commit (2decad92f473, "arm64: mte: Ensure TIF_MTE_ASYNC_FAULT is set atomically") broke the kernel build when using the LLVM integrated assembly (only noticeable with clang-12 as MTE is not supported by earlier versions and the code in question not compiled). The Fixes: tag in the commit refers to the original patch introducing subsections for the alternative code sequences" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: alternatives: Move length validation in alternative_{insn, endif}
-rw-r--r--arch/arm64/include/asm/alternative-macros.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/alternative-macros.h b/arch/arm64/include/asm/alternative-macros.h
index 5df500dcc627..8a078fc662ac 100644
--- a/arch/arm64/include/asm/alternative-macros.h
+++ b/arch/arm64/include/asm/alternative-macros.h
@@ -97,9 +97,9 @@
.popsection
.subsection 1
663: \insn2
-664: .previous
- .org . - (664b-663b) + (662b-661b)
+664: .org . - (664b-663b) + (662b-661b)
.org . - (662b-661b) + (664b-663b)
+ .previous
.endif
.endm
@@ -169,11 +169,11 @@
*/
.macro alternative_endif
664:
+ .org . - (664b-663b) + (662b-661b)
+ .org . - (662b-661b) + (664b-663b)
.if .Lasm_alt_mode==0
.previous
.endif
- .org . - (664b-663b) + (662b-661b)
- .org . - (662b-661b) + (664b-663b)
.endm
/*