Remove the ppc64 specific nr_cpus_node and use the generic version instead. Signed-off-by: Anton Blanchard Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ppc64/mm/numa.c | 4 ---- memhotplug-dave/include/asm-powerpc/topology.h | 2 -- memhotplug-dave/include/asm-ppc64/mmzone.h | 1 - 3 files changed, 7 deletions(-) diff -puN arch/ppc64/mm/numa.c~A4.2-antonb-ppc64-_use_generic_nr_cpus_node arch/ppc64/mm/numa.c --- memhotplug/arch/ppc64/mm/numa.c~A4.2-antonb-ppc64-_use_generic_nr_cpus_node 2005-09-30 12:38:06.000000000 -0700 +++ memhotplug-dave/arch/ppc64/mm/numa.c 2005-09-30 12:38:06.000000000 -0700 @@ -36,7 +36,6 @@ int numa_cpu_lookup_table[NR_CPUS] = { [ ARRAY_INITIALISER}; char *numa_memory_lookup_table; cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES]; -int nr_cpus_in_node[MAX_NUMNODES] = { [0 ... (MAX_NUMNODES -1)] = 0}; struct pglist_data *node_data[MAX_NUMNODES]; bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES]; @@ -56,14 +55,12 @@ EXPORT_SYMBOL(node_data); EXPORT_SYMBOL(numa_cpu_lookup_table); EXPORT_SYMBOL(numa_memory_lookup_table); EXPORT_SYMBOL(numa_cpumask_lookup_table); -EXPORT_SYMBOL(nr_cpus_in_node); static inline void map_cpu_to_node(int cpu, int node) { numa_cpu_lookup_table[cpu] = node; if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node]))) { cpu_set(cpu, numa_cpumask_lookup_table[node]); - nr_cpus_in_node[node]++; } } @@ -76,7 +73,6 @@ static void unmap_cpu_from_node(unsigned if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) { cpu_clear(cpu, numa_cpumask_lookup_table[node]); - nr_cpus_in_node[node]--; } else { printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n", cpu, node); diff -puN include/asm-powerpc/topology.h~A4.2-antonb-ppc64-_use_generic_nr_cpus_node include/asm-powerpc/topology.h --- memhotplug/include/asm-powerpc/topology.h~A4.2-antonb-ppc64-_use_generic_nr_cpus_node 2005-09-30 12:38:06.000000000 -0700 +++ memhotplug-dave/include/asm-powerpc/topology.h 2005-09-30 12:38:06.000000000 -0700 @@ -37,8 +37,6 @@ static inline int node_to_first_cpu(int #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 -puN include/asm-ppc64/mmzone.h~A4.2-antonb-ppc64-_use_generic_nr_cpus_node include/asm-ppc64/mmzone.h --- memhotplug/include/asm-ppc64/mmzone.h~A4.2-antonb-ppc64-_use_generic_nr_cpus_node 2005-09-30 12:38:06.000000000 -0700 +++ memhotplug-dave/include/asm-ppc64/mmzone.h 2005-09-30 12:38:06.000000000 -0700 @@ -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[]; /* 16MB regions */ #define MEMORY_INCREMENT_SHIFT 24 _