Commit cc7919b7 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: fix PCI allocation warning

Print the correct domain when a PCI resource allocation fails.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 24ab65e8
...@@ -600,8 +600,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) ...@@ -600,8 +600,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
BUG(); /* No I/O resource for this PHB? */ BUG(); /* No I/O resource for this PHB? */
if (request_resource(&ioport_resource, res)) if (request_resource(&ioport_resource, res))
printk(KERN_ERR "Failed to request IO" printk(KERN_ERR "Failed to request IO on "
"on hose %d\n", 0 /* FIXME */); "PCI domain %d\n", pci_domain_nr(bus));
for (i = 0; i < 3; ++i) { for (i = 0; i < 3; ++i) {
res = &hose->mem_resources[i]; res = &hose->mem_resources[i];
...@@ -609,8 +610,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) ...@@ -609,8 +610,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
BUG(); /* No memory resource for this PHB? */ BUG(); /* No memory resource for this PHB? */
bus->resource[i+1] = res; bus->resource[i+1] = res;
if (res->flags && request_resource(&iomem_resource, res)) if (res->flags && request_resource(&iomem_resource, res))
printk(KERN_ERR "Failed to request MEM" printk(KERN_ERR "Failed to request MEM on "
"on hose %d\n", 0 /* FIXME */); "PCI domain %d\n",
pci_domain_nr(bus));
} }
} else if (pci_probe_only && } else if (pci_probe_only &&
(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment