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

Commit 466b3ddf authored by Joerg Roedel's avatar Joerg Roedel Committed by Jesse Barnes
Browse files

PCI: Fix compile errors with PCI_ATS and !PCI_IOV 



The ats and sroiv members of 'struct pci_dev' are required
for the ATS code already, even without IOV support compiled
in. So depend on ATS here. This is fine with PCI_IOV too
because it selects PCI_ATS. Also the prototypes for ATS
need to be available for PCI_ATS.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0d52f54e

include/linux/pci-ats.h

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct pci_ats { 
	unsigned int is_enabled:1;      /* Enable bit is set */

};



#ifdef CONFIG_PCI_IOV

#ifdef CONFIG_PCI_ATS



extern int pci_enable_ats(struct pci_dev *dev, int ps);

extern void pci_disable_ats(struct pci_dev *dev);
@@ -29,7 +29,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev) 
	return dev->ats && dev->ats->is_enabled;

}



#else /* CONFIG_PCI_IOV */

#else /* CONFIG_PCI_ATS */



static inline int pci_enable_ats(struct pci_dev *dev, int ps)

{
@@ -50,7 +50,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev) 
	return 0;

}



#endif /* CONFIG_PCI_IOV */

#endif /* CONFIG_PCI_ATS */



#ifdef CONFIG_PCI_PRI

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ struct pci_dev { 
	struct list_head msi_list;

#endif

	struct pci_vpd *vpd;

#ifdef CONFIG_PCI_IOV

#ifdef CONFIG_PCI_ATS

	union {

		struct pci_sriov *sriov;	/* SR-IOV capability related */

		struct pci_dev *physfn;	/* the PF this VF is associated with */