summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2012-02-23 21:33:05 -0600
committerClark Williams <williams@redhat.com>2012-02-23 21:33:05 -0600
commita0c034c3726715d1928b301ddd43c51799c0c07a (patch)
tree76e78b4646ca0560d8cd0ee041a8bde9a5269c8c /arch
parent086290148fc37d7f2eccb7026b18fb9539ec7820 (diff)
parent9d0231c207faeda051cf54c1a64e1a147d2187fa (diff)
Merge commit 'v3.2.7' into rt-3.2.7-rt13v3.2.7-rt13
Diffstat (limited to 'arch')
-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