diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 17:06:25 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 09:35:47 +0200 |
| commit | 2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78 (patch) | |
| tree | 7db2dc0fbde3a25a89f1fc1514152567f612ccde /arch/x86/include/asm/timer.h | |
| parent | x86: Replace the now identical time_32/64.c by time.c (diff) | |
| download | linux-2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78.tar.xz linux-2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78.zip | |
x86: Move tsc_calibration to x86_init_ops
TSC calibration is modified by the vmware hypervisor and paravirt by
separate means. Moorestown wants to add its own calibration routine as
well. So make calibrate_tsc a proper x86_init_ops function and
override it by paravirt or by the early setup of the vmware
hypervisor.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/timer.h')
| -rw-r--r-- | arch/x86/include/asm/timer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index 65228ccc5f0d..5469630b27f5 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -8,7 +8,6 @@ #define TICK_SIZE (tick_nsec / 1000) unsigned long long native_sched_clock(void); -unsigned long native_calibrate_tsc(void); extern int recalibrate_cpu_khz(void); #if defined(CONFIG_X86_32) && defined(CONFIG_X86_IO_APIC) @@ -19,10 +18,6 @@ extern int timer_ack; extern int no_timer_check; -#ifndef CONFIG_PARAVIRT -#define calibrate_tsc() native_calibrate_tsc() -#endif - /* Accelerators for sched_clock() * convert from cycles(64bits) => nanoseconds (64bits) * basic equation: |