From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759291AbYDGPxy (ORCPT ); Mon, 7 Apr 2008 11:53:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759578AbYDGPuu (ORCPT ); Mon, 7 Apr 2008 11:50:50 -0400 Received: from saeurebad.de ([85.214.36.134]:44782 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759565AbYDGPut (ORCPT ); Mon, 7 Apr 2008 11:50:49 -0400 X-Mailbox-Line: From hannes@skyscraper.fehenstaub.lan Mon Apr 7 16:42:41 2008 Message-Id: <20080407144241.311216896@skyscraper.fehenstaub.lan> References: <20080407144008.124362640@skyscraper.fehenstaub.lan> User-Agent: quilt/0.46-1 Date: Mon, 07 Apr 2008 16:40:23 +0200 From: Johannes Weiner To: LKML Cc: Paul Mackerras Subject: [patch 15/22 -v3] ppc: Use generic show_mem() Content-Disposition: inline; filename=ppc-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 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: Paul Mackerras --- Index: tree-linus/arch/ppc/Kconfig =================================================================== --- tree-linus.orig/arch/ppc/Kconfig +++ tree-linus/arch/ppc/Kconfig @@ -45,6 +45,7 @@ config PPC select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES + select HAVE_GENERIC_SHOW_MEM config PPC32 bool Index: tree-linus/arch/ppc/mm/init.c =================================================================== --- tree-linus.orig/arch/ppc/mm/init.c +++ tree-linus/arch/ppc/mm/init.c @@ -101,36 +101,6 @@ unsigned long __max_memory; /* max amount of low RAM to map in */ unsigned long __max_low_memory = MAX_LOW_MEM; -void show_mem(void) -{ - int i,free = 0,total = 0,reserved = 0; - int shared = 0, cached = 0; - int highmem = 0; - - printk("Mem-info:\n"); - show_free_areas(); - i = max_mapnr; - while (i-- > 0) { - total++; - if (PageHighMem(mem_map+i)) - highmem++; - 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("%d pages of RAM\n",total); - printk("%d pages of HIGHMEM\n", highmem); - printk("%d free pages\n",free); - printk("%d reserved pages\n",reserved); - printk("%d pages shared\n",shared); - printk("%d pages swap cached\n",cached); -} - /* Free up now-unused memory */ static void free_sec(unsigned long start, unsigned long end, const char *name) { --