diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 21:30:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 21:30:18 +0100 |
| commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/mm | |
| parent | Merge branch 'origin' into devel (diff) | |
| parent | [ARM] 5435/1: fix compile warning in sanity_check_meminfo() (diff) | |
| download | linux-9759d22c8348343b0da4e25d6150c41712686c14.tar.xz linux-9759d22c8348343b0da4e25d6150c41712686c14.zip | |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 1585814f8414..b438fc4fb77b 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -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); |