[PATCH] arm: Remove redundant display of free swap space in show_mem()

[PATCH] arm: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/arm/mm/init.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index ec00f26..b657f17 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -48,8 +48,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-
 	for_each_online_node(node) {
 		pg_data_t *n = NODE_DATA(node);
 		struct page *map = n->node_mem_map - n->node_start_pfn;
-- 
1.5.2.2

[PATCH] cris: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/cris/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index 4207a2b..5b06ffa 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++;
-- 
1.5.2.2

[PATCH] m32r: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/m32r/mm/init.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index bbd97c8..a08ac3e 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -47,7 +47,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
 	for_each_online_pgdat(pgdat) {
 		unsigned long flags;
 		pgdat_resize_lock(pgdat, &flags);
@@ -252,4 +251,3 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 	printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
 }
 #endif
-
-- 
1.5.2.2

[PATCH] m68k: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/m68k/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index f42caa7..a2bb01f 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;
-- 
1.5.2.2

[PATCH] mips: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/mips/mm/pgtable.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c
index 57df1c3..7dfa579 100644
--- a/arch/mips/mm/pgtable.c
+++ b/arch/mips/mm/pgtable.c
@@ -12,7 +12,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	pfn = max_mapnr;
 	while (pfn-- > 0) {
 		if (!pfn_valid(pfn))
-- 
1.5.2.2

[PATCH] powerpc: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/powerpc/mm/mem.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index be5c506..b891b1f 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -175,7 +175,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	for_each_online_pgdat(pgdat) {
 		unsigned long flags;
 		pgdat_resize_lock(pgdat, &flags);
-- 
1.5.2.2

[PATCH] ppc: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/ppc/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 7444df3..1a63711 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -109,7 +109,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	i = max_mapnr;
 	while (i-- > 0) {
 		total++;
-- 
1.5.2.2

[PATCH] s390: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/s390/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 8053245..202c952 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -50,7 +50,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages << (PAGE_SHIFT - 10));
 	i = max_mapnr;
 	while (i-- > 0) {
 		if (!pfn_valid(i))
-- 
1.5.2.2

[PATCH] sh: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/sh/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 53dde06..409e4f0 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -55,7 +55,6 @@ void show_mem(void)
 		pgdat_resize_unlock(pgdat, &flags);
 	}
 
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	printk("%d pages of RAM\n", total);
 	printk("%d free pages\n", free);
 	printk("%d reserved pages\n", reserved);
-- 
1.5.2.2

[PATCH] x86: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/x86/mm/init_64.c    |    3 ---
 arch/x86/mm/pgtable_32.c |    1 -
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a02a14f..37b688d 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -69,9 +69,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));
-
 	for_each_online_pgdat(pgdat) {
 		for (i = 0; i < pgdat->node_spanned_pages; ++i) {
 			/*
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 73aba71..21b7543 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -36,7 +36,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));
 	for_each_online_pgdat(pgdat) {
 		pgdat_resize_lock(pgdat, &flags);
 		for (i = 0; i < pgdat->node_spanned_pages; ++i) {
-- 
1.5.2.2

[PATCH] xtensa: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/xtensa/mm/init.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 81d0560..323b548 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -287,7 +287,6 @@ void show_mem(void)
 
 	printk("Mem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	i = max_mapnr;
 	while (i-- > 0) {
 		total++;
-- 
1.5.2.2

[PATCH] parisc: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/parisc/mm/init.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index eb80f5e..2c721e1 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -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) {
-- 
1.5.2.2

[PATCH] um: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/um/kernel/mem.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 2eea1ff..6a961b9 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -304,8 +304,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));
 	pfn = max_mapnr;
 	while (pfn-- > 0) {
 		page = pfn_to_page(pfn);
-- 
1.5.2.2

[PATCH] ia64: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---
 arch/ia64/mm/contig.c    |    2 --
 arch/ia64/mm/discontig.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 344f64e..0479661 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -45,8 +45,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));
 	printk(KERN_INFO "Node memory in pages:\n");
 	for_each_online_pgdat(pgdat) {
 		unsigned long present;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index ee5e68b..ffee1ea 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -522,8 +522,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));
 	printk(KERN_INFO "Node memory in pages:\n");
 	for_each_online_pgdat(pgdat) {
 		unsigned long present;
-- 
1.5.2.2

Re: [PATCH] ia64: Remove redundant display of free swap space in show_mem()

[KOSAKI Motohiro]

nice.
Thanks.

Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>


> Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
> ---
>  arch/ia64/mm/contig.c    |    2 --
>  arch/ia64/mm/discontig.c |    2 --
>  2 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
> index 344f64e..0479661 100644
> --- a/arch/ia64/mm/contig.c
> +++ b/arch/ia64/mm/contig.c
> @@ -45,8 +45,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));
>  	printk(KERN_INFO "Node memory in pages:\n");
>  	for_each_online_pgdat(pgdat) {
>  		unsigned long present;
> diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
> index ee5e68b..ffee1ea 100644
> --- a/arch/ia64/mm/discontig.c
> +++ b/arch/ia64/mm/discontig.c
> @@ -522,8 +522,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));
>  	printk(KERN_INFO "Node memory in pages:\n");
>  	for_each_online_pgdat(pgdat) {
>  		unsigned long present;
> -- 
> 1.5.2.2
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] arm: Remove redundant display of free swap space in show_mem()

[Johannes Weiner]

Hi,

apologies to the arm people who got the full thing now.  I obviously
failed the git-send-email test.

-- original introduction

show_mem() has no need to print the amount of free swap space manually
in show_mem(), show_free_areas() does this already.

I have only x86 boxen to test on but the patches are trivial.

 arch/alpha/mm/init.c     |    1 -
 arch/alpha/mm/numa.c     |    1 -
 arch/arm/mm/init.c       |    2 --
 arch/cris/mm/init.c      |    1 -
 arch/ia64/mm/contig.c    |    2 --
 arch/ia64/mm/discontig.c |    2 --
 arch/m32r/mm/init.c      |    2 --
 arch/m68k/mm/init.c      |    1 -
 arch/mips/mm/pgtable.c   |    1 -
 arch/parisc/mm/init.c    |    2 --
 arch/powerpc/mm/mem.c    |    1 -
 arch/ppc/mm/init.c       |    1 -
 arch/s390/mm/init.c      |    1 -
 arch/sh/mm/init.c        |    1 -
 arch/sparc/mm/init.c     |    2 --
 arch/sparc64/mm/init.c   |    2 --
 arch/um/kernel/mem.c     |    2 --
 arch/x86/mm/init_64.c    |    3 ---
 arch/x86/mm/pgtable_32.c |    1 -
 arch/xtensa/mm/init.c    |    1 -
 20 files changed, 0 insertions(+), 30 deletions(-)

	Hannes