diff options
author | David Rientjes <rientjes@google.com> | 2009-05-05 12:50:02 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-06 10:49:07 +0200 |
commit | 7eccf7b227b6d3b1745b937ce35efc9c27f9b0e5 (patch) | |
tree | 85644cca1084cb4442b159174de0d95da932e605 | |
parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
download | linux-stable-7eccf7b227b6d3b1745b937ce35efc9c27f9b0e5.tar.gz linux-stable-7eccf7b227b6d3b1745b937ce35efc9c27f9b0e5.tar.bz2 linux-stable-7eccf7b227b6d3b1745b937ce35efc9c27f9b0e5.zip |
x86, srat: do not register nodes beyond e820 map
The mem= option will truncate the memory map at a specified address so
it's not possible to register nodes with memory beyond the e820 upper
bound.
unparse_node() is only called when then node had memory associated with
it, although with the mem= option it is no longer addressable.
[ Impact: fix boot hang on certain (large) systems ]
Reported-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Jack Steiner <steiner@sgi.com>
LKML-Reference: <alpine.DEB.2.00.0905051248150.20021@chino.kir.corp.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/mm/srat_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 33c5fa57e43d..01765955baaf 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -361,6 +361,7 @@ static void __init unparse_node(int node) { int i; node_clear(node, nodes_parsed); + node_clear(node, cpu_nodes_parsed); for (i = 0; i < MAX_LOCAL_APIC; i++) { if (apicid_to_node[i] == node) apicid_to_node[i] = NUMA_NO_NODE; |