diff options
| author | Andy Lutomirski <luto@kernel.org> | 2015-06-15 17:39:57 -0700 |
|---|---|---|
| committer | Andy Lutomirski <luto@kernel.org> | 2015-06-16 17:30:29 -0700 |
| commit | 9baa4ae9a1e7c7c282f9cb2f15bb6bf5c2004032 (patch) | |
| tree | 1f069fc74fd1deaa949377b0148bd7ce824ad712 | |
| parent | 678981cc4761fb38a793c217c9cac42503cf3719 (diff) | |
| download | devel-x86/rdtsc.tar.gz | |
x86/tsc: Remove rdtsc_barrier()x86/rdtsc
All callers have been converted to rdtsc_ordered().
Signed-off-by: Andy Lutomirski <luto@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 11 | ||||
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 13 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index e51a8f803f55e3..818cb87882255e 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 b9531d34313491..755481f14d90f2 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 |