shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-03-09 14:30:09 -08:00
parent 36168e387f 52c9f93a9c
commit 3bf7edc84a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/include/asm/rwonce.h
View File

@@ -5,7 +5,7 @@
#ifndef __ASM_RWONCE_H #ifndef __ASM_RWONCE_H
#define __ASM_RWONCE_H #define __ASM_RWONCE_H
#ifdef CONFIG_LTO #if defined(CONFIG_LTO) && !defined(__ASSEMBLY__)
#include <linux/compiler_types.h> #include <linux/compiler_types.h>
#include <asm/alternative-macros.h> #include <asm/alternative-macros.h>
@@ -66,7 +66,7 @@
}) })
#endif /* !BUILD_VDSO */ #endif /* !BUILD_VDSO */
#endif /* CONFIG_LTO */ #endif /* CONFIG_LTO && !__ASSEMBLY__ */
#include <asm-generic/rwonce.h> #include <asm-generic/rwonce.h>