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

avikivity · avikivity · commit a63512a4d711 · 2011-01-12T11:30:56.000+02:00
Signed-off-by: Avi Kivity &lt;avi@redhat.com&gt;
diff --git 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();
 }

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,9 @@ static struct notifier_block kvm_pv_reboot_nb = {`
`486`	`486`	`#ifdef CONFIG_SMP`
`487`	`487`	`static void __init kvm_smp_prepare_boot_cpu(void)`
`488`	`488`	`{`
	`489`	`+#ifdef CONFIG_KVM_CLOCK`
`489`	`490`	`WARN_ON(kvm_register_clock("primary cpu clock"));`
	`491`	`+#endif`
`490`	`492`	`kvm_guest_cpu_init();`
`491`	`493`	`native_smp_prepare_boot_cpu();`
`492`	`494`	`}`