summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-11-11 14:12:26 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-11 22:20:43 +1100
commitc0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 (patch)
tree729545b02385f53bf456d702fe658e817335ed36
parent1dff227e0184de3d1f12265dff0c47d86dad2eec (diff)
downloadop-kernel-dev-c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29.zip
op-kernel-dev-c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29.tar.gz
[PATCH] ppc64: prep for NUMA sparsemem rework
Remove an unused numa define and move a discontigmem specific define inside the relevant ifdef. I will submit a separate patch to remove them from other architectures, but the ppc64 patches to follow depend on this. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--include/asm-ppc64/mmzone.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-ppc64/mmzone.h b/include/asm-ppc64/mmzone.h
index 15e777c..f6e95da 100644
--- a/include/asm-ppc64/mmzone.h
+++ b/include/asm-ppc64/mmzone.h
@@ -66,8 +66,6 @@ static inline int pa_to_nid(unsigned long pa)
return nid;
}
-#define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn)
-
/*
* Following are macros that each numa implmentation must define.
*/
@@ -77,10 +75,7 @@ static inline int pa_to_nid(unsigned long pa)
#ifdef CONFIG_DISCONTIGMEM
-/*
- * Given a kernel address, find the home node of the underlying memory.
- */
-#define kvaddr_to_nid(kaddr) pa_to_nid(__pa(kaddr))
+#define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn)
#define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT)
OpenPOWER on IntegriCloud