summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-02 10:59:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-02 10:59:19 -0700
commitef46808b79ebbf48587c556436e5281ec51d09b5 (patch)
tree1e07a927e1e96ccc0a9aa4455d7d3a99ebad434f /include
parent8cda548ffba8ee67793e54d885068dd69ed6b905 (diff)
parent44bda4b7d26e9fffed6d7152d98a2e9edaeb2a76 (diff)
downloadlinux-ef46808b79ebbf48587c556436e5281ec51d09b5.tar.bz2
Merge tag 'pci-v4.18-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: - Fix integer overflow in new mobiveil driver (Dan Carpenter) - Fix race during NVMe removal/rescan (Hari Vyas) * tag 'pci-v4.18-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Fix is_added/is_busmaster race condition PCI: mobiveil: Avoid integer overflow in IB_WIN_SIZE
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index abd5d5e17aee..c133ccfa002e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -368,7 +368,6 @@ struct pci_dev {
unsigned int transparent:1; /* Subtractive decode bridge */
unsigned int multifunction:1; /* Multi-function device */
- unsigned int is_added:1;
unsigned int is_busmaster:1; /* Is busmaster */
unsigned int no_msi:1; /* May not use MSI */
unsigned int no_64bit_msi:1; /* May only use 32-bit MSIs */