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

Commit 0d70397b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a2724f28 0e52247a

drivers/pci/iov.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 * 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;

	enum pci_bar_type type;

drivers/pci/pci.h

+3 −2
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ extern int pci_iov_init(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,

				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 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 */



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)

{

#ifdef CONFIG_PCI_IOV