Commit 0ec5e0ed authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

m68knommu: use generic show_mem() 



Remove arch-specific show_mem() in favor of the generic version.

This also removes the following redundant information display:

	- free pages, printed by show_free_areas()
	- pages in swapcache, printed by show_swap_cache_info()

where show_mem() calls show_free_areas(), which calls
show_swap_cache_info().

Signed-off-by: default avatarJohannes Weiner <hannes@saeurebad.de>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e66ddf1a

arch/m68knommu/mm/init.c

+0 −27
Original line number Diff line number Diff line
@@ -62,33 +62,6 @@ static unsigned long empty_bad_page; 


unsigned long empty_zero_page;



void show_mem(void)

{

    unsigned long i;

    int free = 0, total = 0, reserved = 0, shared = 0;

    int cached = 0;



    printk(KERN_INFO "\nMem-info:\n");

    show_free_areas();

    i = max_mapnr;

    while (i-- > 0) {

	total++;

	if (PageReserved(mem_map+i))

	    reserved++;

	else if (PageSwapCache(mem_map+i))

	    cached++;

	else if (!page_count(mem_map+i))

	    free++;

	else

	    shared += page_count(mem_map+i) - 1;

    }

    printk(KERN_INFO "%d pages of RAM\n",total);

    printk(KERN_INFO "%d free pages\n",free);

    printk(KERN_INFO "%d reserved pages\n",reserved);

    printk(KERN_INFO "%d pages shared\n",shared);

    printk(KERN_INFO "%d pages swap cached\n",cached);

}



extern unsigned long memory_start;

extern unsigned long memory_end;