From: Anton Blanchard <anton@samba.org>
Print the correct domain when a PCI resource allocation fails.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/ppc64/kernel/pSeries_pci.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff -puN arch/ppc64/kernel/pSeries_pci.c~ppc64-fix-pci-allocation-warning arch/ppc64/kernel/pSeries_pci.c
--- 25/arch/ppc64/kernel/pSeries_pci.c~ppc64-fix-pci-allocation-warning 2004-08-04 20:37:41.508619072 -0700
+++ 25-akpm/arch/ppc64/kernel/pSeries_pci.c 2004-08-04 20:37:41.512618464 -0700
@@ -601,8 +601,9 @@ void __devinit pcibios_fixup_bus(struct
BUG(); /* No I/O resource for this PHB? */
if (request_resource(&ioport_resource, res))
- printk(KERN_ERR "Failed to request IO"
- "on hose %d\n", 0 /* FIXME */);
+ printk(KERN_ERR "Failed to request IO on "
+ "PCI domain %d\n", pci_domain_nr(bus));
+
for (i = 0; i < 3; ++i) {
res = &hose->mem_resources[i];
@@ -610,8 +611,9 @@ void __devinit pcibios_fixup_bus(struct
BUG(); /* No memory resource for this PHB? */
bus->resource[i+1] = res;
if (res->flags && request_resource(&iomem_resource, res))
- printk(KERN_ERR "Failed to request MEM"
- "on hose %d\n", 0 /* FIXME */);
+ printk(KERN_ERR "Failed to request MEM on "
+ "PCI domain %d\n",
+ pci_domain_nr(bus));
}
} else if (pci_probe_only &&
(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
_