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

Merge branch 'linus' into x86/pat2

Browse Source 
Conflicts:
	arch/x86/mm/init_64.c
This commit is contained in:
Ingo Molnar
2008-10-10 19:30:08 +02:00
parent b27a43c1e9 d403a6484f
commit 3dd392a407
819 changed files with 9576 additions and 5697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,7 +440,7 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
return;
}
int __initdata early_ioremap_debug;
static int __initdata early_ioremap_debug;
static int __init early_ioremap_debug_setup(char *str)
{
@@ -566,7 +566,7 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx)
}
int __initdata early_ioremap_nested;
static int __initdata early_ioremap_nested;
static int __init check_early_ioremap_leak(void)
{