Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / arch / x86 / kernel / vmi_32.c

diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 95a7289e4b0cdd8cc7b88f0504a93b205f2a6934..31e6f6cfe53ef8ea0ecad83b8d28940fce256ca3 100644 (file)
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -817,15 +817,15 @@ static inline int __init activate_vmi(void)
                vmi_timer_ops.set_alarm = vmi_get_function(VMI_CALL_SetAlarm);
                vmi_timer_ops.cancel_alarm =
                         vmi_get_function(VMI_CALL_CancelAlarm);
-               pv_time_ops.time_init = vmi_time_init;
-               pv_time_ops.get_wallclock = vmi_get_wallclock;
-               pv_time_ops.set_wallclock = vmi_set_wallclock;
+               x86_init.timers.timer_init = vmi_time_init;
 #ifdef CONFIG_X86_LOCAL_APIC
-               pv_apic_ops.setup_boot_clock = vmi_time_bsp_init;
-               pv_apic_ops.setup_secondary_clock = vmi_time_ap_init;
+               x86_init.timers.setup_percpu_clockev = vmi_time_bsp_init;
+               x86_cpuinit.setup_percpu_clockev = vmi_time_ap_init;
 #endif
                pv_time_ops.sched_clock = vmi_sched_clock;
-               pv_time_ops.get_tsc_khz = vmi_tsc_khz;
+               x86_platform.calibrate_tsc = vmi_tsc_khz;
+               x86_platform.get_wallclock = vmi_get_wallclock;
+               x86_platform.set_wallclock = vmi_set_wallclock;
 
                /* We have true wallclock functions; disable CMOS clock sync */
                no_sync_cmos_clock = 1;