[PATCH 1/2][X] x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation
Tyler Hicks
tyhicks at canonical.com
Fri Oct 19 23:35:15 UTC 2018
From: Jiang Biao <jiang.biao2 at zte.com.cn>
BugLink: https://launchpad.net/bugs/1786139
SPECTRE_V2_IBRS in enum spectre_v2_mitigation is never used. Remove it.
Signed-off-by: Jiang Biao <jiang.biao2 at zte.com.cn>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: hpa at zytor.com
Cc: dwmw2 at amazon.co.uk
Cc: konrad.wilk at oracle.com
Cc: bp at suse.de
Cc: zhong.weidong at zte.com.cn
Link: https://lkml.kernel.org/r/1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn
(backported from commit d9f4426c73002957be5dd39936f44a09498f7560)
[tyhicks: Minor context change]
Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
arch/x86/include/asm/nospec-branch.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 460e94856724..9bfe6d72ada3 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -191,7 +191,6 @@ enum spectre_v2_mitigation {
SPECTRE_V2_RETPOLINE_MINIMAL_AMD,
SPECTRE_V2_RETPOLINE_GENERIC,
SPECTRE_V2_RETPOLINE_AMD,
- SPECTRE_V2_IBRS,
};
/* The Intel SPEC CTRL MSR base value cache */
--
2.7.4
More information about the kernel-team
mailing list