[tip:x86/pti] x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation

From: tip-bot for Jiang Biao
Date: Thu Jul 19 2018 - 06:34:08 EST


Commit-ID: d9f4426c73002957be5dd39936f44a09498f7560
Gitweb: https://git.kernel.org/tip/d9f4426c73002957be5dd39936f44a09498f7560
Author: Jiang Biao <jiang.biao2@xxxxxxxxxx>
AuthorDate: Wed, 18 Jul 2018 08:03:14 +0800
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Thu, 19 Jul 2018 12:31:00 +0200

x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation

SPECTRE_V2_IBRS in enum spectre_v2_mitigation is never used. Remove it.

Signed-off-by: Jiang Biao <jiang.biao2@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: hpa@xxxxxxxxx
Cc: dwmw2@xxxxxxxxxxxx
Cc: konrad.wilk@xxxxxxxxxx
Cc: bp@xxxxxxx
Cc: zhong.weidong@xxxxxxxxxx
Link: https://lkml.kernel.org/r/1531872194-39207-1-git-send-email-jiang.biao2@xxxxxxxxxx

---
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 f6f6c63da62f..c99082e2ef13 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -214,7 +214,6 @@ enum spectre_v2_mitigation {
SPECTRE_V2_RETPOLINE_MINIMAL_AMD,
SPECTRE_V2_RETPOLINE_GENERIC,
SPECTRE_V2_RETPOLINE_AMD,
- SPECTRE_V2_IBRS,
};

/* The Speculative Store Bypass disable variants */