Utilize the new mechanism which allows us to call those functions
even if the PCI frontend module is not loaded.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
arch/x86/xen/pci.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
index b572f26..b1d0fb0 100644
--- a/arch/x86/xen/pci.c
+++ b/arch/x86/xen/pci.c
@@ -88,6 +88,10 @@ void __init xen_setup_pirqs(void)
}
#ifdef CONFIG_PCI_MSI
+
+struct xen_pci_frontend_ops *xen_pci_frontend;
+EXPORT_SYMBOL(xen_pci_frontend);
+
int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{
int irq, ret, i;
@@ -100,9 +104,9 @@ int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int
type)
if (!xen_initial_domain()) {
if (type == PCI_CAP_ID_MSIX)
- ret = pci_frontend_enable_msix(dev, &v, nvec);
+ ret = xen_pci_frontend_enable_msix(dev, &v, nvec);
else
- ret = pci_frontend_enable_msi(dev, &v);
+ ret = xen_pci_frontend_enable_msi(dev, &v);
if (ret)
goto error;
}
@@ -134,9 +138,9 @@ void xen_teardown_msi_dev(struct pci_dev *dev)
msidesc = list_entry(dev->msi_list.next, struct msi_desc, list);
if (msidesc->msi_attrib.is_msix)
- pci_frontend_disable_msix(dev);
+ xen_pci_frontend_disable_msix(dev);
else
- pci_frontend_disable_msi(dev);
+ xen_pci_frontend_disable_msi(dev);
}
}
--
1.6.2.5
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|