From: Johannes Weiner <hannes@saeurebad.de>
Date: Fri, 28 Mar 2008 21:21:10 +0000 (+1100)
Subject: [POWERPC] ppc: Remove redundant display of free swap space in show_mem()
X-Git-Tag: v2.6.26-rc1~1125^2~86
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e5ef43e8c206128560eb6c32a19a7951033a3c3;p=linux-2.6

[POWERPC] ppc: Remove redundant display of free swap space in show_mem()

show_mem() has no need to print the amount of free swap space manually
because show_free_areas() does this already and is called by the
former.

The two outputs only differ in text formatting:

  printk("Free swap  = %lukB\n", ...);
  printk("Free swap:       %6ldkB\n", ...);

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 7444df3889..1a63711081 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -109,7 +109,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	i = max_mapnr;
 	while (i-- > 0) {
 		total++;