Commit 3bf7edc8 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 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
parents 36168e38 52c9f93a

arch/arm64/include/asm/rwonce.h

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