From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755829AbbGFPqo (ORCPT ); Mon, 6 Jul 2015 11:46:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49568 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755797AbbGFPql (ORCPT ); Mon, 6 Jul 2015 11:46:41 -0400 Date: Mon, 6 Jul 2015 08:45:28 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: luto@kernel.org, richard@nod.at, hpa@zytor.com, mingo@kernel.org, bp@alien8.de, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, lenb@kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, bp@suse.de, tglx@linutronix.de, peterz@infradead.org, ray.huang@amd.com, luto@amacapital.net, brgerst@gmail.com, john.stultz@linaro.org, ralf@linux-mips.org Reply-To: luto@amacapital.net, brgerst@gmail.com, john.stultz@linaro.org, ralf@linux-mips.org, ray.huang@amd.com, tglx@linutronix.de, peterz@infradead.org, kvm@vger.kernel.org, bp@suse.de, dvlasenk@redhat.com, torvalds@linux-foundation.org, lenb@kernel.org, linux-kernel@vger.kernel.org, richard@nod.at, luto@kernel.org, bp@alien8.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <9baa4ae9a1e7c7c282f9cb2f15bb6bf5c2004032.1434501121.git.luto@kernel.org> References: <9baa4ae9a1e7c7c282f9cb2f15bb6bf5c2004032.1434501121.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/tsc: Remove rdtsc_barrier() Git-Commit-ID: bb8dd96032fc63babfc8b378a37dd7681eeec326 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 Commit-ID: bb8dd96032fc63babfc8b378a37dd7681eeec326 Gitweb: http://git.kernel.org/tip/bb8dd96032fc63babfc8b378a37dd7681eeec326 Author: Andy Lutomirski AuthorDate: Thu, 25 Jun 2015 18:44:12 +0200 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:23:30 +0200 x86/asm/tsc: Remove rdtsc_barrier() All callers have been converted to rdtsc_ordered(). Signed-off-by: Andy Lutomirski Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang Rui Cc: John Stultz Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ralf Baechle Cc: Richard Weinberger Cc: Thomas Gleixner Cc: kvm ML Link: http://lkml.kernel.org/r/9baa4ae9a1e7c7c282f9cb2f15bb6bf5c2004032.1434501121.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/barrier.h | 11 ----------- arch/x86/um/asm/barrier.h | 13 ------------- 2 files changed, 24 deletions(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index e51a8f8..818cb87 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -91,15 +91,4 @@ do { \ #define smp_mb__before_atomic() barrier() #define smp_mb__after_atomic() barrier() -/* - * Stop RDTSC speculation. This is needed when you need to use RDTSC - * (or get_cycles or vread that possibly accesses the TSC) in a defined - * code region. - */ -static __always_inline void rdtsc_barrier(void) -{ - alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, - "lfence", X86_FEATURE_LFENCE_RDTSC); -} - #endif /* _ASM_X86_BARRIER_H */ diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index b9531d3..755481f 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -45,17 +45,4 @@ #define read_barrier_depends() do { } while (0) #define smp_read_barrier_depends() do { } while (0) -/* - * Stop RDTSC speculation. This is needed when you need to use RDTSC - * (or get_cycles or vread that possibly accesses the TSC) in a defined - * code region. - * - * (Could use an alternative three way for this if there was one.) - */ -static inline void rdtsc_barrier(void) -{ - alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, - "lfence", X86_FEATURE_LFENCE_RDTSC); -} - #endif