]> err.no Git - linux-2.6/commitdiff
parisc: remove redundant display of free swap space in show_mem()
authorJohannes Weiner <hannes@saeurebad.de>
Wed, 14 May 2008 23:21:56 +0000 (16:21 -0700)
committerKyle McMartin <kyle@mcmartin.ca>
Thu, 15 May 2008 14:38:54 +0000 (10:38 -0400)
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>
arch/parisc/mm/init.c

index 1f012843150fbd83b801c11b8a6a58ddcaa099b5..4ce60556d45d7f59ef67d744e54c6f6391f911bc 100644 (file)
@@ -555,8 +555,6 @@ void show_mem(void)
 
        printk(KERN_INFO "Mem-info:\n");
        show_free_areas();
-       printk(KERN_INFO "Free swap:     %6ldkB\n",
-                               nr_swap_pages<<(PAGE_SHIFT-10));
 #ifndef CONFIG_DISCONTIGMEM
        i = max_mapnr;
        while (i-- > 0) {