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/kernel/paravirt.c | |
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/kernel/paravirt.c')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 9c0e644a76dc..7cbf898d839b 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -309,7 +309,6 @@ struct pv_time_ops pv_time_ops = { | |||
309 | .get_wallclock = native_get_wallclock, | 309 | .get_wallclock = native_get_wallclock, |
310 | .set_wallclock = native_set_wallclock, | 310 | .set_wallclock = native_set_wallclock, |
311 | .sched_clock = native_sched_clock, | 311 | .sched_clock = native_sched_clock, |
312 | .get_tsc_khz = native_calibrate_tsc, | ||
313 | }; | 312 | }; |
314 | 313 | ||
315 | struct pv_irq_ops pv_irq_ops = { | 314 | struct pv_irq_ops pv_irq_ops = { |