Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-3
+1
-1
drivers/pci/iov.c
+1
-1
drivers/pci/iov.c
···
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;
+3
-2
drivers/pci/pci.h
+3
-2
drivers/pci/pci.h
···
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
···
321
320
}
322
321
#endif /* CONFIG_PCI_IOV */
323
322
324
-
static inline int pci_resource_alignment(struct pci_dev *dev,
323
+
static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
325
324
struct resource *res)
326
325
{
327
326
#ifdef CONFIG_PCI_IOV