]> git.karo-electronics.de Git - linux-beck.git/commit
Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
authorYijing Wang <wangyijing@huawei.com>
Mon, 27 Oct 2014 02:44:37 +0000 (10:44 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Nov 2014 22:14:30 +0000 (15:14 -0700)
commit03f56e42d03eb7d0a47e40e9ae72a3ac0afeff08
tree566745f2b5cfd29a9c56fe53a6449aa9f0dc6e01
parent38737d82f9f0168955f9944c3f8bd3bb262c7e88
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
arch/x86/include/asm/x86_init.h
arch/x86/kernel/x86_init.c
arch/x86/pci/xen.c
drivers/pci/msi.c
include/linux/msi.h