From d3105c8ff4b625bb858c9b0cb32beaaa874c8395 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Mon, 26 Jul 2010 10:38:45 -0700
Subject: [PATCH] --- yaml --- r: 204788 b: refs/heads/master c:
 b43275d661baa5f1f72dacd9033d6eda09d9fe87 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/hypervisor.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6410517a1227..3de577328029 100644
--- 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
index bffd47c10fed..5bccedcb9121 100644
--- 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;