Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fix pci_resource_alignment prototype
This commit is contained in:
Linus Torvalds 2010-09-28 12:02:22 -07:00
commit 0d70397bc7
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pci/iov.c
View file

@ -608,7 +608,7 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno,
* the VF BAR size multiplied by the number of VFs. The alignment * the VF BAR size multiplied by the number of VFs. The alignment
* is just the VF BAR size. * is just the VF BAR size.
*/ */
int pci_sriov_resource_alignment(struct pci_dev *dev, int resno) resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)
{ {
struct resource tmp; struct resource tmp;
enum pci_bar_type type; enum pci_bar_type type;

5
drivers/pci/pci.h
View file

@ -264,7 +264,8 @@ extern int pci_iov_init(struct pci_dev *dev);
extern void pci_iov_release(struct pci_dev *dev); extern void pci_iov_release(struct pci_dev *dev);
extern int pci_iov_resource_bar(struct pci_dev *dev, int resno, extern int pci_iov_resource_bar(struct pci_dev *dev, int resno,
enum pci_bar_type *type); enum pci_bar_type *type);
extern int pci_sriov_resource_alignment(struct pci_dev *dev, int resno); extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev,
int resno);
extern void pci_restore_iov_state(struct pci_dev *dev); extern void pci_restore_iov_state(struct pci_dev *dev);
extern int pci_iov_bus_range(struct pci_bus *bus); extern int pci_iov_bus_range(struct pci_bus *bus);
@ -320,7 +321,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
} }
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */
static inline int pci_resource_alignment(struct pci_dev *dev, static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
struct resource *res) struct resource *res)
{ {
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV