From: Anton Blanchard Date: Fri, 11 Nov 2005 03:12:26 +0000 (+1100) Subject: [PATCH] ppc64: prep for NUMA sparsemem rework X-Git-Tag: v2.6.15-rc1~14^2~9 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29;p=linux-2.6 [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 Signed-off-by: Paul Mackerras --- diff --git a/include/asm-ppc64/mmzone.h b/include/asm-ppc64/mmzone.h index 15e777ce0f..f6e95da964 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)