]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] powerpc: Fix warning in add_memory
authorAndrew Morton <akpm@osdl.org>
Wed, 22 Mar 2006 07:00:05 +0000 (23:00 -0800)
committerPaul Mackerras <paulus@samba.org>
Thu, 23 Mar 2006 03:39:51 +0000 (14:39 +1100)
arch/powerpc/mm/mem.c: In function `add_memory':
arch/powerpc/mm/mem.c:128: warning: assignment makes integer from pointer without a cast

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/mm/mem.c

index 6809cdba6e9482d8a5a72c63224357c325eca9b9..80550b284505e1c914fed15c4798d2465d3e77f7 100644 (file)
@@ -125,7 +125,7 @@ int __devinit add_memory(u64 start, u64 size)
        nid = hot_add_scn_to_nid(start);
        pgdata = NODE_DATA(nid);
 
-       start = __va(start);
+       start = (unsigned long)__va(start);
        create_section_mapping(start, start + size);
 
        /* this should work for most non-highmem platforms */