]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 5435/1: fix compile warning in sanity_check_meminfo()
authorMikael Pettersson <mikpe@it.uu.se>
Sat, 28 Mar 2009 18:18:05 +0000 (19:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 20:21:20 +0000 (20:21 +0000)
Compiling recent 2.6.29-rc kernels for ARM gives me the following warning:

arch/arm/mm/mmu.c: In function 'sanity_check_meminfo':
arch/arm/mm/mmu.c:697: warning: comparison between pointer and integer

This is because commit 3fd9825c42c784a59b3b90bdf073f49d4bb42a8d
"[ARM] 5402/1: fix a case of wrap-around in sanity_check_meminfo()"
in 2.6.29-rc5-git4 added a comparison of a pointer with PAGE_OFFSET,
which is an integer.

Fixed by casting PAGE_OFFSET to void *.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/mmu.c

index d4d082c5c2d4ad2be9f1eb331cce837fff3de325..5a89e57e342dc72a512d5cefef51d85349cd32e8 100644 (file)
@@ -694,7 +694,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);