summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-12-16 11:27:23 +0200
committerAvi Kivity <avi@redhat.com>2011-01-12 11:30:56 +0200
commita63512a4d711c9bd6a5d03847f45fcf88cdea0c6 (patch)
tree8638629401129ea989703e643e2fcd12518b7a71 /arch
parent175504cdbfef6a0fde3bafb6c38b4929049ac8ea (diff)
KVM guest: Fix kvm clock initialization when it's configured out
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/kvm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 91b3d650898c..8dc44662394b 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();
}