summaryrefslogtreecommitdiffstats
path: root/include/linux/msi.h
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2014-10-27 10:44:37 +0800
committerBjorn Helgaas <bhelgaas@google.com>2014-11-11 15:14:30 -0700
commit03f56e42d03eb7d0a47e40e9ae72a3ac0afeff08 (patch)
tree566745f2b5cfd29a9c56fe53a6449aa9f0dc6e01 /include/linux/msi.h
parent38737d82f9f0168955f9944c3f8bd3bb262c7e88 (diff)
downloadlinux-03f56e42d03eb7d0a47e40e9ae72a3ac0afeff08.tar.gz
linux-03f56e42d03eb7d0a47e40e9ae72a3ac0afeff08.tar.bz2
linux-03f56e42d03eb7d0a47e40e9ae72a3ac0afeff08.zip
Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
The problem fixed by 0e4ccb1505a9 ("PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()") has been fixed in a simpler way by a previous commit ("PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits"). The msi_mask_irq() and msix_mask_irq() x86_msi_ops added by 0e4ccb1505a9 are no longer needed, so revert the commit. default_msi_mask_irq() and default_msix_mask_irq() were added by 0e4ccb1505a9 and are still used by s390, so keep them for now. [bhelgaas: changelog] Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: David Vrabel <david.vrabel@citrix.com> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: xen-devel@lists.xenproject.org
Diffstat (limited to 'include/linux/msi.h')
-rw-r--r--include/linux/msi.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 86dc501a1534..f6630a53be70 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -22,6 +22,8 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void read_msi_msg(unsigned int irq, struct msi_msg *msg);
void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
void write_msi_msg(unsigned int irq, struct msi_msg *msg);
+u32 __msix_mask_irq(struct msi_desc *desc, u32 flag);
+u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
struct msi_desc {
struct {
@@ -62,8 +64,8 @@ void arch_restore_msi_irqs(struct pci_dev *dev);
void default_teardown_msi_irqs(struct pci_dev *dev);
void default_restore_msi_irqs(struct pci_dev *dev);
-u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
-u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag);
+#define default_msi_mask_irq __msi_mask_irq
+#define default_msix_mask_irq __msix_mask_irq
struct msi_chip {
struct module *owner;