4 files changed, 3 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 340c21caeae2..895aeb3f75d0 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -380,9 +380,6 @@ void __init maple_pcibios_fixup(void)
         for_each_pci_dev(dev)
                 pci_read_irq_line(dev);
 
-        /* Do the mapping of the IO space */
-        phbs_remap_io();
-
         DBG(" <- maple_pcibios_fixup\n");
 }
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 8f818d092e2b..dfd41b9781a9 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -918,9 +918,6 @@ void __init pmac_pci_init(void)
                         PCI_DN(np)->busno = 0xf0;
         }
 
-        /* map in PCI I/O space */
-        phbs_remap_io();
-
         /* pmac_check_ht_link(); */
 
         /* Tell pci.c to not use the common resource allocation mechanism */
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 6b0772f35692..999a9620b5ce 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -107,7 +107,6 @@ static void __init pSeries_request_regions(void)
 
 void __init pSeries_final_fixup(void)
 {
-        phbs_remap_io();
         pSeries_request_regions();
 
         pci_addr_cache_build();
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 66698fdf059e..46929fb24f3c 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -548,6 +548,9 @@ static int __init pcibios_init(void)
         if (ppc64_isabridge_dev != NULL)
                 printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
 
+        /* map in PCI I/O space */
+        phbs_remap_io();
+
         printk("PCI: Probing PCI hardware done\n");
 
         return 0;