summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-01-02 14:19:48 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-05 15:44:25 +0100
commitdea9aa9ffae11c91285335cc3215b4f0e48e8139 (patch)
tree86c3c32c0c32f502b05375b41f8883b421a46e38 /Documentation
parente345dcc9481543edf4a0a5df4c4c2f9597b0a997 (diff)
downloadlinux-stable-dea9aa9ffae11c91285335cc3215b4f0e48e8139.tar.gz
linux-stable-dea9aa9ffae11c91285335cc3215b4f0e48e8139.tar.bz2
linux-stable-dea9aa9ffae11c91285335cc3215b4f0e48e8139.zip
x86/kaiser: Rename and simplify X86_FEATURE_KAISER handling
Concentrate it in arch/x86/mm/kaiser.c and use the upstream string "nopti". Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 67d4f67f56ba..453ceddda862 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2523,7 +2523,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
nojitter [IA-64] Disables jitter checking for ITC timers.
- nokaiser [X86-64] Disable KAISER isolation of kernel from user.
+ nopti [X86-64] Disable KAISER isolation of kernel from user.
no-kvmclock [X86,KVM] Disable paravirtualized KVM clock driver