From 3b8488f1e0cd1dec9f3212f02e100e5e5d38c494 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 27 May 2008 09:56:49 +0200 Subject: [PATCH] --- yaml --- r: 97612 b: refs/heads/master c: 226e9a93a253b7d8811b5ed9ac671c6c5a728022 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/ioremap.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b26e72377ee..bfa97027739d 100644 --- 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 index 71bb3159031a..2b2bb3f9b683 100644 --- 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,