diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:47:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:47:33 -0700 |
| commit | 0cb60efd03ed82d02f44a14594714367e59e8abc (patch) | |
| tree | 23d9443331673a75e296781031f652e3e87687cc /drivers/pci/setup-bus.c | |
| parent | c19e80808b34b3de5c20884f11f58c3b6988daff (diff) | |
| parent | 395a125c6237802b19bf22b41017c99ff57f1024 (diff) | |
| download | linux-3.10-0cb60efd03ed82d02f44a14594714367e59e8abc.tar.gz linux-3.10-0cb60efd03ed82d02f44a14594714367e59e8abc.tar.bz2 linux-3.10-0cb60efd03ed82d02f44a14594714367e59e8abc.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: 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
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 1aad599816f..3abbfad9dda 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -540,7 +540,11 @@ static void pci_bus_dump_res(struct pci_bus *bus) 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); } } |