summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/hypervisor.c
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-07-29 15:37:48 +0200
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-29 20:11:33 +0200
commitca65f9fc0c447da5b270b05c41c21b19c88617c3 (patch)
tree7a8813233d867635d01cc2c8397099df4468751d /arch/x86/kernel/cpu/hypervisor.c
parentblkfront: do not create a PV cdrom device if xen_hvm_guest (diff)
downloadlinux-ca65f9fc0c447da5b270b05c41c21b19c88617c3.tar.xz
linux-ca65f9fc0c447da5b270b05c41c21b19c88617c3.zip
Introduce CONFIG_XEN_PVHVM compile option
This patch introduce a CONFIG_XEN_PVHVM compile time option to enable/disable Xen PV on HVM support. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'arch/x86/kernel/cpu/hypervisor.c')
-rw-r--r--arch/x86/kernel/cpu/hypervisor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 5bccedcb9121..8095f8611f8a 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -34,7 +34,7 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
{
&x86_hyper_vmware,
&x86_hyper_ms_hyperv,
-#ifdef CONFIG_XEN
+#ifdef CONFIG_XEN_PVHVM
&x86_hyper_xen_hvm,
#endif
};