From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 26 Feb 2018 21:36:08 +0000 (-0500)
Subject: x86/spectre_v2: Fix the documentation to say the right thing.
X-Git-Tag: v4.1.12-124.31.3~1114
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f38a86c75d1df9ecf5c5efe3d58349f974607364;p=users%2Fjedix%2Flinux-maple.git

x86/spectre_v2: Fix the documentation to say the right thing.

That is if you disable the heuristics then it will just
use retpoline all the time instead of enabling IBRS for
Skylake+.

OraBug: 27601710
Reviewed-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b1a5084b0455..dfc2bfba2103 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3515,7 +3515,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			off		- disable all heuristics (see below)
 			skylake=off	- do not use IBRS if present on Skylake
 					  instead of retpoline (this is equivalant
-				          to spectre_v2=ibrs).
+				          to spectre_v2=retpoline,generic).
 
 	spia_io_base=	[HW,MTD]
 	spia_fio_base=