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

Merge branch 'linus' into x86/pat

Browse Source
This commit is contained in:
Ingo Molnar
2008-06-16 11:20:28 +02:00
parent 499f8f84b8 066519068a
commit faeca31d06
1444 changed files with 19895 additions and 12306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,