The patch titled
cris: remove redundant display of free swap space in show_mem()
has been removed from the -mm tree. Its filename was
cris-remove-redundant-display-of-free-swap-space-in-show_mem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cris: remove redundant display of free swap space in show_mem()
From: Johannes Weiner <hannes@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Cc: Mikael Starvik <mikael.starvik@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/cris/mm/init.c | 1 -
1 file changed, 1 deletion(-)
diff -puN arch/cris/mm/init.c~cris-remove-redundant-display-of-free-swap-space-in-show_mem arch/cris/mm/init.c
--- a/arch/cris/mm/init.c~cris-remove-redundant-display-of-free-swap-space-in-show_mem
+++ a/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++;
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxxx are
origin.patch
git-mips.patch
parisc-remove-redundant-display-of-free-swap-space-in-show_mem.patch
git-xtensa.patch
add-warn_on_secs-macro-simplification.patch
add-warn_on_secs-macro-simplification-fix.patch
add-warn_on_secs-macro-simplification-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
