From a3f45c67fde566ccc0f50337f731ab3638498db7 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 4 Sep 2008 01:33:59 -0700 Subject: [PATCH] --- yaml --- r: 109477 b: refs/heads/master c: 5f17cfce5776c566d64430f543a289e5cfa4538b h: refs/heads/master i: 109475: 8c995d70e3f4d691492144b0f765a72b06121fa5 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a8caf72f9fc..20d3ed545a8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de014d617636d6a6bd5aef3b3d1f7f9a35669057 +refs/heads/master: 5f17cfce5776c566d64430f543a289e5cfa4538b diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 82634a2f1b1d..1aad599816f7 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/drivers/pci/setup-bus.c @@ -352,11 +352,12 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long continue; r_size = r->end - r->start + 1; /* For bridges size != alignment */ - align = (i < PCI_BRIDGE_RESOURCES) ? r_size : r->start; + align = resource_alignment(r); order = __ffs(align) - 20; if (order > 11) { - dev_warn(&dev->dev, "BAR %d too large: " + dev_warn(&dev->dev, "BAR %d bad alignment %llx: " "%#016llx-%#016llx\n", i, + (unsigned long long)align, (unsigned long long)r->start, (unsigned long long)r->end); r->flags = 0;