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 /Documentation/x86 | |
| parent | c949110ef4e31cb5d3387bd8273fd5de66b5227b (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 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/cpuinfo.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/x86/cpuinfo.rst b/Documentation/x86/cpuinfo.rst index 5d54c39a063f..12fbe2b1e98a 100644 --- a/Documentation/x86/cpuinfo.rst +++ b/Documentation/x86/cpuinfo.rst @@ -140,9 +140,8 @@ from #define X86_FEATURE_UMIP (16*32 + 2). In addition, there exists a variety of custom command-line parameters that disable specific features. The list of parameters includes, but is not limited -to, nofsgsbase, nosmap, and nosmep. 5-level paging can also be disabled using -"no5lvl". SMAP and SMEP are disabled with the aforementioned parameters, -respectively. +to, nofsgsbase, and nosmep. 5-level paging can also be disabled using +"no5lvl". SMEP is disabled with the aforementioned parameter. e: The feature was known to be non-functional. ---------------------------------------------- |