summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-07-29 14:37:48 +0100
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-29 11:11:33 -0700
commitca65f9fc0c447da5b270b05c41c21b19c88617c3 (patch)
tree7a8813233d867635d01cc2c8397099df4468751d /drivers/xen
parentb98a409b80ac510c95b4f1bafdef28edaeabd3e7 (diff)
downloadlinux-ca65f9fc0c447da5b270b05c41c21b19c88617c3.tar.gz
linux-ca65f9fc0c447da5b270b05c41c21b19c88617c3.tar.bz2
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 'drivers/xen')
-rw-r--r--drivers/xen/Kconfig2
-rw-r--r--drivers/xen/events.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 8f84b108b491..0a8826936639 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -64,7 +64,7 @@ config XEN_SYS_HYPERVISOR
config XEN_PLATFORM_PCI
tristate "xen platform pci device driver"
- depends on XEN
+ depends on XEN_PVHVM
default m
help
Driver for the Xen PCI Platform device: it is responsible for
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index b5a254e9aebe..5e1f34892dcc 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -973,6 +973,7 @@ int xen_set_callback_via(uint64_t via)
}
EXPORT_SYMBOL_GPL(xen_set_callback_via);
+#ifdef CONFIG_XEN_PVHVM
/* Vector callbacks are better than PCI interrupts to receive event
* channel notifications because we can receive vector callbacks on any
* vcpu and we don't need PCI support or APIC interactions. */
@@ -996,6 +997,9 @@ void xen_callback_vector(void)
alloc_intr_gate(XEN_HVM_EVTCHN_CALLBACK, xen_hvm_callback_vector);
}
}
+#else
+void xen_callback_vector(void) {}
+#endif
void __init xen_init_IRQ(void)
{