From d957296be95106adfe807dccd0e18e2fc6bb5a03 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 27 Oct 2008 19:48:44 +0000
Subject: [PATCH] --- yaml --- r: 123011 b: refs/heads/master c:
 b5ae5f911d221ad85090d6805ab9ab020f6e4703 h: refs/heads/master i:   123009:
 046edbdc249b39ad09ef06a94443de5fee64e05c   123007:
 d1cac3eddaa20c9dd05f3670b582720daeb8df9f v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/pci-common.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88529f4cdcf6..8d7f47226903 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57b066ff4ec53a0ac7cbf7fb363bb670cf58ddae
+refs/heads/master: b5ae5f911d221ad85090d6805ab9ab020f6e4703
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
index 0eaabd41474f..f965397a6105 100644
--- a/trunk/arch/powerpc/kernel/pci-common.c
+++ b/trunk/arch/powerpc/kernel/pci-common.c
@@ -1243,9 +1243,12 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
 	int i;
 	struct resource *res, *pr;
 
+	pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",
+		 pci_domain_nr(bus), bus->number);
+
 	for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
 		if ((res = bus->resource[i]) == NULL || !res->flags
-		    || res->start > res->end)
+		    || res->start > res->end || res->parent)
 			continue;
 		if (bus->parent == NULL)
 			pr = (res->flags & IORESOURCE_IO) ?