lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into tracing/mmiotrace

Browse Source
This commit is contained in:
Ingo Molnar
2008-07-07 08:07:35 +02:00
parent 790e2a290b 1b40a895df
commit d763d5edf9
1421 changed files with 33481 additions and 14451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/mm/ioremap.c
View File

@@ -602,10 +602,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,