Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
The problem fixed by 0e4ccb15 ("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 0e4ccb15 are no longer needed, so revert the commit. default_msi_mask_irq() and default_msix_mask_irq() were added by 0e4ccb15 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
Showing
- arch/x86/include/asm/x86_init.h 0 additions, 3 deletionsarch/x86/include/asm/x86_init.h
- arch/x86/kernel/x86_init.c 0 additions, 10 deletionsarch/x86/kernel/x86_init.c
- arch/x86/pci/xen.c 1 addition, 12 deletionsarch/x86/pci/xen.c
- drivers/pci/msi.c 6 additions, 16 deletionsdrivers/pci/msi.c
- include/linux/msi.h 4 additions, 2 deletionsinclude/linux/msi.h
Please register or sign in to comment