diff options
author | Anton Blanchard <anton@samba.org> | 2005-11-10 22:12:26 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-11 06:20:43 -0500 |
commit | c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 (patch) | |
tree | 729545b02385f53bf456d702fe658e817335ed36 | |
parent | 1dff227e0184de3d1f12265dff0c47d86dad2eec (diff) |
[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.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-ppc64/mmzone.h b/include/asm-ppc64/mmzone.h index 15e777ce0f4a..f6e95da96427 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) | |||
66 | return nid; | 66 | return nid; |
67 | } | 67 | } |
68 | 68 | ||
69 | #define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn) | ||
70 | |||
71 | /* | 69 | /* |
72 | * Following are macros that each numa implmentation must define. | 70 | * Following are macros that each numa implmentation must define. |
73 | */ | 71 | */ |
@@ -77,10 +75,7 @@ static inline int pa_to_nid(unsigned long pa) | |||
77 | 75 | ||
78 | #ifdef CONFIG_DISCONTIGMEM | 76 | #ifdef CONFIG_DISCONTIGMEM |
79 | 77 | ||
80 | /* | 78 | #define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn) |
81 | * Given a kernel address, find the home node of the underlying memory. | ||
82 | */ | ||
83 | #define kvaddr_to_nid(kaddr) pa_to_nid(__pa(kaddr)) | ||
84 | 79 | ||
85 | #define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT) | 80 | #define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT) |
86 | 81 | ||