From 8e6a5723b114ca0f8207950622972e4fc04ccadc Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 3 Jun 2008 10:24:49 -0700 Subject: [PATCH] --- yaml --- r: 99729 b: refs/heads/master c: f19dc2f22a180dde3f9e611b76c73f5390c11ecd h: refs/heads/master i: 99727: 0d65bf2abf568c5b2235d1baf515fbac0790e9a5 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5049bb04ea84..4f4283fad8a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 835fc943f34139ed062f1ac194b52ed3b7123d88 +refs/heads/master: f19dc2f22a180dde3f9e611b76c73f5390c11ecd diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index c985a8c305e0..ccf3595202fa 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/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