summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/alpha/mm/init.c2
-rw-r--r--arch/alpha/mm/numa.c2
-rw-r--r--arch/arm/mm/init.c2
-rw-r--r--arch/cris/mm/init.c2
-rw-r--r--arch/i386/mm/init.c2
-rw-r--r--arch/ia64/hp/sim/simserial.c1
-rw-r--r--arch/ia64/mm/init.c4
-rw-r--r--arch/m68k/mm/init.c2
-rw-r--r--arch/mips/mm/init.c2
-rw-r--r--arch/mips64/mm/init.c2
-rw-r--r--arch/parisc/mm/init.c2
-rw-r--r--arch/ppc/mm/init.c2
-rw-r--r--arch/ppc64/mm/init.c2
-rw-r--r--arch/s390/mm/init.c2
-rw-r--r--arch/s390x/mm/init.c2
-rw-r--r--arch/sh/mm/init.c2
-rw-r--r--arch/sparc/mm/init.c2
-rw-r--r--arch/sparc64/mm/init.c2
-rw-r--r--arch/x86_64/mm/init.c2
-rw-r--r--drivers/sgi/char/sgiserial.c3
-rw-r--r--fs/buffer.c8
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/swap.h1
-rw-r--r--mm/page_alloc.c5
24 files changed, 27 insertions, 31 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index ff18f2788be0..9ad3946a355c 100644
--- 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 f3ecdde89c65..0f75fd2bc666 100644
--- 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 e6d347911bb1..1fb1c8fa7ccc 100644
--- 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 b7544841b03e..0fc2c2135c4a 100644
--- 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 68011bc71509..be76e092e824 100644
--- 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 d7573b683278..ef0ead0cc222 100644
--- 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 ddc604251f82..d479a43d188b 100644
--- 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 23599f7d5da5..7d7024822bac 100644
--- 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 7019a72c2067..b1a77827f571 100644
--- 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 0fca779ac1f8..9906571b3bd5 100644
--- 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 c3e16c463832..6ff2a0852ca4 100644
--- 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 76410ed65ea5..fc773216c693 100644
--- 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 dc94fb38c605..a8005d182372 100644
--- 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 a7d35f547724..acf8f3a33235 100644
--- 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 a9a4a75e7b8a..e53e7d7b69a3 100644
--- 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 ec8c8e1e80a2..61002329c5cb 100644
--- 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 c0baac138941..654b2d42a315 100644
--- 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 65ebe704e8fe..2fadfa3b040a 100644
--- 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 beb02e3ce0d3..dd1dcece8a55 100644
--- 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 a478ddb74006..bbd4827ae802 100644
--- 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 fc575fd54f01..5c19537b12e5 100644
--- 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 4027b4573cd7..9f3221ca434e 100644
--- 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 86eb09dfca0d..91e1970277c5 100644
--- 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 18de577ec74e..14998851f31e 100644
--- 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
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-25 23:43:33 +0000