[PATCH] buffermem_pages removal (1/5)

With all work done by akpm in 2.5 Linus no more has a buffer cache
in the traditional sense.  Still we try to keep estimates about
what would be the buffer cache size by keeping the number of pages
indexed by block device inodes.  This is broken not only because the
old buffercache was also used for file data which is nowdays not
hashed to block device inodes and thus makes every user of this data
assume wrong numbers.  Second is is possible to use block device
pages not through the buffer_head interface (i.e. userspace
block device nodes, possibly JFS also soon).  In addition the atomic_t
used for this bookkepping (buffermem_pages) causes cacheline bouncing
on larger machines.

This is the first patch of a series to get rid of it.  It removes the
useless output of supposedly buffer pages in show_mem(), which is used
by the magic sysrq key code.

18 files changed, 0 insertions, 18 deletions

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 48056eca067b..b6c7cd47d684 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -137,7 +137,6 @@ show_mem(void)
 	printk("%ld reserved pages\n",reserved);
 	printk("%ld pages shared\n",shared);
 	printk("%ld pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 #endif
 
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index fbc56352ed46..8a86daca887f 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -425,5 +425,4 @@ show_mem(void)
 	printk("%ld pages shared\n",shared);
 	printk("%ld pages swap cached\n",cached);
 	printk("%ld pages in page table cache\n",pgtable_cache_size);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 2a36b155a813..07033a36b175 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -100,7 +100,6 @@ void show_mem(void)
 	printk("%d slab pages\n", slab);
 	printk("%d pages shared\n", shared);
 	printk("%d pages swap cached\n", cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 struct node_info {
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index dd049a293a7e..35a7db188863 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -181,7 +181,6 @@ show_mem(void)
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
 	printk("%ld pages in page table cache\n",pgtable_cache_size);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /*
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index cb8a9367e47a..4ce59a3223cc 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -93,7 +93,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index de8b287d756f..8ab6500f9ce0 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -187,7 +187,6 @@ show_mem(void)
 			pgdat = pgdat->node_next;
 		} while (pgdat);
 		printk("Total of %ld pages in page table cache\n", pgtable_cache_size);
-		printk("%ld buffermem pages\n", nr_buffermem_pages());
 		printk("%d free buffer pages\n", nr_free_buffer_pages());
 	}
 #else /* !CONFIG_DISCONTIGMEM */
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index f6747f5a65da..52561c3176a1 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -107,7 +107,6 @@ void show_mem(void)
     printk("%d pages shared\n",shared);
     printk("%d pages swap cached\n",cached);
     printk("%ld pages in page table cache\n",pgtable_cache_size);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 extern void init_pointer_table(unsigned long ptable);
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 3eb08906fad6..1b7cd192cc68 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -135,7 +135,6 @@ void show_mem(void)
 	printk("%d pages swap cached\n",cached);
 	printk("%ld pages in page table cache\n",pgtable_cache_size);
 	printk("%d free pages\n", free);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */
diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c
index 58c75949f178..3dda4d7b9287 100644
--- a/arch/mips64/mm/init.c
+++ b/arch/mips64/mm/init.c
@@ -339,7 +339,6 @@ void show_mem(void)
 	printk("%d pages swap cached\n",cached);
 	printk("%ld pages in page table cache\n", pgtable_cache_size);
 	printk("%d free pages\n", free);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 #ifndef CONFIG_DISCONTIGMEM
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index d93c70cdb9b8..d883b6403b0b 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -154,7 +154,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 void set_pte_phys (unsigned long vaddr, unsigned long phys)
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 03b9463333b3..3ab677a690e4 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -140,7 +140,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* Free up now-unused memory */
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index 44e609973868..0e2d45d170c7 100644
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -134,7 +134,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 void *
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 3e4a7503db5e..06954edd152a 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -87,7 +87,6 @@ void show_mem(void)
         printk("%d pages shared\n",shared);
         printk("%d pages swap cached\n",cached);
         printk("%ld pages in page table cache\n",pgtable_cache_size);
-        printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */
diff --git a/arch/s390x/mm/init.c b/arch/s390x/mm/init.c
index dd4deb0a2661..a70de36ae855 100644
--- a/arch/s390x/mm/init.c
+++ b/arch/s390x/mm/init.c
@@ -87,7 +87,6 @@ void show_mem(void)
         printk("%d pages shared\n",shared);
         printk("%d pages swap cached\n",cached);
         printk("%ld pages in page table cache\n",pgtable_cache_size);
-        printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 3fa77a3d543b..c02c1ebefe4f 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -70,7 +70,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index 4c0fb5ecba54..21cc557e4bd4 100644
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -82,7 +82,6 @@ void show_mem(void)
 	if (sparc_cpu_model == sun4m || sparc_cpu_model == sun4d)
 		printk("%ld entries in page dir cache\n",pgd_cache_size);
 #endif	
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 extern pgprot_t protection_map[16];
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 6bc899a9b78d..346ca500a315 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -341,7 +341,6 @@ void show_mem(void)
 #ifndef CONFIG_SMP
 	printk("%d entries in page dir cache\n",pgd_cache_size);
 #endif	
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 void mmu_info(struct seq_file *m)
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 069697f3dc15..862520c6c153 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -67,7 +67,6 @@ void show_mem(void)
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */