---

yaml --- r: 97612 b: refs/heads/master c: 226e9a9 h: refs/heads/master v: v3
git-mirror · Jun 4, 2008 · 3b8488f · 3b8488f
1 parent c11370e
commit 3b8488f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a496ac8cd00cabbdaa373db4818a9ad19a1c5a
+refs/heads/master: 226e9a93a253b7d8811b5ed9ac671c6c5a728022
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
@@ -593,10 +593,11 @@ void __init early_iounmap(void *addr, unsigned long size)
 	unsigned long offset;
 	unsigned int nrpages;
 	enum fixed_addresses idx;
-	unsigned int nesting;
+	int nesting;
 
 	nesting = --early_ioremap_nested;
-	WARN_ON(nesting < 0);
+	if (WARN_ON(nesting < 0))
+		return;
 
 	if (early_ioremap_debug) {
 		printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr,