From 5afd10eef30b4f5762a7fdb9b4117f8a6c9cb98e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 21 Mar 2006 23:00:05 -0800 Subject: [PATCH] --- yaml --- r: 22967 b: refs/heads/master c: 2d0eee14b23f20c501a6c2536edf68f93c56edcd h: refs/heads/master i: 22965: 7e12028faf469c272315cae0468b25ddbbf4a3dc 22963: 792a5af66da48b27a11fa7d6cf16ba32ec46c5a1 22959: 4699f99917d9dd94bd4b6e59af45d30cc12aed03 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/mem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85c7a4750c5e..47945b3d14a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d04981669df1f0586d4578ec4061c5585ec721b +refs/heads/master: 2d0eee14b23f20c501a6c2536edf68f93c56edcd diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 6809cdba6e94..80550b284505 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/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 */