diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 11:06:25 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 03:35:47 -0400 |
| commit | 2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78 (patch) | |
| tree | 7db2dc0fbde3a25a89f1fc1514152567f612ccde /arch/x86/include/asm/paravirt.h | |
| parent | 47926214d8b2bef13b2be57c500194a804f16198 (diff) | |
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/paravirt.h')
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 11a4ba7b209c..1e458a553303 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
| @@ -210,7 +210,6 @@ static inline unsigned long long paravirt_sched_clock(void) | |||
| 210 | { | 210 | { |
| 211 | return PVOP_CALL0(unsigned long long, pv_time_ops.sched_clock); | 211 | return PVOP_CALL0(unsigned long long, pv_time_ops.sched_clock); |
| 212 | } | 212 | } |
| 213 | #define calibrate_tsc() (pv_time_ops.get_tsc_khz()) | ||
| 214 | 213 | ||
| 215 | static inline unsigned long long paravirt_read_pmc(int counter) | 214 | static inline unsigned long long paravirt_read_pmc(int counter) |
| 216 | { | 215 | { |