diff options
| author |   Andi Kleen <ak@suse.de> | 2006-02-16 23:42:16 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:00:41 -0800 |
| commit | 2aed711a399cbc4a9bf239c13f05a8a8b460f215 (patch) | |
| tree | 4df37199d4383107573b0cf3bf406590c3e81bfd /arch | |
| parent | [PATCH] x86_64: Relax SRAT covers all memory check a bit (diff) | |
| download | linux-dev-2aed711a399cbc4a9bf239c13f05a8a8b460f215.tar.xz linux-dev-2aed711a399cbc4a9bf239c13f05a8a8b460f215.zip | |
[PATCH] x86_64: Always pass full number of nodes to NUMA hash computation
Previously the numa hash code would be confused by holes in the node space
and stop early. This is the first part of the fix for the non boot issue
with empty nodes on Opterons.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/mm/k8topology.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/mm/srat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c index a5663e0bb01c..dd60e71fdba6 100644 --- a/arch/x86_64/mm/k8topology.c +++ b/arch/x86_64/mm/k8topology.c @@ -155,7 +155,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) if (!found) return -1; - memnode_shift = compute_hash_shift(nodes, numnodes); + memnode_shift = compute_hash_shift(nodes, 8); if (memnode_shift < 0) { printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n"); return -1; diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c index 809dc70675f7..482c25767369 100644 --- a/arch/x86_64/mm/srat.c +++ b/arch/x86_64/mm/srat.c @@ -271,7 +271,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) return -1; } - memnode_shift = compute_hash_shift(nodes, nodes_weight(nodes_parsed)); + memnode_shift = compute_hash_shift(nodes, MAX_NUMNODES); if (memnode_shift < 0) { printk(KERN_ERR "SRAT: No NUMA node hash function found. Contact maintainer\n"); |