Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp202501imm; Tue, 17 Jul 2018 17:07:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf6idRCot1+kxMPlNTIfrerUfbWXhuabm9DI5WPA/+PQr3zD/gxOJjKGLhuap41y4Glua2J X-Received: by 2002:a17:902:b612:: with SMTP id b18-v6mr3559042pls.131.1531872467160; Tue, 17 Jul 2018 17:07:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531872467; cv=none; d=google.com; s=arc-20160816; b=GamTt2DgANFXR/+xXqdYdd8RCWoI8KH1d4YR+Y+u0rnXfl9jcOwJYJar4Bi49kVJ7q XOnQqQH+/FTPqeq/2hJBxGaSfcNV0wLHZg/Z6BRqM36AxoY0VPlZw1EC+2Mu1NN1uu2z V5zR+D9cy4kf2cDsYK4jwwdCJSzQ7h0pB0/TYWQH8KxKqgITZPNYklQgZQ3AjjSr2k01 vig0/6PMDPAwh2cckMxdOS2xDpU+S/OS3AcU8zt/VqfiNDXyj+TgNdZOHDYYOJ6uBcF3 a+6dc8rPwLLbzzJSofmPoMhe40YpkJpZ05tupVhBR863JP8GJu9M6WwPCboIPC7FG3t5 RFzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=kBDUgAfkV8OwjLhXrGJbHuFAMjjEMKsxzYH/qY8wO+4=; b=g/xRPEiczsOFsk2HqlIZLmiUR/S5+5phSiAenyhYajoKpNg7I3c1HJ6bejIaqPFLqD GjB9gC+wqPH5Ymi3S0j2kiKnDQ/EG454I0KvFX+yhqm8F4NMiqS6a4q2eipQEVVXF80Z J9SolVdqBkxxFns4Yu/3vRHpf3zY8Mhhe/EknUsHYivtDjeD9m2J48CeqXe+lcVUDaHW 0xdAm3Nm6ysZcR/dM9fzNoTrNLbxCHa2X+Av8fzLa+I7T997UzCfF+Fg6nrepBpJBQaQ y2z5/piQAKZfieKOaw5fTmHjXnJpIrIhj70RVqNwHVl51mn2ljJIOy59p6goIBWOKgaR b4DQ== 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 v16-v6si1880716pgb.96.2018.07.17.17.07.31; Tue, 17 Jul 2018 17:07:47 -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 S1731296AbeGRAmA (ORCPT + 99 others); Tue, 17 Jul 2018 20:42:00 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:43050 "EHLO mxct.zte.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730180AbeGRAl7 (ORCPT ); Tue, 17 Jul 2018 20:41:59 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 4FBB17E783B3F94649B2; Wed, 18 Jul 2018 08:06:54 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w6I06mMc095899; Wed, 18 Jul 2018 08:06:48 +0800 (GMT-8) (envelope-from jiang.biao2@zte.com.cn) Received: from localhost.localdomain ([10.75.10.200]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018071808065235-762580 ; Wed, 18 Jul 2018 08:06:52 +0800 From: Jiang Biao To: tglx@linutronix.de, mingo@redhat.com Cc: x86@kernel.org, hpa@zytor.com, dwmw@amazon.co.uk, konrad.wilk@oracle.com, bp@suse.de, linux-kernel@vger.kernel.org, zhong.weidong@zte.com.cn, jiang.biao2@zte.com.cn Subject: [PATCH] x86/speculation: remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation Date: Wed, 18 Jul 2018 08:03:14 +0800 Message-Id: <1531872194-39207-1-git-send-email-jiang.biao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-07-18 08:06:52, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-07-18 08:06:40, Serialize complete at 2018-07-18 08:06:40 X-MAIL: mse01.zte.com.cn w6I06mMc095899 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SPECTRE_V2_IBRS in enum spectre_v2_mitigation is never used, remove it to avoid confusing. Signed-off-by: Jiang Biao --- 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 f6f6c63..c99082e 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 */ -- 2.7.4