From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761857AbYDBVqf (ORCPT ); Wed, 2 Apr 2008 17:46:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762910AbYDBVnw (ORCPT ); Wed, 2 Apr 2008 17:43:52 -0400 Received: from saeurebad.de ([85.214.36.134]:60154 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762906AbYDBVnv (ORCPT ); Wed, 2 Apr 2008 17:43:51 -0400 From: Johannes Weiner To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, mingo@elte.hu, davem@davemloft.net, hskinnemoen@atmel.com, cooloney@kernel.org, starvik@axis.com, dhowells@redhat.com, ysato@users.sourceforge.net, takata@linux-m32r.org, geert@linux-m68k.org, ralf@linux-mips.org, kyle@parisc-linux.org, paulus@samba.org, schwidefsky@de.ibm.com, lethal@linux-sh.org, jdike@addtoit.com, miles@gnu.org, chris@zankel.net, rmk@arm.linux.org.uk, tony.luck@intel.com Subject: [RFC 11/22] m68knommu: Use generic show_mem() Date: Wed, 2 Apr 2008 22:40:17 +0200 Message-Id: <12071689522793-git-send-email-hannes@saeurebad.de> X-Mailer: git-send-email 1.5.2.2 In-Reply-To: <12071688283927-git-send-email-hannes@saeurebad.de> References: <12071688283927-git-send-email-hannes@saeurebad.de> 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 Signed-off-by: Johannes Weiner diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 7e921a3..07eb4c4 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -671,9 +671,6 @@ config ROMKERNEL endchoice -config HAVE_ARCH_SHOW_MEM - def_bool y - source "mm/Kconfig" endmenu diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c index 22e2a0d..345a92a 100644 --- 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; @@ -223,4 +196,3 @@ free_initmem() (int)(addr - PAGE_SIZE)); #endif } - -- 1.5.2.2