aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/amdtopology_64.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-02-16 11:11:09 -0500
committerTejun Heo <tj@kernel.org>2011-02-16 11:11:09 -0500
commit92d4a4371eeb89e1e12b9ebbed0956f499b6c2c0 (patch)
tree11ee70801eeeac07fefe97d42c108036833b5ec0 /arch/x86/mm/amdtopology_64.c
parent91556237ec872e1029e3036174bae3b1a8df65eb (diff)
x86-64, NUMA: Rename cpu_nodes_parsed to numa_nodes_parsed
It's no longer necessary to keep both cpu_nodes_parsed and mem_nodes_parsed. In preparation for merge, rename cpu_nodes_parsed to numa_nodes_parsed. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Shaohui Zheng <shaohui.zheng@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/mm/amdtopology_64.c')
-rw-r--r--arch/x86/mm/amdtopology_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index 0cb59e582007..e76bffabc09d 100644
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -168,7 +168,7 @@ int __init amd_numa_init(void)
168 prevbase = base; 168 prevbase = base;
169 numa_add_memblk(nodeid, base, limit); 169 numa_add_memblk(nodeid, base, limit);
170 node_set(nodeid, mem_nodes_parsed); 170 node_set(nodeid, mem_nodes_parsed);
171 node_set(nodeid, cpu_nodes_parsed); 171 node_set(nodeid, numa_nodes_parsed);
172 } 172 }
173 173
174 if (!nodes_weight(mem_nodes_parsed)) 174 if (!nodes_weight(mem_nodes_parsed))
@@ -189,7 +189,7 @@ int __init amd_numa_init(void)
189 apicid_base = boot_cpu_physical_apicid; 189 apicid_base = boot_cpu_physical_apicid;
190 } 190 }
191 191
192 for_each_node_mask(i, cpu_nodes_parsed) 192 for_each_node_mask(i, numa_nodes_parsed)
193 for (j = apicid_base; j < cores + apicid_base; j++) 193 for (j = apicid_base; j < cores + apicid_base; j++)
194 set_apicid_to_node((i << bits) + j, i); 194 set_apicid_to_node((i << bits) + j, i);
195 195