Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753804AbeAFVLz (ORCPT + 1 other); Sat, 6 Jan 2018 16:11:55 -0500 Received: from terminus.zytor.com ([65.50.211.136]:38373 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264AbeAFVLy (ORCPT ); Sat, 6 Jan 2018 16:11:54 -0500 Date: Sat, 6 Jan 2018 13:06:25 -0800 From: tip-bot for Tom Lendacky Message-ID: Cc: torvalds@linux-foundation.org, tim.c.chen@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, dwmw@amazon.co.uk, thomas.lendacky@amd.com, dave.hansen@intel.com, gregkh@linux-foundation.org, pjt@google.com, peterz@infradead.org, mingo@kernel.org, bp@alien8.de Reply-To: gregkh@linux-foundation.org, dave.hansen@intel.com, mingo@kernel.org, bp@alien8.de, peterz@infradead.org, pjt@google.com, dwmw@amazon.co.uk, tglx@linutronix.de, thomas.lendacky@amd.com, tim.c.chen@linux.intel.com, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <20180105160805.23786.5177.stgit@tlendack-t1.amdoffice.net> References: <20180105160805.23786.5177.stgit@tlendack-t1.amdoffice.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/msr: Remove now unused definition of MFENCE_RDTSC feature Git-Commit-ID: eeab3eee2fa4a8e8eb52e2abf034f14f1d010e0d 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: eeab3eee2fa4a8e8eb52e2abf034f14f1d010e0d Gitweb: https://git.kernel.org/tip/eeab3eee2fa4a8e8eb52e2abf034f14f1d010e0d Author: Tom Lendacky AuthorDate: Fri, 5 Jan 2018 10:08:05 -0600 Committer: Thomas Gleixner CommitDate: Sat, 6 Jan 2018 21:57:41 +0100 x86/msr: Remove now unused definition of MFENCE_RDTSC feature With the switch to using LFENCE_RDTSC on AMD platforms there is no longer a need for the MFENCE_RDTSC feature. Remove its usage and definition. Signed-off-by: Tom Lendacky Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Dave Hansen Cc: Tim Chen Cc: Greg Kroah-Hartman Cc: David Woodhouse Cc: Paul Turner Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180105160805.23786.5177.stgit@tlendack-t1.amdoffice.net --- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/msr.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 1641c2f..511d909 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -96,7 +96,7 @@ #define X86_FEATURE_SYSCALL32 ( 3*32+14) /* "" syscall in IA32 userspace */ #define X86_FEATURE_SYSENTER32 ( 3*32+15) /* "" sysenter in IA32 userspace */ #define X86_FEATURE_REP_GOOD ( 3*32+16) /* REP microcode works well */ -#define X86_FEATURE_MFENCE_RDTSC ( 3*32+17) /* "" MFENCE synchronizes RDTSC */ +/* free, was: #define X86_FEATURE_MFENCE_RDTSC ( 3*32+17) "" MFENCE synchronizes RDTSC */ #define X86_FEATURE_LFENCE_RDTSC ( 3*32+18) /* "" LFENCE synchronizes RDTSC */ #define X86_FEATURE_ACC_POWER ( 3*32+19) /* AMD Accumulated Power Mechanism */ #define X86_FEATURE_NOPL ( 3*32+20) /* The NOPL (0F 1F) instructions */ diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 07962f5..8d8d7ae 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -214,8 +214,7 @@ static __always_inline unsigned long long rdtsc_ordered(void) * that some other imaginary CPU is updating continuously with a * time stamp. */ - alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, - "lfence", X86_FEATURE_LFENCE_RDTSC); + alternative("", "lfence", X86_FEATURE_LFENCE_RDTSC); return rdtsc(); }