From: Ingo Molnar Date: Wed, 30 Jan 2008 12:32:39 +0000 (+0100) Subject: x86: move native_read_tsc() offline X-Git-Tag: v2.6.25-rc1~1143^2~422 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cdc7957d1954908a39a6964e9c6f643916e76c4b;p=linux-2.6-omap-h63xx.git x86: move native_read_tsc() offline move native_read_tsc() offline. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index d040840ff1b..c42cf126388 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -6,6 +6,7 @@ #include #include +#include #ifdef CONFIG_X86_32 # define CMOS_YEARS_OFFS 1900 @@ -194,3 +195,12 @@ int update_persistent_clock(struct timespec now) { return set_rtc_mmss(now.tv_sec); } + +unsigned long long __vsyscall_fn native_read_tsc(void) +{ + DECLARE_ARGS(val, low, high); + + asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); + return EAX_EDX_VAL(val, low, high); +} +EXPORT_SYMBOL_GPL(native_read_tsc); diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index bca8c395013..decfec4ab17 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h @@ -91,13 +91,7 @@ static inline int native_write_msr_safe(unsigned int msr, return err; } -static inline unsigned long long native_read_tsc(void) -{ - DECLARE_ARGS(val, low, high); - - asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); - return EAX_EDX_VAL(val, low, high); -} +extern unsigned long long native_read_tsc(void); static inline unsigned long long native_read_pmc(int counter) {