[PATCH] remove show_buffers()

Remove show_buffers().  It really has nothing to show any more.  just
buffermem_pages() - move that out into the callers.

There's a lot of duplication in this code.  better approach would be to
remove all the duplicated code out in the architectures and implement
generic show_memory_state().  Later.

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index ff18f2788be0ad554604b3e690f82d4ed8bb6b21..9ad3946a355c678ae0475403da9254883e07f4f3 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -139,7 +139,7 @@ show_mem(void)
        printk("%ld reserved pages\n",reserved);
        printk("%ld pages shared\n",shared);
        printk("%ld pages swap cached\n",cached);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 #endif
 

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index f3ecdde89c657a943beb7367b19c985f0fa863af..0f75fd2bc66605a57ef98d576fbd781aecb701f8 100644 (file)
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -426,5 +426,5 @@ 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);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index e6d347911bb19f7b2415eeaee177db02c4a5d088..1fb1c8fa7ccc06787077b7aa955b13fb4394485e 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -101,7 +101,7 @@ void show_mem(void)
        printk("%d slab pages\n", slab);
        printk("%d pages shared\n", shared);
        printk("%d pages swap cached\n", cached);
-       show_buffers();
+       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 b7544841b03e391330dc1c83f9293ab2ce445763..0fc2c2135c4aa41c1c5524b58c110c8a159392d6 100644 (file)
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -183,7 +183,7 @@ 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);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /*

diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 68011bc7150957628aa3f21f43f6b8469fb926f5..be76e092e8241d9bd370b145aecd40d0b6480897 100644 (file)
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -95,7 +95,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index d7573b683278d77cb0ab2750a2d96f7776c495c5..ef0ead0cc222a5c5abf01bb3fc5e5e361dae6c0e 100644 (file)
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -156,7 +156,6 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
                                continue;
                        } else if ( seen_esc == 2 ) {
                                if ( ch == 'P' ) show_state();          /* F1 key */
-                               if ( ch == 'Q' ) show_buffers();        /* F2 key */
 #ifdef CONFIG_KDB
                                if ( ch == 'S' )
                                        kdb(KDB_REASON_KEYBOARD, 0, (kdb_eframe_t) regs);

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ddc604251f82a078e374f13a20b22d3471a3f5ea..d479a43d188bbbf62d9d4bc47f8734c956cf4912 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -200,7 +200,7 @@ show_mem(void)
                        pgdat = pgdat->node_next;
                } while (pgdat);
                printk("Total of %ld pages in page table cache\n", pgtable_cache_size);
-               show_buffers();
+               printk("%ld buffermem pages\n", nr_buffermem_pages());
                printk("%d free buffer pages\n", nr_free_buffer_pages());
        }
 #else /* !CONFIG_DISCONTIGMEM */
@@ -220,7 +220,7 @@ 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);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 #endif /* !CONFIG_DISCONTIGMEM */
 }
 

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 23599f7d5da5eb964c081aa7793325a8c9875a97..7d7024822bacfa2dd903459715870023424cc279 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -109,7 +109,7 @@ 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);
-    show_buffers();
+       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 7019a72c2067edc26ac1859b9e7b2af156000731..b1a77827f57115c4773c6b15df83c208a9f3f75b 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -137,7 +137,7 @@ 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);
-       show_buffers();
+       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 0fca779ac1f82a19d3b2de216b81d03a2aedff6e..9906571b3bd560d7b8af66adf180d30420263c4b 100644 (file)
--- a/arch/mips64/mm/init.c
+++ b/arch/mips64/mm/init.c
@@ -341,7 +341,7 @@ 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);
-       show_buffers();
+       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 c3e16c4638326d7a429f1272997973171af3c499..6ff2a0852ca4d045f6e2d1bba78f634807fede64 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -155,7 +155,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       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 76410ed65ea5a8b08eba7407cf48137a2872245e..fc773216c693125c98c690c342e68f501e556abf 100644 (file)
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -142,7 +142,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 void si_meminfo(struct sysinfo *val)

diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index dc94fb38c60570ab562250c7ced6493956613d52..a8005d1823724bafac6c4289d4ba132217d420f5 100644 (file)
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -138,7 +138,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 void si_meminfo(struct sysinfo *val)

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index a7d35f5477240b086a36fd78ee0c986e64bfd723..acf8f3a33235c76010ffa0af535807cd65d1a53e 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -89,7 +89,7 @@ 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);
-        show_buffers();
+        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 a9a4a75e7b8a8aa2d89d9405af58fb7823bd6d55..e53e7d7b69a3eb5cc2751d78c233181ada6c911e 100644 (file)
--- a/arch/s390x/mm/init.c
+++ b/arch/s390x/mm/init.c
@@ -89,7 +89,7 @@ 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);
-        show_buffers();
+        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 ec8c8e1e80a2b0a73aa3db8140b05ae718f55a1f..61002329c5cb49a32eb9a5ab64f832a3276850c1 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -73,7 +73,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       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 c0baac1389411d313f29ed44a9b7b4734d29ba60..654b2d42a3150c5dff661020bdaf8a5c11d0b6d1 100644 (file)
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -84,7 +84,7 @@ 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 
-       show_buffers();
+       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 65ebe704e8fe8de899e21e0075ba3297b96e1e96..2fadfa3b040ad5c956a6c41aef235ee80de8f0c5 100644 (file)
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -334,7 +334,7 @@ void show_mem(void)
 #ifndef CONFIG_SMP
        printk("%d entries in page dir cache\n",pgd_cache_size);
 #endif 
-       show_buffers();
+       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 beb02e3ce0d344e190c2732b171af1f51825a53f..dd1dcece8a55009bdfa5abe5a85aa1fa58ae622f 100644 (file)
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -69,7 +69,7 @@ void show_mem(void)
        printk("%d reserved pages\n",reserved);
        printk("%d pages shared\n",shared);
        printk("%d pages swap cached\n",cached);
-       show_buffers();
+       printk("%ld buffermem pages\n", nr_buffermem_pages());
 }
 
 /* References to section boundaries */

diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c
index a478ddb740060223a52664dc650d6e14f7ad0492..bbd4827ae802fbff1f4f06fa9c57aaf4243f3adf 100644 (file)
--- a/drivers/sgi/char/sgiserial.c
+++ b/drivers/sgi/char/sgiserial.c
@@ -423,7 +423,8 @@ static _INLINE_ void receive_chars(struct sgi_serial *info, struct pt_regs *regs
                        show_state();
                        return;
                } else if (ch == 2) {
-                       show_buffers();
+                       printk("%ld buffermem pages\n",
+                                       nr_buffermem_pages());
                        return;
                }
        }

diff --git a/fs/buffer.c b/fs/buffer.c
index fc575fd54f017e81c9ce06353e22f637d092899a..5c19537b12e5ac17d230f0182ed135cdcdae9c64 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2164,14 +2164,6 @@ int try_to_free_buffers(struct page *page)
 }
 EXPORT_SYMBOL(try_to_free_buffers);
 
-/* ================== Debugging =================== */
-
-void show_buffers(void)
-{
-       printk("Buffer memory:   %6dkB\n",
-                       atomic_read(&buffermem_pages) << (PAGE_SHIFT-10));
-}
-
 int block_sync_page(struct page *page)
 {
        run_task_queue(&tq_disk);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4027b4573cd70372e4bb9ed313a55132bbdea2ac..9f3221ca434e85548951325b0723dc0fc76043d9 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1586,8 +1586,6 @@ extern ssize_t generic_read_dir(struct file *, char *, size_t, loff_t *);
 extern struct file_operations simple_dir_operations;
 extern struct inode_operations simple_dir_inode_operations;
 
-extern void show_buffers(void);
-
 #ifdef CONFIG_BLK_DEV_INITRD
 extern unsigned int real_root_dev;
 #endif

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 86eb09dfca0d3cfa72aa646d5ede6872144390ee..91e1970277c50a7250a48e3f3643b6828d87cc81 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -98,6 +98,7 @@ extern int nr_swap_pages;
 extern unsigned int nr_free_pages(void);
 extern unsigned int nr_free_buffer_pages(void);
 extern unsigned int nr_free_pagecache_pages(void);
+extern unsigned long nr_buffermem_pages(void);
 extern int nr_active_pages;
 extern int nr_inactive_pages;
 extern atomic_t nr_async_pages;

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 18de577ec74ed1c8e1c0103f20b314aaf02491a3..14998851f31e4d801f4e1840c682e001bfd94b22 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -562,6 +562,11 @@ unsigned int nr_free_highpages (void)
 }
 #endif
 
+unsigned long nr_buffermem_pages(void)
+{
+       return atomic_read(&buffermem_pages);
+}
+
 /*
  * Accumulate the page_state information across all CPUs.
  * The result is unavoidably approximate - it can change