login
Header Space

 
 

[patch 22/22 -v3] xtensa: Use generic show_mem()

Previous thread: [patch 21/22 -v3] x86: Use generic show_mem() by Johannes Weiner on Monday, April 7, 2008 - 10:40 am. (1 message)

Next thread: [patch v2] doc: DMA-mapping.txt has undeclared variables [Bug 10397] by Matti Linnanvuori on Monday, April 7, 2008 - 12:01 pm. (4 messages)
To: LKML <linux-kernel@...>
Cc: Chris Zankel <chris@...>
Date: Monday, April 7, 2008 - 10:40 am

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 &lt;hannes@saeurebad.de&gt;
CC: Chris Zankel &lt;chris@zankel.net&gt;
---

Index: tree-linus/arch/xtensa/mm/init.c
===================================================================
--- tree-linus.orig/arch/xtensa/mm/init.c
+++ tree-linus/arch/xtensa/mm/init.c
@@ -280,32 +280,6 @@ void free_initmem(void)
 	       (&amp;__init_end - &amp;__init_begin) &gt;&gt; 10);
 }
 
-void show_mem(void)
-{
-	int i, free = 0, total = 0, reserved = 0;
-	int shared = 0, cached = 0;
-
-	printk("Mem-info:\n");
-	show_free_areas();
-	i = max_mapnr;
-	while (i-- &gt; 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("%d pages of RAM\n", total);
-	printk("%d reserved pages\n", reserved);
-	printk("%d pages shared\n", shared);
-	printk("%d pages swap cached\n",cached);
-	printk("%d free pages\n", free);
-}
-
 struct kmem_cache *pgtable_cache __read_mostly;
 
 static void pgd_ctor(struct kmem_cache *cache, void* addr)
Index: tree-linus/arch/xtensa/Kconfig
===================================================================
--- tree-linus.orig/arch/xtensa/Kconfig
+++ tree-linus/arch/xtensa/Kconfig
@@ -15,6 +15,7 @@ config XTENSA
 	bool
 	default y
 	select HAVE_IDE
+	select HAVE_GENERIC_SHOW_MEM
 	help
 	  Xtensa processors are 32-bit RISC machines designed by Tensilica
 	  primarily for embedded systems.  These processors are both

-- 

--
Previous thread: [patch 21/22 -v3] x86: Use generic show_mem() by Johannes Weiner on Monday, April 7, 2008 - 10:40 am. (1 message)

Next thread: [patch v2] doc: DMA-mapping.txt has undeclared variables [Bug 10397] by Matti Linnanvuori on Monday, April 7, 2008 - 12:01 pm. (4 messages)
speck-geostationary