diff options
| author | Linus Torvalds | 2009-09-05 22:50:46 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-05 22:50:46 +0200 |
| commit | 9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d (patch) | |
| tree | 88b76c84a21927acffd02f556764c4be33258bce /drivers/pci/setup-bus.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | PCI SR-IOV: correct broken resource alignment calculations (diff) | |
| download | kernel-qcow2-linux-9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d.tar.gz kernel-qcow2-linux-9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d.tar.xz kernel-qcow2-linux-9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d.zip | |
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 SR-IOV: correct broken resource alignment calculations
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index b636e245445d..7c443b4583ab 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -25,7 +25,7 @@ #include <linux/ioport.h> #include <linux/cache.h> #include <linux/slab.h> - +#include "pci.h" static void pbus_assign_resources_sorted(const struct pci_bus *bus) { @@ -384,7 +384,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long continue; r_size = resource_size(r); /* For bridges size != alignment */ - align = resource_alignment(r); + align = pci_resource_alignment(dev, r); order = __ffs(align) - 20; if (order > 11) { dev_warn(&dev->dev, "BAR %d bad alignment %llx: " |