diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-16 17:00:19 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 04:57:54 -0300 |
| commit | 90993cdd1800dc6ef9587431a0c625b978584e81 (patch) | |
| tree | 246850e7f537b23a860523590f0a93a257fa0880 /arch/x86/kernel/kvm.c | |
| parent | KVM: introduce readonly memslot (diff) | |
| download | linux-dev-90993cdd1800dc6ef9587431a0c625b978584e81.tar.xz linux-dev-90993cdd1800dc6ef9587431a0c625b978584e81.zip | |
x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST
The distinction between CONFIG_KVM_CLOCK and CONFIG_KVM_GUEST is
not so clear anymore, as demonstrated by recent bugs caused by poor
handling of on/off combinations of these options.
Merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST.
Reported-By: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kernel/kvm.c')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 1596cc8fd793..b3e5e51bc907 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -397,9 +397,7 @@ void kvm_disable_steal_time(void) #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(); } |