summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-26 10:38:45 -0700
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-26 23:13:28 -0700
commitb43275d661baa5f1f72dacd9033d6eda09d9fe87 (patch)
tree4695d8db36eea0b730e1f100cce6d8f39258a5d5 /arch/x86
parent43df95c44e71d009b5a73f104ff183f73af9526f (diff)
xen/pvhvm: fix build problem when !CONFIG_XEN
x86_hyper_xen_hvm is only defined when Xen is enabled in the kernel config. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86')
-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 bffd47c10fe..5bccedcb912 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/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;