From: Stefano Stabellini Date: Mon, 30 Jan 2012 14:31:46 +0000 (+0000) Subject: xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback X-Git-Tag: v2.6.39-400.9.0~595^2~12^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=385c899ca0752bd526b84b36bc62f777dcf2f460;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index f567965c0620..6e96e65e7caa 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -308,7 +308,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