From a129d423e02069ef81f275394733ff4a3f88fbd8 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@saeurebad.de>
Date: Fri, 25 Jul 2008 19:46:14 -0700
Subject: [PATCH] --- yaml --- r: 106239 b: refs/heads/master c:
 bda2fa535564ace56a395d5b65c6dc81305401fa h: refs/heads/master i:   106237:
 2cee72d933003ef6546d85bbd6336cdccc76097b   106235:
 87d1f2edd8769374e21c7b664871dc1b31327106   106231:
 94513fd00088db8904ac2c8e84388a47b179a99b   106223:
 2db126c91baaf39ab8fdb04139dc249362ac6099   106207:
 a143731d63a8748c14efb36920437690f5ee3446   106175:
 e0bbc7219c039d6a4dc20e34631951991500fdf7   106111:
 36bd3dbdd185b324c0e5352c76c1aa55641c7815   105983:
 9be9cc827446e03ee670ab54363b28620e5521c5 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/powerpc/mm/mem.c | 39 -------------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/[refs] b/[refs]
index 1d8d5164986b..b991e301623d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c55281dee09a843dd6bf5070324b86b84847e6ea
+refs/heads/master: bda2fa535564ace56a395d5b65c6dc81305401fa
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index 1ca2235f0965..702691cb9e82 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -186,45 +186,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
 }
 EXPORT_SYMBOL_GPL(walk_memory_resource);
 
-void show_mem(void)
-{
-	unsigned long total = 0, reserved = 0;
-	unsigned long shared = 0, cached = 0;
-	unsigned long highmem = 0;
-	struct page *page;
-	pg_data_t *pgdat;
-	unsigned long i;
-
-	printk("Mem-info:\n");
-	show_free_areas();
-	for_each_online_pgdat(pgdat) {
-		unsigned long flags;
-		pgdat_resize_lock(pgdat, &flags);
-		for (i = 0; i < pgdat->node_spanned_pages; i++) {
-			if (!pfn_valid(pgdat->node_start_pfn + i))
-				continue;
-			page = pgdat_page_nr(pgdat, i);
-			total++;
-			if (PageHighMem(page))
-				highmem++;
-			if (PageReserved(page))
-				reserved++;
-			else if (PageSwapCache(page))
-				cached++;
-			else if (page_count(page))
-				shared += page_count(page) - 1;
-		}
-		pgdat_resize_unlock(pgdat, &flags);
-	}
-	printk("%ld pages of RAM\n", total);
-#ifdef CONFIG_HIGHMEM
-	printk("%ld pages of HIGHMEM\n", highmem);
-#endif
-	printk("%ld reserved pages\n", reserved);
-	printk("%ld pages shared\n", shared);
-	printk("%ld pages swap cached\n", cached);
-}
-
 /*
  * Initialize the bootmem system and give it all the memory we
  * have available.  If we are using highmem, we only put the