aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/timer.h
diff options
context:
space:
mode:
authorAlok Kataria <akataria@vmware.com>2008-07-01 11:43:36 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-09 07:43:28 +0200
commite93ef949fd9a3f237aedfb8e64414b28980530b8 (patch)
tree4856aa8bf0e02ed1692fe7b4f545c52cdc1705a3 /include/asm-x86/timer.h
parent8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (diff)
x86: rename paravirtualized TSC functions
Rename the paravirtualized calculate_cpu_khz to calibrate_tsc. In all cases, we actually calibrate_tsc and use that as the cpu_khz value. Signed-off-by: Alok N Kataria <akataria@vmware.com> Signed-off-by: Dan Hecht <dhecht@vmware.com> Cc: Dan Hecht <dhecht@vmware.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/timer.h')
-rw-r--r--include/asm-x86/timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h
index 4f6fcb050c1..fb2a4ddddf3 100644
--- a/include/asm-x86/timer.h
+++ b/include/asm-x86/timer.h
@@ -7,14 +7,14 @@
#define TICK_SIZE (tick_nsec / 1000)
unsigned long long native_sched_clock(void);
-unsigned long native_calculate_cpu_khz(void);
+unsigned long native_calibrate_tsc(void);
extern int timer_ack;
extern int no_timer_check;
extern int recalibrate_cpu_khz(void);
#ifndef CONFIG_PARAVIRT
-#define calculate_cpu_khz() native_calculate_cpu_khz()
+#define calibrate_tsc() native_calibrate_tsc()
#endif
/* Accelerators for sched_clock()