From: Avi Kivity <avi@redhat.com>
Date: Thu, 16 Dec 2010 09:27:23 +0000 (+0200)
Subject: KVM guest: Fix kvm clock initialization when it's configured out
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a63512a4d711c9bd6a5d03847f45fcf88cdea0c6;p=linux-beck.git

KVM guest: Fix kvm clock initialization when it's configured out

Signed-off-by: Avi Kivity <avi@redhat.com>
---

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();
 }