From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 23 Jan 2018 17:14:06 +0000 (-0500)
Subject: x86/spectre: Drop the warning about ibrs being obsolete.
X-Git-Tag: v4.1.12-124.31.3~1235
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5ef0e4601f8804442d7c21b83041838705fd62a3;p=users%2Fjedix%2Flinux-maple.git

x86/spectre: Drop the warning about ibrs being obsolete.

They scare folks thinking in that they don't work if you
use 'noibrs'. And create support tickets. Just let us
be quiet and support both options.

OraBug: 27439976
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index c0e809762c3f..ecf137d89839 100644
--- a/arch/x86/kernel/cpu/bugs_64.c
+++ b/arch/x86/kernel/cpu/bugs_64.c
@@ -82,14 +82,10 @@ static void __init spectre_v2_parse_cmdline(void)
 	int ret;
 
 	if (cmdline_find_option_bool(boot_command_line, "noibrs")) {
-		pr_warn("Deprecated command option noibrs. "
-			"Use nospectre_v2 instead.\n");
 		set_ibrs_disabled();
 	}
 
 	if (cmdline_find_option_bool(boot_command_line, "noibpb")) {
-		pr_warn("Deprecated command option noibpb. "
-			"Use nospectre_v2 instead.\n");
 		set_ibpb_disabled();
 	}