diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-21 23:00:05 -0800 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-23 14:39:51 +1100 |
| commit | 2d0eee14b23f20c501a6c2536edf68f93c56edcd (patch) | |
| tree | 5585524cee681ac9252582d2aa8f65680f71bc57 /arch | |
| parent | 1d04981669df1f0586d4578ec4061c5585ec721b (diff) | |
| download | blackbird-op-linux-2d0eee14b23f20c501a6c2536edf68f93c56edcd.tar.gz blackbird-op-linux-2d0eee14b23f20c501a6c2536edf68f93c56edcd.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |
