[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.

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
 

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());
 }

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 {

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());
 }
 
 /*

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 */

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 */

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);

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 */

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

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)

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 */

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 *

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 */

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 */

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 */

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];

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)

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 */