The following commit has been merged into the x86/urgent branch of tip: Commit-ID: ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f Gitweb: https://git.kernel.org/tip/ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f Author: Eiichi Tsukata <eiichi.tsukata@xxxxxxxxxxx> AuthorDate: Thu, 28 Jul 2022 04:39:07 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Fri, 29 Jul 2022 20:47:07 +02:00 docs/kernel-parameters: Update descriptions for "mitigations=" param with retbleed Updates descriptions for "mitigations=off" and "mitigations=auto,nosmt" with the respective retbleed= settings. Signed-off-by: Eiichi Tsukata <eiichi.tsukata@xxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: corbet@xxxxxxx Link: https://lore.kernel.org/r/20220728043907.165688-1-eiichi.tsukata@xxxxxxxxxxx --- Documentation/admin-guide/kernel-parameters.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index c0fdb04..cc3ea8f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3176,6 +3176,7 @@ no_entry_flush [PPC] no_uaccess_flush [PPC] mmio_stale_data=off [X86] + retbleed=off [X86] Exceptions: This does not have any effect on @@ -3198,6 +3199,7 @@ mds=full,nosmt [X86] tsx_async_abort=full,nosmt [X86] mmio_stale_data=full,nosmt [X86] + retbleed=auto,nosmt [X86] mminit_loglevel= [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
|