From 4fd389fc0bc0a5b1c8eb37c8d03d1cd6ac1ef0fa Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 Jul 2005 17:42:49 +1000
Subject: [PATCH] --- yaml --- r: 6190 b: refs/heads/master c:
 8c65b5c955b8598d9c63b4e97392377269873a54 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ppc64/kernel/iSeries_vio.c | 3 ++-
 trunk/arch/ppc64/mm/init.c            | 3 ---
 trunk/include/asm-ppc64/iommu.h       | 3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 78735ba75766..c924eb194f1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e494c80481653bbc810b4e67651097595ea0294
+refs/heads/master: 8c65b5c955b8598d9c63b4e97392377269873a54
diff --git a/trunk/arch/ppc64/kernel/iSeries_vio.c b/trunk/arch/ppc64/kernel/iSeries_vio.c
index e876b4380278..48f0ebf4405d 100644
--- a/trunk/arch/ppc64/kernel/iSeries_vio.c
+++ b/trunk/arch/ppc64/kernel/iSeries_vio.c
@@ -27,7 +27,7 @@ EXPORT_SYMBOL(iSeries_vio_dev);
 static struct iommu_table veth_iommu_table;
 static struct iommu_table vio_iommu_table;
 
-void __init iommu_vio_init(void)
+static void __init iommu_vio_init(void)
 {
 	struct iommu_table *t;
 	struct iommu_table_cb cb;
@@ -123,6 +123,7 @@ static int __init vio_bus_init_iseries(void)
 
 	err = vio_bus_init();
 	if (err == 0) {
+		iommu_vio_init();
 		vio_bus_device.iommu_table = &vio_iommu_table;
 		iSeries_vio_dev = &vio_bus_device.dev;
 		probe_bus_iseries();
diff --git a/trunk/arch/ppc64/mm/init.c b/trunk/arch/ppc64/mm/init.c
index 87f256df8de5..9edfe267123e 100644
--- a/trunk/arch/ppc64/mm/init.c
+++ b/trunk/arch/ppc64/mm/init.c
@@ -686,9 +686,6 @@ void __init mem_init(void)
 
 	mem_init_done = 1;
 
-#ifdef CONFIG_PPC_ISERIES
-	iommu_vio_init();
-#endif
 	/* Initialize the vDSO */
 	vdso_init();
 }
diff --git a/trunk/include/asm-ppc64/iommu.h b/trunk/include/asm-ppc64/iommu.h
index 729de5cc21d9..72dcf8116b04 100644
--- a/trunk/include/asm-ppc64/iommu.h
+++ b/trunk/include/asm-ppc64/iommu.h
@@ -104,9 +104,6 @@ extern void iommu_devnode_init_pSeries(struct device_node *dn);
 
 #ifdef CONFIG_PPC_ISERIES
 
-/* Initializes tables for bio buses */
-extern void __init iommu_vio_init(void);
-
 struct iSeries_Device_Node;
 /* Creates table for an individual device node */
 extern void iommu_devnode_init_iSeries(struct iSeries_Device_Node *dn);