Remove arch-specific show_mem() in favor of the generic version. This also removes the following redundant information display: - free pages, printed in 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 CC: Miles Bader --- Index: tree-linus/arch/v850/Kconfig =================================================================== --- tree-linus.orig/arch/v850/Kconfig +++ tree-linus/arch/v850/Kconfig @@ -79,6 +79,7 @@ config V850 bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM menu "Processor type and features" Index: tree-linus/arch/v850/kernel/setup.c =================================================================== --- tree-linus.orig/arch/v850/kernel/setup.c +++ tree-linus/arch/v850/kernel/setup.c @@ -298,33 +298,3 @@ init_mem_alloc (unsigned long ram_start, free_area_init_node (0, NODE_DATA(0), zones_size, ADDR_TO_PAGE (PAGE_OFFSET), 0); } - - - -/* Taken from m68knommu */ -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); -} -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/