Messages in this thread Patch in this message | | | Date | Fri, 04 Apr 2008 13:51:48 +0200 | From | hannes@saeureba ... | Subject | [patch 11/22 -v2] 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: Johannes Weiner <hannes@saeurebad.de> CC: Geert Uytterhoeven <geert@linux-m68k.org> ---
Index: tree-linus/arch/m68knommu/Kconfig =================================================================== --- tree-linus.orig/arch/m68knommu/Kconfig +++ tree-linus/arch/m68knommu/Kconfig @@ -9,7 +9,6 @@ config M68K bool default y select HAVE_IDE - select HAVE_ARCH_SHOW_MEM config MMU bool Index: tree-linus/arch/m68knommu/mm/init.c =================================================================== --- tree-linus.orig/arch/m68knommu/mm/init.c +++ tree-linus/arch/m68knommu/mm/init.c @@ -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; @@ -223,4 +196,3 @@ free_initmem() (int)(addr - PAGE_SIZE)); #endif } - --
| |