From 0bc66e21c98a0c521e94134faa5056d977513da3 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 9 Jun 2008 10:57:16 +0200 Subject: [PATCH] --- yaml --- r: 99741 b: refs/heads/master c: 237749428552e2f81ec6c801482dfd8a777e470b h: refs/heads/master i: 99739: 1c4797af292f17aa12d08056c646b3449070e92a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/srat_32.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 75392bfdc7ba..49343802b635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea57a5a6db8961de35cd1a4a80d8e01ee4307973 +refs/heads/master: 237749428552e2f81ec6c801482dfd8a777e470b diff --git a/trunk/arch/x86/kernel/srat_32.c b/trunk/arch/x86/kernel/srat_32.c index 5eedd3fd4d49..32d8b1142938 100644 --- a/trunk/arch/x86/kernel/srat_32.c +++ b/trunk/arch/x86/kernel/srat_32.c @@ -240,7 +240,6 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) for (i = 0; i < MAX_APICID; i++) apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]); - remove_all_active_ranges(); for (j = 0; j < num_memory_chunks; j++){ struct node_memory_chunk_s * chunk = &node_memory_chunk[j]; printk("chunk %d nid %d start_pfn %08lx end_pfn %08lx\n", @@ -248,8 +247,14 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) node_read_chunk(chunk->nid, chunk); e820_register_active_regions(chunk->nid, chunk->start_pfn, min(chunk->end_pfn, max_pfn)); - memory_present(chunk->nid, chunk->start_pfn, - min(chunk->end_pfn, max_pfn)); + } + + for_each_online_node(nid) { + unsigned long start = node_start_pfn[nid]; + unsigned long end = node_end_pfn[nid]; + + memory_present(nid, start, end); + node_remap_size[nid] = node_memmap_size_bytes(nid, start, end); } return 1; out_fail: