[RFC 22/22] alpha: Use generic show_mem()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Johannes Weiner
Date: Wednesday, April 2, 2008 - 1:40 pm

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index efffa92..c91629f 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -598,9 +598,6 @@ config ALPHA_LARGE_VMALLOC
 
 	  Say N unless you know you need gobs and gobs of vmalloc space.
 
-config HAVE_ARCH_SHOW_MEM
-	def_bool y
-
 config VERBOSE_MCHECK
 	bool "Verbose Machine Checks"
 
@@ -679,4 +676,3 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
-
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 40c15e7..234e42b 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -94,36 +94,6 @@ __bad_page(void)
 	return pte_mkdirty(mk_pte(virt_to_page(EMPTY_PGE), PAGE_SHARED));
 }
 
-#ifndef CONFIG_DISCONTIGMEM
-void
-show_mem(void)
-{
-	long i,free = 0,total = 0,reserved = 0;
-	long shared = 0, cached = 0;
-
-	printk("\nMem-info:\n");
-	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-	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("%ld pages of RAM\n",total);
-	printk("%ld free pages\n",free);
-	printk("%ld reserved pages\n",reserved);
-	printk("%ld pages shared\n",shared);
-	printk("%ld pages swap cached\n",cached);
-}
-#endif
-
 static inline unsigned long
 load_PCB(struct pcb_struct *pcb)
 {
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 10ab783..a460645 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -359,38 +359,3 @@ void __init mem_init(void)
 	mem_stress();
 #endif
 }
-
-void
-show_mem(void)
-{
-	long i,free = 0,total = 0,reserved = 0;
-	long shared = 0, cached = 0;
-	int nid;
-
-	printk("\nMem-info:\n");
-	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-	for_each_online_node(nid) {
-		unsigned long flags;
-		pgdat_resize_lock(NODE_DATA(nid), &flags);
-		i = node_spanned_pages(nid);
-		while (i-- > 0) {
-			struct page *page = nid_page_nr(nid, i);
-			total++;
-			if (PageReserved(page))
-				reserved++;
-			else if (PageSwapCache(page))
-				cached++;
-			else if (!page_count(page))
-				free++;
-			else
-				shared += page_count(page) - 1;
-		}
-		pgdat_resize_unlock(NODE_DATA(nid), &flags);
-	}
-	printk("%ld pages of RAM\n",total);
-	printk("%ld free pages\n",free);
-	printk("%ld reserved pages\n",reserved);
-	printk("%ld pages shared\n",shared);
-	printk("%ld pages swap cached\n",cached);
-}
-- 
1.5.2.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC 00/21] Generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 01/22] Generic show_mem() implementation, Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 02/22] x86: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 03/22] sparc64: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 04/22] avr32: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 05/22] blackfin: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 06/22] cris: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 07/22] frv: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 08/22] h8300: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 09/22] m32r: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 10/22] m68k: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 11/22] m68knommu: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 12/22] mips: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 13/22] mn10300: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 14/22] parisc: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 15/22] powerpc: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 16/22] ppc: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 17/22] s390: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 18/22] sh: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 19/22] um: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 20/22] v850: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 21/22] xtensa: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
[RFC 22/22] alpha: Use generic show_mem(), Johannes Weiner, (Wed Apr 2, 1:40 pm)
Re: [RFC 10/22] m68k: Use generic show_mem(), Geert Uytterhoeven, (Thu Apr 3, 12:40 am)
Re: [RFC 17/22] s390: Use generic show_mem(), Heiko Carstens, (Thu Apr 3, 12:50 am)
Re: [RFC 01/22] Generic show_mem() implementation, Heiko Carstens, (Thu Apr 3, 12:55 am)
Re: [RFC 18/22] sh: Use generic show_mem(), Paul Mundt, (Thu Apr 3, 4:41 am)
Re: [RFC 12/22] mips: Use generic show_mem(), Ralf Baechle, (Thu Apr 3, 4:59 am)
Re: [RFC 01/22] Generic show_mem() implementation, Ralf Baechle, (Thu Apr 3, 5:18 am)
Re: [RFC 01/22] Generic show_mem() implementation, Sam Ravnborg, (Thu Apr 3, 5:48 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 5:58 am)
Re: [RFC 17/22] s390: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 6:00 am)
Re: [RFC 18/22] sh: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 6:08 am)
Re: [RFC 01/22] Generic show_mem() implementation, Johannes Weiner, (Thu Apr 3, 6:30 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Geert Uytterhoeven, (Thu Apr 3, 6:39 am)
Re: [RFC 01/22] Generic show_mem() implementation, Johannes Weiner, (Thu Apr 3, 7:49 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 8:10 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Hugh Dickins, (Thu Apr 3, 9:07 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 9:17 am)
Re: [RFC 17/22] s390: Use generic show_mem(), Heiko Carstens, (Thu Apr 3, 10:58 am)
Re: [RFC 01/22] Generic show_mem() implementation, Sam Ravnborg, (Thu Apr 3, 11:12 am)
Re: [RFC 10/22] m68k: Use generic show_mem(), Geert Uytterhoeven, (Thu Apr 3, 12:13 pm)
Re: [RFC 01/22] Generic show_mem() implementation, Johannes Weiner, (Thu Apr 3, 3:33 pm)
Re: [RFC 17/22] s390: Use generic show_mem(), Johannes Weiner, (Thu Apr 3, 3:37 pm)
Re: [RFC 00/21] Generic show_mem(), Johannes Weiner, (Thu Apr 3, 4:45 pm)
Re: [RFC 17/22] s390: Use generic show_mem(), Heiko Carstens, (Fri Apr 4, 12:39 am)
Re: [RFC 02/22] x86: Use generic show_mem(), Ingo Molnar, (Fri Apr 4, 1:17 am)
Re: [RFC 19/22] um: Use generic show_mem(), Jeff Dike, (Fri Apr 4, 7:38 am)
Re: [RFC 01/22] Generic show_mem() implementation, Sam Ravnborg, (Fri Apr 4, 2:35 pm)
Re: [RFC 01/22] Generic show_mem() implementation, Johannes Weiner, (Fri Apr 4, 4:10 pm)
Re: [RFC 01/22] Generic show_mem() implementation, Heiko Carstens, (Sat Apr 5, 12:51 am)
Re: [RFC 01/22] Generic show_mem() implementation, Ralf Baechle, (Sat Apr 5, 2:04 am)
Re: [RFC 01/22] Generic show_mem() implementation, Heiko Carstens, (Sat Apr 5, 10:52 am)