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>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 6caa8c0c793..fabe745513d 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1320,11 +1320,11 @@ __init void lguest_init(void)
 
         /* Time operations */
         pv_time_ops.get_wallclock = lguest_get_wallclock;
-        pv_time_ops.get_tsc_khz = lguest_tsc_khz;
 
         x86_init.resources.memory_setup = lguest_memory_setup;
         x86_init.irqs.intr_init = lguest_init_IRQ;
         x86_init.timers.timer_init = lguest_time_init;
+        x86_platform.calibrate_tsc = lguest_tsc_khz;
 
         /*
          * Now is a good time to look at the implementations of these functions