From 4348e46bf81f920e8e3a3e092bbb28bf616624a3 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 26 Jan 2018 12:37:06 +0000
Subject: [PATCH 27/89] Revert "x86/mm: Set IBPB upon context switch"

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

This reverts commit a3320203792b633fb96df5d0bbfb7036129b78e2.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 arch/x86/mm/tlb.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index bb3ded3a4e5f..06f3854d0a4f 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -12,7 +12,6 @@
 #include <asm/cache.h>
 #include <asm/apic.h>
 #include <asm/uv/uv.h>
-#include <asm/microcode.h>
 #include <linux/debugfs.h>
 
 /*
@@ -219,9 +218,6 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 		u16 new_asid;
 		bool need_flush;
 
-		if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
-			native_wrmsrl(MSR_IA32_PRED_CMD, FEATURE_SET_IBPB);
-
 		if (IS_ENABLED(CONFIG_VMAP_STACK)) {
 			/*
 			 * If our current stack is in vmalloc space and isn't
-- 
2.15.1