Commit c0d33403 authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras

[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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1dff227e
...@@ -66,8 +66,6 @@ static inline int pa_to_nid(unsigned long pa) ...@@ -66,8 +66,6 @@ static inline int pa_to_nid(unsigned long pa)
return nid; return nid;
} }
#define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn)
/* /*
* Following are macros that each numa implmentation must define. * Following are macros that each numa implmentation must define.
*/ */
...@@ -77,10 +75,7 @@ static inline int pa_to_nid(unsigned long pa) ...@@ -77,10 +75,7 @@ static inline int pa_to_nid(unsigned long pa)
#ifdef CONFIG_DISCONTIGMEM #ifdef CONFIG_DISCONTIGMEM
/* #define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn)
* Given a kernel address, find the home node of the underlying memory.
*/
#define kvaddr_to_nid(kaddr) pa_to_nid(__pa(kaddr))
#define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT) #define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment