Commit 06c2aac4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 (2decad92, "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}
parents 2f7b98d1 22315a22

arch/arm64/include/asm/alternative-macros.h

+4 −4
Original line number Diff line number Diff line
@@ -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



/*