aboutsummaryrefslogtreecommitdiff
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
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>
-rw-r--r--arch/x86/kernel/e820_32.c5
-rw-r--r--arch/x86/kernel/setup_32.c4
-rw-r--r--arch/x86/mm/discontig_32.c2
-rw-r--r--include/asm-x86/e820_32.h2
4 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index db760d4706a..0c025d04fc2 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -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;
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();
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 98b099eeab3..ebbbba33815 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -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);
diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h
index 7ace82570a3..00fbc60b9d3 100644
--- a/include/asm-x86/e820_32.h
+++ b/include/asm-x86/e820_32.h
@@ -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,