diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-09 23:30:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-09 23:30:09 +0100 |
| commit | 3bf7edc84a9eb4007dd9a0cb8878a7e1d5ec6a3b (patch) | |
| tree | cb3100109efcd990daa93e08da198b88f2db363f | |
| parent | ARM: Do not use NOCROSSREFS directive with ld.lld (diff) | |
| parent | arm64: Do not include __READ_ONCE() block in assembly files (diff) | |
| download | linux-3bf7edc84a9eb4007dd9a0cb8878a7e1d5ec6a3b.tar.xz linux-3bf7edc84a9eb4007dd9a0cb8878a7e1d5ec6a3b.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 build fix from Catalin Marinas:
"Fix kernel build with clang LTO after the inclusion of the Spectre BHB
arm64 mitigations"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Do not include __READ_ONCE() block in assembly files
| -rw-r--r-- | arch/arm64/include/asm/rwonce.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/rwonce.h b/arch/arm64/include/asm/rwonce.h index 1bce62fa908a..56f7b1d4d54b 100644 --- a/arch/arm64/include/asm/rwonce.h +++ b/arch/arm64/include/asm/rwonce.h @@ -5,7 +5,7 @@ #ifndef __ASM_RWONCE_H #define __ASM_RWONCE_H -#ifdef CONFIG_LTO +#if defined(CONFIG_LTO) && !defined(__ASSEMBLY__) #include <linux/compiler_types.h> #include <asm/alternative-macros.h> @@ -66,7 +66,7 @@ }) #endif /* !BUILD_VDSO */ -#endif /* CONFIG_LTO */ +#endif /* CONFIG_LTO && !__ASSEMBLY__ */ #include <asm-generic/rwonce.h> |