summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-26 07:44:56 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-07-08 11:10:42 (GMT)
commitb9d19f4a51447930db002409945ad40a7a373cb0 (patch)
tree30e954d9d23f71eb9bc3b462c5ffde78b11588f4 /arch/x86
parent383bc5cecc2ed0b8f44a25488660b03030425ef7 (diff)
downloadlinux-b9d19f4a51447930db002409945ad40a7a373cb0.tar.xz
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/x86')
-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 4b953dc..392812d 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)
find_low_pfn_range();
/* max_pfn_mapped is updated here */
- init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT));
+ max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT));
reserve_initrd();