diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:40 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:40 -0500 |
commit | 92767af0e3904b4d35ed547fb514ff6cb227e678 (patch) | |
tree | 635be2878ede16e4b12d23cfbd9d8dd16406dcef /arch/x86/kernel/rtc.c | |
parent | 6d63de8dbcda98511206897562ecfcdacf18f523 (diff) |
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/x86/kernel/rtc.c')
-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) | |||
196 | return set_rtc_mmss(now.tv_sec); | 196 | return set_rtc_mmss(now.tv_sec); |
197 | } | 197 | } |
198 | 198 | ||
199 | unsigned long long __vsyscall_fn native_read_tsc(void) | 199 | unsigned long long native_read_tsc(void) |
200 | { | 200 | { |
201 | DECLARE_ARGS(val, low, high); | 201 | return __native_read_tsc(); |
202 | |||
203 | rdtsc_barrier(); | ||
204 | asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); | ||
205 | rdtsc_barrier(); | ||
206 | |||
207 | return EAX_EDX_VAL(val, low, high); | ||
208 | } | 202 | } |
209 | EXPORT_SYMBOL_GPL(native_read_tsc); | 203 | EXPORT_SYMBOL(native_read_tsc); |
204 | |||