diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-01 09:52:47 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-03 15:26:25 +0400 |
| commit | 0596152388e234efebce464355186ad9e16c8cb6 (patch) | |
| tree | 9e04e9630bdffdbfba07d43d1e7e08edf24045ca /arch/x86/kernel/setup_32.c | |
| parent | b66cd7207387b9b428aaf1988e21dd263c6a4928 (diff) | |
| download | linux-0596152388e234efebce464355186ad9e16c8cb6.tar.xz | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 6f40cb560ea9..29010420458d 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(); |