summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2012-01-30 14:31:46 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-02-03 16:06:27 -0500
commit207d543f472c1ac9552df79838dc807cbcaa9740 (patch)
treef10a7f69cc25e6327607fca9884ba7ed5c2e8aac /arch/x86
parent41bd956de3dfdc3a43708fe2e0c8096c69064a1e (diff)
downloadlinux-207d543f472c1ac9552df79838dc807cbcaa9740.tar.bz2
xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
CC: stable@kernel.org #2.6.37 and onwards Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/xen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 492ade8c978e..d99346ea8fdb 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -374,7 +374,7 @@ int __init pci_xen_init(void)
int __init pci_xen_hvm_init(void)
{
- if (!xen_feature(XENFEAT_hvm_pirqs))
+ if (!xen_have_vector_callback || !xen_feature(XENFEAT_hvm_pirqs))
return 0;
#ifdef CONFIG_ACPI