diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:39 +0100 |
| commit | cdc7957d1954908a39a6964e9c6f643916e76c4b (patch) | |
| tree | f2ab54704a12d7ebeb782b3a539682254d9dc5f9 | |
| parent | fde1b3fa947c2512e3715962ebb1d3a6a9b9bb7d (diff) | |
| download | kernel-crypto-cdc7957d1954908a39a6964e9c6f643916e76c4b.tar.gz kernel-crypto-cdc7957d1954908a39a6964e9c6f643916e76c4b.tar.xz kernel-crypto-cdc7957d1954908a39a6964e9c6f643916e76c4b.zip | |
x86: move native_read_tsc() offline
move native_read_tsc() offline.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/rtc.c | 10 | ||||
| -rw-r--r-- | include/asm-x86/msr.h | 8 |
2 files changed, 11 insertions, 7 deletions
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 <linux/mc146818rtc.h> #include <asm/time.h> +#include <asm/vsyscall.h> #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) { |