From 02f9672fc709e1ca958ca92c80ec9dbff4972eb3 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 10 Nov 2005 15:04:24 +1100
Subject: [PATCH] --- yaml --- r: 13736 b: refs/heads/master c:
 0f34f490290e05ee6c02e20b3811fce6f09318f4 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/maple/pci.c    | 3 ---
 trunk/arch/powerpc/platforms/powermac/pci.c | 3 ---
 trunk/arch/powerpc/platforms/pseries/pci.c  | 1 -
 trunk/arch/ppc64/kernel/pci.c               | 3 +++
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 29bed7a5c908..62f2d7ffed10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47c2ac8cc3cf7c484e131d10cb812b6ab198885a
+refs/heads/master: 0f34f490290e05ee6c02e20b3811fce6f09318f4
diff --git a/trunk/arch/powerpc/platforms/maple/pci.c b/trunk/arch/powerpc/platforms/maple/pci.c
index 340c21caeae2..895aeb3f75d0 100644
--- a/trunk/arch/powerpc/platforms/maple/pci.c
+++ b/trunk/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/trunk/arch/powerpc/platforms/powermac/pci.c b/trunk/arch/powerpc/platforms/powermac/pci.c
index 8f818d092e2b..dfd41b9781a9 100644
--- a/trunk/arch/powerpc/platforms/powermac/pci.c
+++ b/trunk/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/trunk/arch/powerpc/platforms/pseries/pci.c b/trunk/arch/powerpc/platforms/pseries/pci.c
index 6b0772f35692..999a9620b5ce 100644
--- a/trunk/arch/powerpc/platforms/pseries/pci.c
+++ b/trunk/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/trunk/arch/ppc64/kernel/pci.c b/trunk/arch/ppc64/kernel/pci.c
index 66698fdf059e..46929fb24f3c 100644
--- a/trunk/arch/ppc64/kernel/pci.c
+++ b/trunk/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;