summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-11-11 14:13:20 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-11 22:20:57 +1100
commit3e66c4def14aa64ee6d1d4ef077d789abc30125d (patch)
tree76787962cb442e7f7f38990d7460ac8e888dd355 /include
parentc0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 (diff)
[PATCH] ppc64: prep for NUMA sparsemem rework 2
Remove ppc64 specific version of nr_cpus_node and use the generic one provided. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/topology.h2
-rw-r--r--include/asm-ppc64/mmzone.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 2512e3836bf4..388cc9f1277f 100644
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -37,8 +37,6 @@ static inline int node_to_first_cpu(int node)
#define pcibus_to_node(node) (-1)
#define pcibus_to_cpumask(bus) (cpu_online_map)
-#define nr_cpus_node(node) (nr_cpus_in_node[node])
-
/* sched_domains SD_NODE_INIT for PPC64 machines */
#define SD_NODE_INIT (struct sched_domain) { \
.span = CPU_MASK_NONE, \
diff --git a/include/asm-ppc64/mmzone.h b/include/asm-ppc64/mmzone.h
index f6e95da96427..7f06afbfbabb 100644
--- a/include/asm-ppc64/mmzone.h
+++ b/include/asm-ppc64/mmzone.h
@@ -32,7 +32,6 @@ extern struct pglist_data *node_data[];
extern int numa_cpu_lookup_table[];
extern char *numa_memory_lookup_table;
extern cpumask_t numa_cpumask_lookup_table[];
-extern int nr_cpus_in_node[];
#ifdef CONFIG_MEMORY_HOTPLUG
extern unsigned long max_pfn;
#endif