Commit 2aed711a authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fdb9df94

arch/x86_64/mm/k8topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86_64/mm/srat.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE