From 1b42121ad3bf4bc627227d5b1f939650851d2b47 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Tue, 20 Feb 2018 13:53:50 +0000
Subject: [PATCH 031/131] Revert "UBUNTU: SAUCE: x86/feature: Report presence
 of IBPB and IBRS control"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit c75d82dc7e73acbb0f547df07472ebff633a946a.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 arch/x86/kernel/cpu/intel.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 4fde76c6ac64..51a52cfb93f3 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -504,11 +504,6 @@ static void init_intel(struct cpuinfo_x86 *c)
 			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
 		}
 	}
-
-	if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
-		printk_once(KERN_INFO "FEATURE SPEC_CTRL Present\n");
-	else
-		printk_once(KERN_INFO "FEATURE SPEC_CTRL Not Present\n");
 }
 
 #ifdef CONFIG_X86_32
-- 
2.15.1

