aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2012-01-30 14:31:46 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-20 12:48:13 -0800
commitd3a6a79cfe7641d797ab74eea55b93e0f35f66d7 (patch)
treeed2d53249190f7779fdb6a234d6ebbdeabc71703 /arch/x86
parentc17b9573c236874b9a8a6c4c03c02accf70c9cd5 (diff)
downloadkernel_samsung_aries-d3a6a79cfe7641d797ab74eea55b93e0f35f66d7.zip
kernel_samsung_aries-d3a6a79cfe7641d797ab74eea55b93e0f35f66d7.tar.gz
kernel_samsung_aries-d3a6a79cfe7641d797ab74eea55b93e0f35f66d7.tar.bz2
xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
commit 207d543f472c1ac9552df79838dc807cbcaa9740 upstream. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 f567965..6e96e65 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