diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 10:11:33 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 10:11:33 -0700 |
| commit | 149792795d2bab33954bc025fcf145a8009683f6 (patch) | |
| tree | aee13528ef690a64decf22e2c412b15644442a80 /arch/s390/pci/pci.c | |
| parent | Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/numa' and 'pci/virtualization' into next (diff) | |
| parent | s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() (diff) | |
| download | linux-dev-149792795d2bab33954bc025fcf145a8009683f6.tar.xz linux-dev-149792795d2bab33954bc025fcf145a8009683f6.zip | |
Merge branch 'pci/msi' into next
* pci/msi:
s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits
Diffstat (limited to 'arch/s390/pci/pci.c')
| -rw-r--r-- | arch/s390/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 2fa7b14b9c08..552b9908aa77 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev) /* Release MSI interrupts */ list_for_each_entry(msi, &pdev->msi_list, list) { if (msi->msi_attrib.is_msix) - default_msix_mask_irq(msi, 1); + __msix_mask_irq(msi, 1); else - default_msi_mask_irq(msi, 1, 1); + __msi_mask_irq(msi, 1, 1); irq_set_msi_desc(msi->irq, NULL); irq_free_desc(msi->irq); msi->msg.address_lo = 0; |