---

yaml --- r: 181108 b: refs/heads/master c: 12b6b01 h: refs/heads/master v: v3
git-mirror · Jan 18, 2010 · 8c32f69 · 8c32f69
1 parent e011754
commit 8c32f69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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