2022-05-14 02:35:32

by Xiao Yang

Subject: [PATCH] x86/speculation: Add missing srbds=off in the document of 'mitigations='

Signed-off-by: Xiao Yang <[email protected]>
---
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 3f1cc5e317ed..93e9b15f1cf4 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]

--
2.21.0

2022-05-14 03:04:39

by tip-bot2 for Jacob Pan

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 <[email protected]>
AuthorDate: Fri, 13 May 2022 18:16:37 +08:00
Committer: Borislav Petkov <[email protected]>
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 <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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]