1 files changed, 12 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 224e9a11765c..ea0c61e09b76 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -650,11 +650,18 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
                 }
         }
 
-        /* Out of paranoia, let's put the ISA hole last if any */
-        if (isa_hole >= 0 && memno > 0 && isa_hole != (memno-1)) {
-                struct resource tmp = hose->mem_resources[isa_hole];
-                hose->mem_resources[isa_hole] = hose->mem_resources[memno-1];
-                hose->mem_resources[memno-1] = tmp;
+        /* If there's an ISA hole and the pci_mem_offset is -not- matching
+         * the ISA hole offset, then we need to remove the ISA hole from
+         * the resource list for that brige
+         */
+        if (isa_hole >= 0 && hose->pci_mem_offset != isa_mb) {
+                unsigned int next = isa_hole + 1;
+                printk(KERN_INFO " Removing ISA hole at 0x%016llx\n", isa_mb);
+                if (next < memno)
+                        memmove(&hose->mem_resources[isa_hole],
+                                &hose->mem_resources[next],
+                                sizeof(struct resource) * (memno - next));
+                hose->mem_resources[--memno].flags = 0;
         }
 }