From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Wed, 21 Nov 2018 21:15:26 +0000 (-0500)
Subject: x86/speculation: Drop unused DISABLE_IBRS_CLOBBER macro
X-Git-Tag: v4.1.12-124.31.3~399
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0714422aa60c5b9dd5cb84229484e318db11a9cf;p=users%2Fjedix%2Flinux-maple.git

x86/speculation: Drop unused DISABLE_IBRS_CLOBBER macro

... and x86_spec_ctrl_base declaration in ASM part of the file.

Orabug: 28814570

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/arch/x86/include/asm/spec_ctrl.h b/arch/x86/include/asm/spec_ctrl.h
index 68ff83e29247..f3d58700b132 100644
--- a/arch/x86/include/asm/spec_ctrl.h
+++ b/arch/x86/include/asm/spec_ctrl.h
@@ -16,7 +16,6 @@
 .extern use_ibrs
 .extern use_ibpb
 .extern x86_spec_ctrl_priv
-.extern x86_spec_ctrl_base
 
 #define __ASM_ENABLE_IBRS			\
 	pushq %rax;				\
@@ -56,11 +55,6 @@
 	popq %rdx;				\
 	popq %rcx;				\
 	popq %rax
-#define __ASM_DISABLE_IBRS_CLOBBER		\
-	movl $MSR_IA32_SPEC_CTRL, %ecx;		\
-	movl $0, %edx;				\
-	movl x86_spec_ctrl_base, %eax;		\
-	wrmsr;
 
 #define __ASM_STUFF_RSB				\
 	call	1f;				\
@@ -196,10 +190,6 @@
 ALTERNATIVE "", __stringify(__ASM_SET_IBPB), X86_FEATURE_IBRS
 .endm
 
-.macro DISABLE_IBRS_CLOBBER
-ALTERNATIVE "", __stringify(__ASM_DISABLE_IBRS_CLOBBER), X86_FEATURE_IBRS
-.endm
-
 .macro STUFF_RSB
 ALTERNATIVE __stringify(__ASM_STUFF_RSB), "", X86_FEATURE_STUFF_RSB
 .endm