Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 4 years ago 3bf7edc8 36168e38

+2 -2

1 changed file

expand all

arch

arm64

include

asm

rwonce.h

+2 -2

arch/arm64/include/asm/rwonce.h

··· 5 5 #ifndef __ASM_RWONCE_H 6 6 #define __ASM_RWONCE_H 7 7 8 - #ifdef CONFIG_LTO 8 + #if defined(CONFIG_LTO) && !defined(__ASSEMBLY__) 9 9 10 10 #include <linux/compiler_types.h> 11 11 #include <asm/alternative-macros.h> ··· 66 66 }) 67 67 68 68 #endif /* !BUILD_VDSO */ 69 - #endif /* CONFIG_LTO */ 69 + #endif /* CONFIG_LTO && !__ASSEMBLY__ */ 70 70 71 71 #include <asm-generic/rwonce.h> 72 72