|
@@ -125,7 +125,7 @@ static struct clocksource kvm_clock = {
|
|
|
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
|
|
|
};
|
|
|
|
|
|
-static int kvm_register_clock(char *txt)
|
|
|
+int kvm_register_clock(char *txt)
|
|
|
{
|
|
|
int cpu = smp_processor_id();
|
|
|
int low, high, ret;
|
|
@@ -152,14 +152,6 @@ static void __cpuinit kvm_setup_secondary_clock(void)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SMP
|
|
|
-static void __init kvm_smp_prepare_boot_cpu(void)
|
|
|
-{
|
|
|
- WARN_ON(kvm_register_clock("primary cpu clock"));
|
|
|
- native_smp_prepare_boot_cpu();
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* After the clock is registered, the host will keep writing to the
|
|
|
* registered memory location. If the guest happens to shutdown, this memory
|
|
@@ -205,9 +197,6 @@ void __init kvmclock_init(void)
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
x86_cpuinit.setup_percpu_clockev =
|
|
|
kvm_setup_secondary_clock;
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_SMP
|
|
|
- smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
|
|
|
#endif
|
|
|
machine_ops.shutdown = kvm_shutdown;
|
|
|
#ifdef CONFIG_KEXEC
|