leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "x86, 32-bit: SRAT fix"

Browse Source 
This reverts commit ea57a5a6db, a better
fix will be merged.
This commit is contained in:
Ingo Molnar 2008-06-09 10:57:16 +02:00
parent ea57a5a6db
commit 2377494285
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/srat_32.c
View File

@ -240,7 +240,6 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
for (i = 0; i < MAX_APICID; i++) for (i = 0; i < MAX_APICID; i++)
apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]); apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]);
remove_all_active_ranges();
for (j = 0; j < num_memory_chunks; j++){ for (j = 0; j < num_memory_chunks; j++){
struct node_memory_chunk_s * chunk = &node_memory_chunk[j]; struct node_memory_chunk_s * chunk = &node_memory_chunk[j];
printk("chunk %d nid %d start_pfn %08lx end_pfn %08lx\n", 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); node_read_chunk(chunk->nid, chunk);
e820_register_active_regions(chunk->nid, chunk->start_pfn, e820_register_active_regions(chunk->nid, chunk->start_pfn,
min(chunk->end_pfn, max_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; return 1;
out_fail: out_fail: