Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: Fix compile errors with PCI_ATS and !PCI_IOV

Browse Source 
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: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Joerg Roedel 2011-10-30 16:35:08 +01:00 committed by Jesse Barnes
parent 0d52f54e2e
commit 466b3ddfbc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/pci-ats.h
View File

@ -12,7 +12,7 @@ struct pci_ats {
unsigned int is_enabled:1; /* Enable bit is set */ 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 int pci_enable_ats(struct pci_dev *dev, int ps);
extern void pci_disable_ats(struct pci_dev *dev); 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; 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) 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; return 0;
} }
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_ATS */
#ifdef CONFIG_PCI_PRI #ifdef CONFIG_PCI_PRI

2
include/linux/pci.h
View File

@ -338,7 +338,7 @@ struct pci_dev {
struct list_head msi_list; struct list_head msi_list;
#endif #endif
struct pci_vpd *vpd; struct pci_vpd *vpd;
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_ATS
union { union {
struct pci_sriov *sriov; /* SR-IOV capability related */ struct pci_sriov *sriov; /* SR-IOV capability related */
struct pci_dev *physfn; /* the PF this VF is associated with */ struct pci_dev *physfn; /* the PF this VF is associated with */