From: Andrew Morton <akpm@osdl.org>
Date: Wed, 22 Mar 2006 07:00:05 +0000 (-0800)
Subject: [PATCH] powerpc: Fix warning in add_memory
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2d0eee14b23f20c501a6c2536edf68f93c56edcd;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] powerpc: Fix warning in add_memory

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

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 6809cdba6e94..80550b284505 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -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 */