diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-16 22:00:19 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 09:57:54 +0200 |
| commit | 90993cdd1800dc6ef9587431a0c625b978584e81 (patch) | |
| tree | 246850e7f537b23a860523590f0a93a257fa0880 /arch/x86/kernel/setup.c | |
| parent | KVM: introduce readonly memslot (diff) | |
| download | linux-90993cdd1800dc6ef9587431a0c625b978584e81.tar.xz linux-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/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f4b9b80e1b95..b3386ae3438b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -957,7 +957,7 @@ void __init setup_arch(char **cmdline_p) initmem_init(); memblock_find_dma_reserve(); -#ifdef CONFIG_KVM_CLOCK +#ifdef CONFIG_KVM_GUEST kvmclock_init(); #endif |