aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/numa.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index dc6392ce2530..2ae491d9404f 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -133,6 +133,8 @@ static inline void map_cpu_to_node(int cpu, int node)
133{ 133{
134 numa_cpu_lookup_table[cpu] = node; 134 numa_cpu_lookup_table[cpu] = node;
135 135
136 dbg("adding cpu %d to node %d\n", cpu, node);
137
136 if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node]))) 138 if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node])))
137 cpu_set(cpu, numa_cpumask_lookup_table[node]); 139 cpu_set(cpu, numa_cpumask_lookup_table[node]);
138} 140}
@@ -246,8 +248,7 @@ static int __init find_min_common_depth(void)
246 if ((len >= 1) && ref_points) { 248 if ((len >= 1) && ref_points) {
247 depth = ref_points[1]; 249 depth = ref_points[1];
248 } else { 250 } else {
249 dbg("WARNING: could not find NUMA " 251 dbg("NUMA: ibm,associativity-reference-points not found.\n");
250 "associativity reference point\n");
251 depth = -1; 252 depth = -1;
252 } 253 }
253 of_node_put(rtas_root); 254 of_node_put(rtas_root);
@@ -385,10 +386,11 @@ static int __init parse_numa_properties(void)
385 386
386 min_common_depth = find_min_common_depth(); 387 min_common_depth = find_min_common_depth();
387 388
388 dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth);
389 if (min_common_depth < 0) 389 if (min_common_depth < 0)
390 return min_common_depth; 390 return min_common_depth;
391 391
392 dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth);
393
392 /* 394 /*
393 * Even though we connect cpus to numa domains later in SMP init, 395 * Even though we connect cpus to numa domains later in SMP init,
394 * we need to know the maximum node id now. This is because each 396 * we need to know the maximum node id now. This is because each