Merge branch 'master' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mm / mmu.c

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 1585814f841491f5aba1a18db80172c35dcb4b81..b438fc4fb77b7bc0fcd838697ef5bef8c75661de 100644 (file)
--- 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);