aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-26 03:44:56 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 07:10:42 -0400
commitb9d19f4a51447930db002409945ad40a7a373cb0 (patch)
tree30e954d9d23f71eb9bc3b462c5ffde78b11588f4 /arch
parent383bc5cecc2ed0b8f44a25488660b03030425ef7 (diff)
x86: fix memory setup bug
interesting... [ 0.000000] mapped low ram: 0 - 20000000 [ 0.000000] low ram: 00000000 - 1fff0000 [ 0.000000] bootmap 00002000 - 00006000 max_pfn_mapped > max_low_pfn? it seems init_memory_mapping reveals an old bug. please check attached test patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/setup_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 4b953dc93883..392812d3c63c 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -427,7 +427,7 @@ void __init setup_arch(char **cmdline_p)
427 find_low_pfn_range(); 427 find_low_pfn_range();
428 428
429 /* max_pfn_mapped is updated here */ 429 /* max_pfn_mapped is updated here */
430 init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT)); 430 max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT));
431 431
432 reserve_initrd(); 432 reserve_initrd();
433 433