From d76590c4f99931a963c52e252b256086efb75a21 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 30 Jan 2012 14:31:46 +0000 Subject: [PATCH] --- yaml --- r: 287618 b: refs/heads/master c: 207d543f472c1ac9552df79838dc807cbcaa9740 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/xen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b447a2d5d519..9040779863e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41bd956de3dfdc3a43708fe2e0c8096c69064a1e +refs/heads/master: 207d543f472c1ac9552df79838dc807cbcaa9740 diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c index 492ade8c978e..d99346ea8fdb 100644 --- a/trunk/arch/x86/pci/xen.c +++ b/trunk/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