Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757494AbYF0MP0 (ORCPT ); Fri, 27 Jun 2008 08:15:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760091AbYF0MGE (ORCPT ); Fri, 27 Jun 2008 08:06:04 -0400 Received: from saeurebad.de ([85.214.36.134]:39023 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760593AbYF0MGC (ORCPT ); Fri, 27 Jun 2008 08:06:02 -0400 X-Mailbox-Line: From hannes@saeurebad.de Fri Jun 27 14:00:49 2008 Message-Id: <20080627120049.269621765@saeurebad.de> References: <20080627115349.743368154@saeurebad.de> User-Agent: quilt/0.46-1 Date: Fri, 27 Jun 2008 13:53:59 +0200 From: Johannes Weiner To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 10/20] m68knommu: use generic show_mem() Content-Disposition: inline; filename=0011-m68knommu-use-generic-show_mem.patch X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1928 Lines: 71 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 CC: Geert Uytterhoeven --- arch/m68knommu/Kconfig | 1 + arch/m68knommu/mm/init.c | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -9,6 +9,7 @@ config M68K bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config MMU bool --- a/arch/m68knommu/mm/init.c +++ b/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; -- -- 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/