aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-11-10 22:13:20 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-11 06:20:57 -0500
commit3e66c4def14aa64ee6d1d4ef077d789abc30125d (patch)
tree76787962cb442e7f7f38990d7460ac8e888dd355 /arch
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 'arch')
-rw-r--r--arch/powerpc/mm/numa.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index da09ba03c424..c2d7fec50c92 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -38,7 +38,6 @@ int numa_cpu_lookup_table[NR_CPUS] = { [ 0 ... (NR_CPUS - 1)] =
38 ARRAY_INITIALISER}; 38 ARRAY_INITIALISER};
39char *numa_memory_lookup_table; 39char *numa_memory_lookup_table;
40cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES]; 40cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES];
41int nr_cpus_in_node[MAX_NUMNODES] = { [0 ... (MAX_NUMNODES -1)] = 0};
42 41
43struct pglist_data *node_data[MAX_NUMNODES]; 42struct pglist_data *node_data[MAX_NUMNODES];
44bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES]; 43bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES];
@@ -58,14 +57,12 @@ EXPORT_SYMBOL(node_data);
58EXPORT_SYMBOL(numa_cpu_lookup_table); 57EXPORT_SYMBOL(numa_cpu_lookup_table);
59EXPORT_SYMBOL(numa_memory_lookup_table); 58EXPORT_SYMBOL(numa_memory_lookup_table);
60EXPORT_SYMBOL(numa_cpumask_lookup_table); 59EXPORT_SYMBOL(numa_cpumask_lookup_table);
61EXPORT_SYMBOL(nr_cpus_in_node);
62 60
63static inline void map_cpu_to_node(int cpu, int node) 61static inline void map_cpu_to_node(int cpu, int node)
64{ 62{
65 numa_cpu_lookup_table[cpu] = node; 63 numa_cpu_lookup_table[cpu] = node;
66 if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node]))) { 64 if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node]))) {
67 cpu_set(cpu, numa_cpumask_lookup_table[node]); 65 cpu_set(cpu, numa_cpumask_lookup_table[node]);
68 nr_cpus_in_node[node]++;
69 } 66 }
70} 67}
71 68
@@ -78,7 +75,6 @@ static void unmap_cpu_from_node(unsigned long cpu)
78 75
79 if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) { 76 if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) {
80 cpu_clear(cpu, numa_cpumask_lookup_table[node]); 77 cpu_clear(cpu, numa_cpumask_lookup_table[node]);
81 nr_cpus_in_node[node]--;
82 } else { 78 } else {
83 printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n", 79 printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n",
84 cpu, node); 80 cpu, node);