commit 90993cdd1800dc6ef9587431a0c625b978584e81
author Marcelo Tosatti <mtosatti@redhat.com> Thu Aug 16 17:00:19 2012 -0300
committer Marcelo Tosatti <mtosatti@redhat.com> Thu Aug 23 04:57:54 2012 -0300
tree 246850e7f537b23a860523590f0a93a257fa0880
parent 4d8b81abc47b83a1939e59df2fdb0e98dfe0eedd

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>

arch/x86/kernel/setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f4b9b80..b3386ae 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -957,7 +957,7 @@
 	initmem_init();
 	memblock_find_dma_reserve();
 
-#ifdef CONFIG_KVM_CLOCK
+#ifdef CONFIG_KVM_GUEST
 	kvmclock_init();
 #endif