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

Merge branch 'master' into devel

Browse Source 
Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
This commit is contained in:
Russell King
2009-03-28 20:30:18 +00:00
committed by Russell King
parent ed40d0c472 f0bba9f934
commit 9759d22c83
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mm/mmu.c
View File

@@ -723,7 +723,7 @@ static void __init sanity_check_meminfo(void)
* the vmalloc area.
*/
if (__va(bank->start) >= VMALLOC_MIN ||
__va(bank->start) < PAGE_OFFSET) {
__va(bank->start) < (void *)PAGE_OFFSET) {
printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "
"(vmalloc region overlap).\n",
bank->start, bank->start + bank->size - 1);