diff options
| author | Yinghai Lu | 2008-10-15 03:59:18 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-28 16:50:49 +0100 |
| commit | 11a6b0c933b55654a58afd84f63a5dde1607d78f (patch) | |
| tree | 88f8b321a3a14d1115ee5d13d5f2acadbcfe135d /arch/x86/mm/init_64.c | |
| parent | x86, kdump: fix invalid access on i386 sparsemem (diff) | |
| download | kernel-qcow2-linux-11a6b0c933b55654a58afd84f63a5dde1607d78f.tar.gz kernel-qcow2-linux-11a6b0c933b55654a58afd84f63a5dde1607d78f.tar.xz kernel-qcow2-linux-11a6b0c933b55654a58afd84f63a5dde1607d78f.zip | |
x86: 64 bit print out absent pages num too
so users are not confused with memhole causing big total ram
we don't need to worry about 32 bit, because memhole is always
above max_low_pfn.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index f79a02f64d10..ad38648bddbd 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -884,6 +884,7 @@ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, void __init mem_init(void) { long codesize, reservedpages, datasize, initsize; + unsigned long absent_pages; start_periodic_check_for_corruption(); @@ -899,8 +900,9 @@ void __init mem_init(void) #else totalram_pages = free_all_bootmem(); #endif - reservedpages = max_pfn - totalram_pages - - absent_pages_in_range(0, max_pfn); + + absent_pages = absent_pages_in_range(0, max_pfn); + reservedpages = max_pfn - totalram_pages - absent_pages; after_bootmem = 1; codesize = (unsigned long) &_etext - (unsigned long) &_text; @@ -917,10 +919,11 @@ void __init mem_init(void) VSYSCALL_END - VSYSCALL_START); printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " - "%ldk reserved, %ldk data, %ldk init)\n", + "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), max_pfn << (PAGE_SHIFT-10), codesize >> 10, + absent_pages << (PAGE_SHIFT-10), reservedpages << (PAGE_SHIFT-10), datasize >> 10, initsize >> 10); |