3.16.68-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Jiang Biao <jiang.biao2@xxxxxxxxxx> commit d9f4426c73002957be5dd39936f44a09498f7560 upstream. 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 [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> --- arch/x86/include/asm/nospec-branch.h | 1 - 1 file changed, 1 deletion(-) --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -169,7 +169,6 @@ enum spectre_v2_mitigation { SPECTRE_V2_RETPOLINE_MINIMAL_AMD, SPECTRE_V2_RETPOLINE_GENERIC, SPECTRE_V2_RETPOLINE_AMD, - SPECTRE_V2_IBRS, SPECTRE_V2_IBRS_ENHANCED, };
