x86/asm/tsc: Remove rdtsc_barrier() (bb8dd960) · Commits · 戴 / test

All callers have been converted to rdtsc_ordered(). Signed-off-by:

Andy Lutomirski <luto@kernel.org> Signed-off-by:

Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Huang Rui <ray.huang@amd.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Len Brown <lenb@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Richard Weinberger <richard@nod.at> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: kvm ML <kvm@vger.kernel.org> Link: http://lkml.kernel.org/r/9baa4ae9a1e7c7c282f9cb2f15bb6bf5c2004032.1434501121.git.luto@kernel.org Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/include/asm/barrier.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -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 */

arch/x86/um/asm/barrier.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -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

Admin message