Merge branch 'master' into devel

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c

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);