aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-02 16:04:48 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-02 16:04:48 -0500
commit158a962422e4a54dc256b6a9b9562f3d30d34d9c (patch)
tree21a71d7d671d12388f4b085e31b0258d1047f125 /mm/slub.c
parent6b6adc22a01941165d5af9a3e69e28e948b28f47 (diff)
Unify /proc/slabinfo configuration
Both SLUB and SLAB really did almost exactly the same thing for /proc/slabinfo setup, using duplicate code and per-allocator #ifdef's. This just creates a common CONFIG_SLABINFO that is enabled by both SLUB and SLAB, and shares all the setup code. Maybe SLOB will want this some day too. Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 903dabd92daf..474945ecd89d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4127,7 +4127,14 @@ __initcall(slab_sysfs_init);
4127/* 4127/*
4128 * The /proc/slabinfo ABI 4128 * The /proc/slabinfo ABI
4129 */ 4129 */
4130#ifdef CONFIG_PROC_FS 4130#ifdef CONFIG_SLABINFO
4131
4132ssize_t slabinfo_write(struct file *file, const char __user * buffer,
4133 size_t count, loff_t *ppos)
4134{
4135 return -EINVAL;
4136}
4137
4131 4138
4132static void print_slabinfo_header(struct seq_file *m) 4139static void print_slabinfo_header(struct seq_file *m)
4133{ 4140{
@@ -4201,4 +4208,4 @@ const struct seq_operations slabinfo_op = {
4201 .show = s_show, 4208 .show = s_show,
4202}; 4209};
4203 4210
4204#endif /* CONFIG_PROC_FS */ 4211#endif /* CONFIG_SLABINFO */