Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1536552imm; Thu, 19 Jul 2018 03:35:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfI9NcZOYDjcpWUdep9adT8NaECU7/RpMvKZrVxiFdKU1w5aRRzdGJTMP0JfZUuQJqpoBmX X-Received: by 2002:a17:902:ac96:: with SMTP id h22-v6mr9629281plr.17.1531996502978; Thu, 19 Jul 2018 03:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531996502; cv=none; d=google.com; s=arc-20160816; b=AMFD8uRsZR6i+VUSajNz6ldoWHEeiYQrC0mvQxGkskzGUt2P/plkv6/bMJR1ZlqG+c PrI1aSLjWyUaJNR8/yeO8pYdambcW8MucA55QAPcgjvj7xF2HWlxe9Hy/VZ0QZpeJ5Y6 rluV58IGaSuXxE7FrMuVwGbR7fI8U1DaNIndOIM2gide1usYnMJmwO+zbzdfIReSInpB GT+C8kTgkvv1NVjWcjDyvdCtHo/kJ4NRqiSBLZWv4GwjdE3ysba055pykPKf7UK6RCWz Xp3r3MdhI7eXkRrZATKmUZlDp3Zjr/odw5Jx7qLRyNw/45IQaRdOZhCqKSG11kqf+orl qA4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=R80+PFraoyZ2Al/aafDtTgjF7y307zEs1CAMvd4rXj0=; b=pF6FKHda+ZlcjWRjIv4on5rKxxssc4r0z9TxeWXetobrolc8ifET/fyh6d6NCSAX6Y A5s7QzG2LfD3TWw+bVq5LC10dQHKCUpsg6pt0zW0K/P7ypy+/achPhjSgMDIWZbgf3Am 1Uh/ayV5rVdyCOI42iLHlEX48Gp2O6SsraLhdA+LgzgA6gl04VuQyhVWYFPKrvNhlkIY P2/+jRhABTTC/WUtieNp0Bj4bcVv+ZD1oyZcwi0FxHdMc0DMTJXZ2edokFS/zdPTzOPe rlj4F6fQWxh+eGtC4EMaQjWlS464YiToEiyrPUlz0BQY7qPqk169bWJg3TJVcRamGl+T 67Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 6-v6si5345824plb.409.2018.07.19.03.34.48; Thu, 19 Jul 2018 03:35:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730693AbeGSLQg (ORCPT + 99 others); Thu, 19 Jul 2018 07:16:36 -0400 Received: from terminus.zytor.com ([198.137.202.136]:36963 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbeGSLQf (ORCPT ); Thu, 19 Jul 2018 07:16:35 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6JAXwDa2249991 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 19 Jul 2018 03:33:58 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6JAXwXF2249987; Thu, 19 Jul 2018 03:33:58 -0700 Date: Thu, 19 Jul 2018 03:33:58 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Jiang Biao Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, jiang.biao2@zte.com.cn, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jiang.biao2@zte.com.cn In-Reply-To: <1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn> References: <1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation Git-Commit-ID: d9f4426c73002957be5dd39936f44a09498f7560 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_FUTURE_96_Q autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d9f4426c73002957be5dd39936f44a09498f7560 Gitweb: https://git.kernel.org/tip/d9f4426c73002957be5dd39936f44a09498f7560 Author: Jiang Biao AuthorDate: Wed, 18 Jul 2018 08:03:14 +0800 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner 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 */