Merge tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[sfrench/cifs-2.6.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 65f1d8c2f08202ea6683a596e67f252de95bea4e..4eca42cf611b7ef06ce33733da4b3bd79ca6ccf4 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -373,6 +373,9 @@ struct pci_dev {
        bool            match_driver;           /* Skip attaching driver */
 
        unsigned int    transparent:1;          /* Subtractive decode bridge */
+       unsigned int    io_window:1;            /* Bridge has I/O window */
+       unsigned int    pref_window:1;          /* Bridge has pref mem window */
+       unsigned int    pref_64_window:1;       /* Pref mem window is 64-bit */
        unsigned int    multifunction:1;        /* Multi-function device */
 
        unsigned int    is_busmaster:1;         /* Is busmaster */
@@ -1393,7 +1396,7 @@ static inline int pci_enable_msix_exact(struct pci_dev *dev,
 }
 int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
                                   unsigned int max_vecs, unsigned int flags,
-                                  const struct irq_affinity *affd);
+                                  struct irq_affinity *affd);
 
 void pci_free_irq_vectors(struct pci_dev *dev);
 int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
@@ -1419,7 +1422,7 @@ static inline int pci_enable_msix_exact(struct pci_dev *dev,
 static inline int
 pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
                               unsigned int max_vecs, unsigned int flags,
-                              const struct irq_affinity *aff_desc)
+                              struct irq_affinity *aff_desc)
 {
        if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1 && dev->irq)
                return 1;