From: Yinghai Lu Date: Tue, 3 Jun 2008 17:24:49 +0000 (-0700) Subject: x86: change propagate_e820_map() back to find_max_pfn(), 32-bit, fix X-Git-Tag: v2.6.27-rc1~1106^2~247^2~50 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f19dc2f22a180dde3f9e611b76c73f5390c11ecd;p=linux-2.6-omap-h63xx.git x86: change propagate_e820_map() back to find_max_pfn(), 32-bit, fix add memory_present() calls for sparse and non-numa. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index c985a8c305e..ccf3595202f 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -377,11 +377,13 @@ static unsigned long __init setup_memory(void) if (max_pfn > max_low_pfn) { highstart_pfn = max_low_pfn; } + memory_present(0, 0, highend_pfn); printk(KERN_NOTICE "%ldMB HIGHMEM available.\n", pages_to_mb(highend_pfn - highstart_pfn)); num_physpages = highend_pfn; high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1; #else + memory_present(0, 0, max_low_pfn); num_physpages = max_low_pfn; high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1; #endif