diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:40 +0100 |
| commit | 92767af0e3904b4d35ed547fb514ff6cb227e678 (patch) | |
| tree | 635be2878ede16e4b12d23cfbd9d8dd16406dcef /arch | |
| parent | 6d63de8dbcda98511206897562ecfcdacf18f523 (diff) | |
| download | linux-stable-92767af0e3904b4d35ed547fb514ff6cb227e678.tar.gz linux-stable-92767af0e3904b4d35ed547fb514ff6cb227e678.tar.bz2 linux-stable-92767af0e3904b4d35ed547fb514ff6cb227e678.zip | |
x86: fix sched_clock()
[ andi@firstfloor.org: build fix ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/rtc.c | 13 |
1 files changed, 4 insertions, 9 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); + |