aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-05-31 22:52:47 -0700
committerIngo Molnar <mingo@elte.hu>2008-06-03 13:26:25 +0200
commit0596152388e234efebce464355186ad9e16c8cb6 (patch)
tree9e04e9630bdffdbfba07d43d1e7e08edf24045ca /arch/x86/kernel/setup_32.c
parentb66cd7207387b9b428aaf1988e21dd263c6a4928 (diff)
x86, 32-bit: change propagate_e820_map() back to find_max_pfn()
we don't need to call memory_present that early. numa and sparse will call memory_present later and might even fail, it will call memory_present for the full range. also for sparse it will call alloc_bootmem ... before we set up bootmem. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 6f40cb560ea..29010420458 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -730,10 +730,10 @@ void __init setup_arch(char **cmdline_p)
efi_init();
/* update e820 for memory not covered by WB MTRRs */
- propagate_e820_map();
+ find_max_pfn();
mtrr_bp_init();
if (mtrr_trim_uncached_memory(max_pfn))
- propagate_e820_map();
+ find_max_pfn();
max_low_pfn = setup_memory();