From: Avi Kivity <avi@redhat.com>
Date: Wed, 18 Jul 2012 08:48:50 +0000 (+0300)
Subject: x86, hyper: fix build with !CONFIG_KVM_GUEST
X-Git-Tag: next-20120724~30^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d63d3e6217c49b81d74141b7920bbe5950532432;p=karo-tx-linux.git

x86, hyper: fix build with !CONFIG_KVM_GUEST

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 6d6dd7afb229..a8f8fa9769d6 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -37,7 +37,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
 #endif
 	&x86_hyper_vmware,
 	&x86_hyper_ms_hyperv,
+#ifdef CONFIG_KVM_GUEST
 	&x86_hyper_kvm,
+#endif
 };
 
 const struct hypervisor_x86 *x86_hyper;