From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760189AbYDGPwZ (ORCPT ); Mon, 7 Apr 2008 11:52:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759352AbYDGPuO (ORCPT ); Mon, 7 Apr 2008 11:50:14 -0400 Received: from saeurebad.de ([85.214.36.134]:44759 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753179AbYDGPuM (ORCPT ); Mon, 7 Apr 2008 11:50:12 -0400 X-Mailbox-Line: From hannes@skyscraper.fehenstaub.lan Mon Apr 7 16:42:40 2008 Message-Id: <20080407144240.583246392@skyscraper.fehenstaub.lan> References: <20080407144008.124362640@skyscraper.fehenstaub.lan> User-Agent: quilt/0.46-1 Date: Mon, 07 Apr 2008 16:40:18 +0200 From: Johannes Weiner To: LKML Cc: Geert Uytterhoeven Subject: [patch 10/22 -v3] m68k: Use generic show_mem() Content-Disposition: inline; filename=m68k-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: Geert Uytterhoeven --- Index: tree-linus/arch/m68k/Kconfig =================================================================== --- tree-linus.orig/arch/m68k/Kconfig +++ tree-linus/arch/m68k/Kconfig @@ -6,6 +6,7 @@ config M68K bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config MMU bool Index: tree-linus/arch/m68k/mm/init.c =================================================================== --- tree-linus.orig/arch/m68k/mm/init.c +++ tree-linus/arch/m68k/mm/init.c @@ -70,36 +70,6 @@ void __init m68k_setup_node(int node) void *empty_zero_page; -void show_mem(void) -{ - pg_data_t *pgdat; - int free = 0, total = 0, reserved = 0, shared = 0; - int cached = 0; - int i; - - printk("\nMem-info:\n"); - show_free_areas(); - for_each_online_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; i++) { - struct page *page = pgdat->node_mem_map + i; - total++; - if (PageReserved(page)) - reserved++; - else if (PageSwapCache(page)) - cached++; - else if (!page_count(page)) - free++; - else - shared += page_count(page) - 1; - } - } - printk("%d pages of RAM\n",total); - 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); -} - extern void init_pointer_table(unsigned long ptable); /* References to section boundaries */ --