openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] x86-64: Clean up the SRAT node list before computing the hash function 

Also use for_each_node_mask instead of hand crafted loops.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2005-09-12 18:49:25 +02:00 committed by Linus Torvalds
parent 66759a01ad
commit e58e0d0312
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86_64/mm/srat.c
View File

@ -177,6 +177,14 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
int i; int i;
if (acpi_numa <= 0) if (acpi_numa <= 0)
return -1; return -1;
/* First clean up the node list */
for_each_node_mask(i, nodes_parsed) {
cutoff_node(i, start, end);
if (nodes[i].start == nodes[i].end)
node_clear(i, nodes_parsed);
}
memnode_shift = compute_hash_shift(nodes, nodes_weight(nodes_parsed)); memnode_shift = compute_hash_shift(nodes, nodes_weight(nodes_parsed));
if (memnode_shift < 0) { if (memnode_shift < 0) {
printk(KERN_ERR printk(KERN_ERR
@ -184,16 +192,10 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
bad_srat(); bad_srat();
return -1; return -1;
} }
for (i = 0; i < MAX_NUMNODES; i++) {
if (!node_isset(i, nodes_parsed)) /* Finally register nodes */
continue; for_each_node_mask(i, nodes_parsed)
cutoff_node(i, start, end);
if (nodes[i].start == nodes[i].end) {
node_clear(i, nodes_parsed);
continue;
}
setup_node_bootmem(i, nodes[i].start, nodes[i].end); setup_node_bootmem(i, nodes[i].start, nodes[i].end);
}
for (i = 0; i < NR_CPUS; i++) { for (i = 0; i < NR_CPUS; i++) {
if (cpu_to_node[i] == NUMA_NO_NODE) if (cpu_to_node[i] == NUMA_NO_NODE)
continue; continue;