From: Johannes Weiner Date: Mon, 28 Apr 2008 09:13:51 +0000 (-0700) Subject: cris: remove redundant display of free swap space in show_mem() X-Git-Tag: v2.6.26-rc1~910 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5fd284fd976232dbd0d0dc94e07c91e50e2898b2;p=linux-2.6-omap-h63xx.git cris: 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 Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index 4207a2b5275..5b06ffa15e3 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c @@ -27,7 +27,6 @@ show_mem(void) printk("\nMem-info:\n"); show_free_areas(); - printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); i = max_mapnr; while (i-- > 0) { total++;