Commit 0d70397bc72f2122f9702093cce3039ec3ae7575
Exists in
master
and in
4 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: fix pci_resource_alignment prototype
Showing 2 changed files Side-by-side Diff
drivers/pci/iov.c
| ... | ... | @@ -608,7 +608,7 @@ |
| 608 | 608 | * the VF BAR size multiplied by the number of VFs. The alignment |
| 609 | 609 | * is just the VF BAR size. |
| 610 | 610 | */ |
| 611 | -int pci_sriov_resource_alignment(struct pci_dev *dev, int resno) | |
| 611 | +resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno) | |
| 612 | 612 | { |
| 613 | 613 | struct resource tmp; |
| 614 | 614 | enum pci_bar_type type; |
drivers/pci/pci.h
| ... | ... | @@ -264,7 +264,8 @@ |
| 264 | 264 | extern void pci_iov_release(struct pci_dev *dev); |
| 265 | 265 | extern int pci_iov_resource_bar(struct pci_dev *dev, int resno, |
| 266 | 266 | enum pci_bar_type *type); |
| 267 | -extern int pci_sriov_resource_alignment(struct pci_dev *dev, int resno); | |
| 267 | +extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, | |
| 268 | + int resno); | |
| 268 | 269 | extern void pci_restore_iov_state(struct pci_dev *dev); |
| 269 | 270 | extern int pci_iov_bus_range(struct pci_bus *bus); |
| 270 | 271 | |
| ... | ... | @@ -320,7 +321,7 @@ |
| 320 | 321 | } |
| 321 | 322 | #endif /* CONFIG_PCI_IOV */ |
| 322 | 323 | |
| 323 | -static inline int pci_resource_alignment(struct pci_dev *dev, | |
| 324 | +static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, | |
| 324 | 325 | struct resource *res) |
| 325 | 326 | { |
| 326 | 327 | #ifdef CONFIG_PCI_IOV |