diff options
author | Anton Blanchard <anton@samba.org> | 2005-11-10 22:13:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-11 06:20:57 -0500 |
commit | 3e66c4def14aa64ee6d1d4ef077d789abc30125d (patch) | |
tree | 76787962cb442e7f7f38990d7460ac8e888dd355 /include | |
parent | c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 (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.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/mmzone.h | 1 |
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) | |||
37 | #define pcibus_to_node(node) (-1) | 37 | #define pcibus_to_node(node) (-1) |
38 | #define pcibus_to_cpumask(bus) (cpu_online_map) | 38 | #define pcibus_to_cpumask(bus) (cpu_online_map) |
39 | 39 | ||
40 | #define nr_cpus_node(node) (nr_cpus_in_node[node]) | ||
41 | |||
42 | /* sched_domains SD_NODE_INIT for PPC64 machines */ | 40 | /* sched_domains SD_NODE_INIT for PPC64 machines */ |
43 | #define SD_NODE_INIT (struct sched_domain) { \ | 41 | #define SD_NODE_INIT (struct sched_domain) { \ |
44 | .span = CPU_MASK_NONE, \ | 42 | .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[]; | |||
32 | extern int numa_cpu_lookup_table[]; | 32 | extern int numa_cpu_lookup_table[]; |
33 | extern char *numa_memory_lookup_table; | 33 | extern char *numa_memory_lookup_table; |
34 | extern cpumask_t numa_cpumask_lookup_table[]; | 34 | extern cpumask_t numa_cpumask_lookup_table[]; |
35 | extern int nr_cpus_in_node[]; | ||
36 | #ifdef CONFIG_MEMORY_HOTPLUG | 35 | #ifdef CONFIG_MEMORY_HOTPLUG |
37 | extern unsigned long max_pfn; | 36 | extern unsigned long max_pfn; |
38 | #endif | 37 | #endif |