x86: Move percpu clockevents setup to x86_init_ops

paravirt overrides the setup of the default apic timers as per cpu
timers. Moorestown needs to override that as well.

Move it to x86_init_ops setup and create a separate x86_cpuinit struct
which holds the function for the secondary evtl. hotplugabble CPUs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 95a7289e4b0c..b43b6685cae1 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -821,8 +821,8 @@ static inline int __init activate_vmi(void)
                 pv_time_ops.get_wallclock = vmi_get_wallclock;
                 pv_time_ops.set_wallclock = vmi_set_wallclock;
 #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;