---

yaml --- r: 204788 b: refs/heads/master c: b43275d h: refs/heads/master v: v3
git-mirror · Jul 27, 2010 · d3105c8 · d3105c8
1 parent 17569aa
commit d3105c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43df95c44e71d009b5a73f104ff183f73af9526f
+refs/heads/master: b43275d661baa5f1f72dacd9033d6eda09d9fe87
diff --git a/trunk/arch/x86/kernel/cpu/hypervisor.c b/trunk/arch/x86/kernel/cpu/hypervisor.c
@@ -34,7 +34,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
 	&x86_hyper_vmware,
 	&x86_hyper_ms_hyperv,
+#ifdef CONFIG_XEN
 	&x86_hyper_xen_hvm,
+#endif
 };
 
 const struct hypervisor_x86 *x86_hyper;