From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 05:27:25 +0000 Subject: Merge with Linux 2.4.0-test12. --- arch/i386/mm/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'arch/i386/mm') diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 39a6ce0f8..b2e5a1bfc 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -198,7 +198,7 @@ void __init kmap_init(void) void show_mem(void) { - int i,free = 0, total = 0, reserved = 0; + int i, total = 0, reserved = 0; int shared = 0, cached = 0; int highmem = 0; @@ -214,9 +214,7 @@ void show_mem(void) reserved++; else if (PageSwapCache(mem_map+i)) cached++; - else if (!page_count(mem_map+i)) - free++; - else + else if (page_count(mem_map+i)) shared += page_count(mem_map+i) - 1; } printk("%d pages of RAM\n", total); @@ -437,7 +435,7 @@ void __init zap_low_mappings (void) } /* - * paging_init() sets up the page tables - note that the first 4MB are + * paging_init() sets up the page tables - note that the first 8MB are * already mapped by head.S. * * This routines also unmaps the page at virtual kernel address 0, so -- cgit v1.2.3