diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-04 18:27:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-04 18:27:19 +0200 |
| commit | 6c84461c0cb0db3f4f56695ac9944451b34bf431 (patch) | |
| tree | 5bee0558ffa1850d089f413810f00595f5cd15df /include | |
| parent | Merge tag 'topic/mst-fixes-2015-08-04' of git://anongit.freedesktop.org/drm-i... (diff) | |
| parent | PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition (diff) | |
| download | linux-6c84461c0cb0db3f4f56695ac9944451b34bf431.tar.xz linux-6c84461c0cb0db3f4f56695ac9944451b34bf431.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index efe3443572ba..413417f3707b 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -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 */ |