From: tip-bot for Jiang Biao <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, mingo@kernel.org, jiang.biao2@zte.com.cn,
linux-kernel@vger.kernel.org, tglx@linutronix.de
Subject: [tip:x86/pti] x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation
Date: Thu, 19 Jul 2018 03:33:58 -0700 [thread overview]
Message-ID: <tip-d9f4426c73002957be5dd39936f44a09498f7560@git.kernel.org> (raw)
In-Reply-To: <1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn>
Commit-ID: d9f4426c73002957be5dd39936f44a09498f7560
Gitweb: https://git.kernel.org/tip/d9f4426c73002957be5dd39936f44a09498f7560
Author: Jiang Biao <jiang.biao2@zte.com.cn>
AuthorDate: Wed, 18 Jul 2018 08:03:14 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
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@zte.com.cn>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Cc: dwmw2@amazon.co.uk
Cc: konrad.wilk@oracle.com
Cc: bp@suse.de
Cc: zhong.weidong@zte.com.cn
Link: https://lkml.kernel.org/r/1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn
---
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 */
prev parent reply other threads:[~2018-07-19 10:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 0:03 [PATCH] x86/speculation: remove " Jiang Biao
2018-07-19 10:33 ` tip-bot for Jiang Biao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-d9f4426c73002957be5dd39936f44a09498f7560@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jiang.biao2@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome