| commit | a63512a4d711c9bd6a5d03847f45fcf88cdea0c6 | [log] [tgz] |
|---|---|---|
| author | Avi Kivity <avi@redhat.com> | Thu Dec 16 11:27:23 2010 +0200 |
| committer | Avi Kivity <avi@redhat.com> | Wed Jan 12 11:30:56 2011 +0200 |
| tree | 8638629401129ea989703e643e2fcd12518b7a71 | |
| parent | 175504cdbfef6a0fde3bafb6c38b4929049ac8ea [diff] |
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 91b3d65..8dc4466 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c
@@ -486,7 +486,9 @@ #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(); }