diff options
| author |  Borislav Petkov <bp@suse.de>
| 2022-01-27 12:56:23 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de>
| 2022-04-04 10:16:57 +0200 |
| commit | dbae0a934f09208075ec3e73491bd0844e1397b3 (patch) | |
| tree | ad673206368782f4db7edb97bcc23ad9497cf20a /tools/arch | |
| parent | x86/cpu: Remove "nosep" (diff) | |
| download | linux-dbae0a934f09208075ec3e73491bd0844e1397b3.tar.gz linux-dbae0a934f09208075ec3e73491bd0844e1397b3.tar.bz2 linux-dbae0a934f09208075ec3e73491bd0844e1397b3.zip | |
x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"
Those were added as part of the SMAP enablement but SMAP is currently
an integral part of kernel proper and there's no need to disable it
anymore.
Rip out that functionality. Leave --uaccess default on for objtool as
this is what objtool should do by default anyway.
If still needed - clearcpuid=smap.
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220127115626.14179-4-bp@alien8.de
Diffstat (limited to 'tools/arch')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 1231d63f836d..1ae0fab7d902 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -10,12 +10,6 @@ * cpu_feature_enabled(). */ -#ifdef CONFIG_X86_SMAP -# define DISABLE_SMAP 0 -#else -# define DISABLE_SMAP (1<<(X86_FEATURE_SMAP & 31)) -#endif - #ifdef CONFIG_X86_UMIP # define DISABLE_UMIP 0 #else @@ -80,7 +74,7 @@ #define DISABLED_MASK6 0 #define DISABLED_MASK7 (DISABLE_PTI) #define DISABLED_MASK8 0 -#define DISABLED_MASK9 (DISABLE_SMAP|DISABLE_SGX) +#define DISABLED_MASK9 (DISABLE_SGX) #define DISABLED_MASK10 0 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 |