dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

x86, 32-bit: change propagate_e820_map() back to find_max_pfn()

Browse source 
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>
This commit is contained in:
Yinghai Lu 2008-05-31 22:52:47 -07:00 committed by Ingo Molnar
parent b66cd72073
commit 0596152388
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/x86/kernel/e820_32.c
View file

@ -210,7 +210,7 @@ void __init init_iomem_resources(struct resource *code_resource,
/*
* Find the highest page frame number we have available
*/
void __init propagate_e820_map(void)
void __init find_max_pfn(void)
{
int i;
@ -227,7 +227,6 @@ void __init propagate_e820_map(void)
continue;
if (end > max_pfn)
max_pfn = end;
memory_present(0, start, end);
}
}
@ -361,7 +360,7 @@ static int __init parse_memmap(char *arg)
* size before original memory map is
* reset.
*/
propagate_e820_map();
find_max_pfn();
saved_max_pfn = max_pfn;
#endif
e820.nr_map = 0;

4
arch/x86/kernel/setup_32.c
View file

@ -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();

2
arch/x86/mm/discontig_32.c
View file

@ -120,7 +120,7 @@ int __init get_memcfg_numa_flat(void)
printk("NUMA - single node, flat memory mode\n");
/* Run the memory configuration and find the top of memory. */
propagate_e820_map();
find_max_pfn();
node_start_pfn[0] = 0;
node_end_pfn[0] = max_pfn;
memory_present(0, 0, max_pfn);

2
include/asm-x86/e820_32.h
View file

@ -21,7 +21,7 @@
extern void setup_memory_map(void);
extern void finish_e820_parsing(void);
extern void propagate_e820_map(void);
extern void find_max_pfn(void);
extern void register_bootmem_low_pages(unsigned long max_low_pfn);
extern void limit_regions(unsigned long long size);
extern void init_iomem_resources(struct resource *code_resource,