Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c84461c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fix from Bjorn Helgaas:
 "This is a trivial fix for a change that broke user program compilation
  (QEMU in this case)"

* tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition
parents 50d091b6 c9ddbac9

include/uapi/linux/pci_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ 
#define PCI_MSIX_PBA		8	/* Pending Bit Array offset */

#define  PCI_MSIX_PBA_BIR	0x00000007 /* BAR index */

#define  PCI_MSIX_PBA_OFFSET	0xfffffff8 /* Offset into specified BAR */

#define PCI_MSIX_FLAGS_BIRMASK	PCI_MSIX_PBA_BIR /* deprecated */

#define PCI_CAP_MSIX_SIZEOF	12	/* size of MSIX registers */



/* MSI-X Table entry format */