From: Michael Ellerman <michael@ellerman.id.au>
Date: Mon, 9 Jan 2006 07:19:49 +0000 (+1100)
Subject: [PATCH] powerpc: Don't use KERNELBASE in add_memory()
X-Git-Tag: v2.6.16-rc1~666^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0fa93d6e6f0f36f39b813e561dbb890c58da58f;p=linux-2.6

[PATCH] powerpc: Don't use KERNELBASE in add_memory()

In add_memory() we should be using __va() to get a virtual address.
Spotted by Mike Kravetz.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 5e5bff5616..15aac0d78d 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 += KERNELBASE;
+	start = __va(start);
 	create_section_mapping(start, start + size);
 
 	/* this should work for most non-highmem platforms */