diff options
| -rw-r--r-- | arch/x86/kernel/rtc.c | 13 | ||||
| -rw-r--r-- | include/asm-x86/msr.h | 11 | ||||
| -rw-r--r-- | include/asm-x86/tsc.h | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 276cb7073ab1..eb9b1a198f5e 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -196,14 +196,9 @@ int update_persistent_clock(struct timespec now) return set_rtc_mmss(now.tv_sec); } -unsigned long long __vsyscall_fn native_read_tsc(void) +unsigned long long native_read_tsc(void) { - DECLARE_ARGS(val, low, high); - - rdtsc_barrier(); - asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); - rdtsc_barrier(); - - return EAX_EDX_VAL(val, low, high); + return __native_read_tsc(); } -EXPORT_SYMBOL_GPL(native_read_tsc); +EXPORT_SYMBOL(native_read_tsc); + diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index decfec4ab17c..204a8a30fecf 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h @@ -93,6 +93,17 @@ static inline int native_write_msr_safe(unsigned int msr, extern unsigned long long native_read_tsc(void); +static __always_inline unsigned long long __native_read_tsc(void) +{ + DECLARE_ARGS(val, low, high); + + rdtsc_barrier(); + asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); + rdtsc_barrier(); + + return EAX_EDX_VAL(val, low, high); +} + static inline unsigned long long native_read_pmc(int counter) { DECLARE_ARGS(val, low, high); diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index f51a50da35aa..071e0ce5b664 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h @@ -46,7 +46,7 @@ static inline cycles_t vget_cycles(void) if (!cpu_has_tsc) return 0; #endif - return (cycles_t) native_read_tsc(); + return (cycles_t) __native_read_tsc(); } extern void tsc_init(void); |