Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: re-add debug prints for unmodified BARs
  PCI: fix pciehp_free_irq()
  PCI Hotplug: fakephp: fix deadlock... again
  PCI: Fix printk warnings in setup-bus.c
  PCI: Fix printk warnings in probe.c
  PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets

diff --combined drivers/pci/setup-bus.c
index 1aad599816f7988ac080084dc14083b0b8a50736,c6ea4e97e8b60459a0267afe4aeffc66b842d776..3abbfad9ddab592f592001e31e3911efe002566c
--- 1/drivers/pci/setup-bus.c
--- 2/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@@ -352,12 -352,11 +352,12 @@@ static int pbus_size_mem(struct pci_bu
                                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;
@@@ -540,7 -539,11 +540,11 @@@ static void pci_bus_dump_res(struct pci
                  if (!res)
                          continue;
  
-               printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+               printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n",
+                       bus->number, i,
+                       (res->flags & IORESOURCE_IO) ? "io port" : "mmio",
+                       (unsigned long long) res->start,
+                       (unsigned long long) res->end);
          }
  }