summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/time_64.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2008-01-30 13:32:39 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:32:39 +0100
commit6d63de8dbcda98511206897562ecfcdacf18f523 (patch)
treef845f109636c3cc7eddad455b89ffb986a1188d0 /arch/x86/kernel/time_64.c
parentf06e4ec1c15691b0cfd2397ae32214fa36c90d71 (diff)
x86: remove get_cycles_sync
rdtsc is now speculation-safe, so no need for the sync variants of the APIs. [ mingo@elte.hu: removed the nsec_barrier() complication. ] Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/time_64.c')
-rw-r--r--arch/x86/kernel/time_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 91d4d495904e..61b17f5ec867 100644
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -83,7 +83,7 @@ unsigned long __init native_calculate_cpu_khz(void)
rdtscl(tsc_start);
do {
rdmsrl(MSR_K7_PERFCTR0 + i, pmc_now);
- tsc_now = get_cycles_sync();
+ tsc_now = get_cycles();
} while ((tsc_now - tsc_start) < TICK_COUNT);
local_irq_restore(flags);