From 9e3ea899e01228486f50ac7a68d5c2a79053e02f Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 27 Oct 2009 17:07:45 +0900
Subject: [PATCH] --- yaml --- r: 173445 b: refs/heads/master c:
 94c285108e4551157ecc1b8156921712138fa860 h: refs/heads/master i:   173443:
 7055266a87d9ae222461bb24cfc2b68155da7c9d v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sh/mm/consistent.c |  2 --
 trunk/arch/sh/mm/init.c       | 11 +++++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0717c9b9bb9d..d2efb698548b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c978ca3194a4002407a85b15122f793efc8616b
+refs/heads/master: 94c285108e4551157ecc1b8156921712138fa860
diff --git a/trunk/arch/sh/mm/consistent.c b/trunk/arch/sh/mm/consistent.c
index ef20bbabefa0..902967e3f841 100644
--- a/trunk/arch/sh/mm/consistent.c
+++ b/trunk/arch/sh/mm/consistent.c
@@ -27,8 +27,6 @@ EXPORT_SYMBOL(dma_ops);
 static int __init dma_init(void)
 {
 	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-	no_iommu_init();
 	return 0;
 }
 fs_initcall(dma_init);
diff --git a/trunk/arch/sh/mm/init.c b/trunk/arch/sh/mm/init.c
index c8af6c5fa586..432acd07e76a 100644
--- a/trunk/arch/sh/mm/init.c
+++ b/trunk/arch/sh/mm/init.c
@@ -15,6 +15,7 @@
 #include <linux/pagemap.h>
 #include <linux/percpu.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
@@ -186,11 +187,21 @@ void __init paging_init(void)
 	set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start));
 }
 
+/*
+ * Early initialization for any I/O MMUs we might have.
+ */
+static void __init iommu_init(void)
+{
+	no_iommu_init();
+}
+
 void __init mem_init(void)
 {
 	int codesize, datasize, initsize;
 	int nid;
 
+	iommu_init();
+
 	num_physpages = 0;
 	high_memory = NULL;