Skip to contentSkip to conversation

arm64 fix for 5.12-rc8/final

GIT PULL Merged Catalin Marinas 2 participants 2 messages Apr 16, 2021

lore
Share & tools
lore
#0 lore raw

Hi Linus,

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.

Please pull the fix below for -rc8/final (Will's off today). Thanks.

The following changes since commit 738fa58ee1328481d1d7889e7c430b3401c571b9:

arm64: kprobes: Restore local irqflag if kprobes is cancelled (2021-04-13 09:30:16 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

for you to fetch changes up to 22315a2296f4c251fa92aec45fbbae37e9301b6c:

arm64: alternatives: Move length validation in alternative_{insn, endif} (2021-04-15 18:33:25 +0100)

----------------------------------------------------------------
Fix kernel compilation when using the LLVM integrated assembly.

----------------------------------------------------------------
Nathan Chancellor (1):

      arm64: alternatives: Move length validation in alternative_{insn, endif}
 arch/arm64/include/asm/alternative-macros.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
Catalin