summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/hypervisor.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-07-18 11:48:50 +0300
committerMarcelo Tosatti <mtosatti@redhat.com>2012-07-18 17:01:48 -0300
commitd63d3e6217c49b81d74141b7920bbe5950532432 (patch)
treefed634e041adb352952baa5655c56ec445fa7524 /arch/x86/kernel/cpu/hypervisor.c
parentebf7d2e9939f6571ef0b7381e7f95eb10f0c686b (diff)
downloadtalos-obmc-linux-d63d3e6217c49b81d74141b7920bbe5950532432.tar.gz
talos-obmc-linux-d63d3e6217c49b81d74141b7920bbe5950532432.zip
x86, hyper: fix build with !CONFIG_KVM_GUEST
Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kernel/cpu/hypervisor.c')
-rw-r--r--arch/x86/kernel/cpu/hypervisor.c2
1 files changed, 2 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud