From 8c32f69d874fa8f9c8bd3e8a53012f21f4eed744 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Jan 2010 21:33:08 +0900
Subject: [PATCH] --- yaml --- r: 181108 b: refs/heads/master c:
 12b6b01cb47dc3eefbef866592193661dad7afb9 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/sh/mm/ioremap.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8685f7b605e8..6f90593e455f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f744affc345f8b158615e0cdd01d1f4985837c3
+refs/heads/master: 12b6b01cb47dc3eefbef866592193661dad7afb9
diff --git a/trunk/arch/sh/mm/ioremap.c b/trunk/arch/sh/mm/ioremap.c
index 24f6ba6bff71..e8b65f645aed 100644
--- a/trunk/arch/sh/mm/ioremap.c
+++ b/trunk/arch/sh/mm/ioremap.c
@@ -142,6 +142,12 @@ void __iounmap(void __iomem *addr)
 	if (iomapping_nontranslatable(vaddr))
 		return;
 
+	/*
+	 * There's no VMA if it's from an early fixed mapping.
+	 */
+	if (iounmap_fixed(addr) == 0)
+		return;
+
 #ifdef CONFIG_PMB
 	/*
 	 * Purge any PMB entries that may have been established for this