aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@saeurebad.de>2008-05-14 19:21:56 -0400
committerKyle McMartin <kyle@mcmartin.ca>2008-05-15 10:38:54 -0400
commitb64af9b54c17008705367f554131415793a03fba (patch)
treecb8f4330d788cd85bb61edfb4a24151635d58d74
parenta8043ecb17bd2e4b034006bee315efeea3936278 (diff)
parisc: 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: Kyle McMartin <kyle@mcmartin.ca> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
-rw-r--r--arch/parisc/mm/init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 1f012843150f..4ce60556d45d 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -555,8 +555,6 @@ void show_mem(void)
555 555
556 printk(KERN_INFO "Mem-info:\n"); 556 printk(KERN_INFO "Mem-info:\n");
557 show_free_areas(); 557 show_free_areas();
558 printk(KERN_INFO "Free swap: %6ldkB\n",
559 nr_swap_pages<<(PAGE_SHIFT-10));
560#ifndef CONFIG_DISCONTIGMEM 558#ifndef CONFIG_DISCONTIGMEM
561 i = max_mapnr; 559 i = max_mapnr;
562 while (i-- > 0) { 560 while (i-- > 0) {