summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@saeurebad.de>2008-04-28 11:13:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 17:58:27 +0200
commit6feef6e5f23d5a3d8a614ab8ea392dfa54c7365c (patch)
treeed21e12ae07620a2976fd09b26a53920f2ffb67a
parentalpha: teach the compiler that BUG doesn't return (diff)
downloadlinux-6feef6e5f23d5a3d8a614ab8ea392dfa54c7365c.tar.xz
linux-6feef6e5f23d5a3d8a614ab8ea392dfa54c7365c.zip
m68k: 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: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m68k/mm/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index f42caa79e4e8..a2bb01f59642 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -79,7 +79,6 @@ void show_mem(void)
printk("\nMem-info:\n");
show_free_areas();
- printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_online_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; i++) {
struct page *page = pgdat->node_mem_map + i;