[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <165244659875.4207.17281650412201582456.tip-bot2@tip-bot2>
Date: Fri, 13 May 2022 12:56:38 -0000
From: "tip-bot2 for Xiao Yang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Xiao Yang <yangx.jy@...itsu.com>, Borislav Petkov <bp@...e.de>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/cleanups] x86/speculation: Add missing srbds=off to the
mitigations= help text
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 553b0cb30b5452198de3187f1a79989eba38df00
Gitweb: https://git.kernel.org/tip/553b0cb30b5452198de3187f1a79989eba38df00
Author: Xiao Yang <yangx.jy@...itsu.com>
AuthorDate: Fri, 13 May 2022 18:16:37 +08:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Fri, 13 May 2022 14:48:50 +02:00
x86/speculation: Add missing srbds=off to the mitigations= help text
The mitigations= cmdline option help text misses the srbds=off option.
Add it.
[ bp: Add a commit message. ]
Signed-off-by: Xiao Yang <yangx.jy@...itsu.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Link: https://lore.kernel.org/r/20220513101637.216487-1-yangx.jy@fujitsu.com
---
Documentation/admin-guide/kernel-parameters.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3f1cc5e..93e9b15 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3103,6 +3103,7 @@
mds=off [X86]
tsx_async_abort=off [X86]
kvm.nx_huge_pages=off [X86]
+ srbds=off [X86,INTEL]
no_entry_flush [PPC]
no_uaccess_flush [PPC]
Powered by blists - more mailing lists