aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index f98e48cae6da..0b00bb2ea576 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -292,7 +292,8 @@ contig_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
292 if (bootmap == -1L) 292 if (bootmap == -1L)
293 panic("Cannot find bootmem map of size %ld\n",bootmap_size); 293 panic("Cannot find bootmem map of size %ld\n",bootmap_size);
294 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); 294 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);
295 e820_bootmem_free(NODE_DATA(0), 0, end_pfn << PAGE_SHIFT); 295 e820_register_active_regions(0, start_pfn, end_pfn);
296 free_bootmem_with_active_regions(0, end_pfn);
296 reserve_bootmem(bootmap, bootmap_size); 297 reserve_bootmem(bootmap, bootmap_size);
297} 298}
298#endif 299#endif
@@ -384,6 +385,7 @@ void __init setup_arch(char **cmdline_p)
384 385
385 finish_e820_parsing(); 386 finish_e820_parsing();
386 387
388 e820_register_active_regions(0, 0, -1UL);
387 /* 389 /*
388 * partially used pages are not usable - thus 390 * partially used pages are not usable - thus
389 * we are rounding upwards: 391 * we are rounding upwards:
@@ -414,6 +416,9 @@ void __init setup_arch(char **cmdline_p)
414 max_pfn = end_pfn; 416 max_pfn = end_pfn;
415 high_memory = (void *)__va(end_pfn * PAGE_SIZE - 1) + 1; 417 high_memory = (void *)__va(end_pfn * PAGE_SIZE - 1) + 1;
416 418
419 /* Remove active ranges so rediscovery with NUMA-awareness happens */
420 remove_all_active_ranges();
421
417#ifdef CONFIG_ACPI_NUMA 422#ifdef CONFIG_ACPI_NUMA
418 /* 423 /*
419 * Parse SRAT to discover nodes. 424 * Parse SRAT to discover nodes.