From: Avi Kivity <avi@xxxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 91b3d65..8dc4466 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -486,7 +486,9 @@ static struct notifier_block kvm_pv_reboot_nb = {
#ifdef CONFIG_SMP
static void __init kvm_smp_prepare_boot_cpu(void)
{
+#ifdef CONFIG_KVM_CLOCK
WARN_ON(kvm_register_clock("primary cpu clock"));
+#endif
kvm_guest_cpu_init();
native_smp_prepare_boot_cpu();
}
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
