diff options
author | Juergen Gross <jgross@suse.com> | 2021-03-11 17:23:06 +0300 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-03-11 17:58:02 +0300 |
commit | 5e21a3ecad1500e35b46701e7f3f232e15d78e69 (patch) | |
tree | c69a1af7ba1c4fdde714b191f59d1c6dd0f71a9f /arch/x86/include/asm/smap.h | |
parent | db16e07269c2b4346e4332e43f04e447ef14fd2f (diff) | |
download | linux-5e21a3ecad1500e35b46701e7f3f232e15d78e69.tar.xz |
x86/alternative: Merge include files
Merge arch/x86/include/asm/alternative-asm.h into
arch/x86/include/asm/alternative.h in order to make it easier to use
common definitions later.
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210311142319.4723-2-jgross@suse.com
Diffstat (limited to 'arch/x86/include/asm/smap.h')
-rw-r--r-- | arch/x86/include/asm/smap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h index 8b58d6975d5d..ea1d8eb644cb 100644 --- a/arch/x86/include/asm/smap.h +++ b/arch/x86/include/asm/smap.h @@ -11,6 +11,7 @@ #include <asm/nops.h> #include <asm/cpufeatures.h> +#include <asm/alternative.h> /* "Raw" instruction opcodes */ #define __ASM_CLAC ".byte 0x0f,0x01,0xca" @@ -18,8 +19,6 @@ #ifdef __ASSEMBLY__ -#include <asm/alternative-asm.h> - #ifdef CONFIG_X86_SMAP #define ASM_CLAC \ @@ -37,8 +36,6 @@ #else /* __ASSEMBLY__ */ -#include <asm/alternative.h> - #ifdef CONFIG_X86_SMAP static __always_inline void clac(void) |