Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable upstream bridges even for VFs on virtual buses
  PCI: Add pci_upstream_bridge()
  PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()

1 files changed, 12 insertions, 1 deletions

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 48e8461057ba..5eee4959785d 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -382,7 +382,14 @@ static void xen_teardown_msi_irq(unsigned int irq)
 {
         xen_destroy_irq(irq);
 }
-
+static u32 xen_nop_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
+{
+        return 0;
+}
+static u32 xen_nop_msix_mask_irq(struct msi_desc *desc, u32 flag)
+{
+        return 0;
+}
 #endif
 
 int __init pci_xen_init(void)
@@ -406,6 +413,8 @@ int __init pci_xen_init(void)
         x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
         x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
         x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
+        x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;
+        x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
 #endif
         return 0;
 }
@@ -485,6 +494,8 @@ int __init pci_xen_initial_domain(void)
         x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
         x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
         x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
+        x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;
+        x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
 #endif
         xen_setup_acpi_sci();
         __acpi_register_gsi = acpi_register_gsi_xen;