diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-02 13:04:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-02 13:04:48 -0800 |
| commit | 158a962422e4a54dc256b6a9b9562f3d30d34d9c (patch) | |
| tree | 21a71d7d671d12388f4b085e31b0258d1047f125 /mm | |
| parent | 6b6adc22a01941165d5af9a3e69e28e948b28f47 (diff) | |
| download | lwn-158a962422e4a54dc256b6a9b9562f3d30d34d9c.tar.gz lwn-158a962422e4a54dc256b6a9b9562f3d30d34d9c.zip | |
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')
| -rw-r--r-- | mm/slab.c | 2 | ||||
| -rw-r--r-- | mm/slub.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/mm/slab.c b/mm/slab.c index 2e338a5f7b14..aebb9f68557a 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -4105,7 +4105,7 @@ out: schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_SLABINFO static void print_slabinfo_header(struct seq_file *m) { 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); /* * The /proc/slabinfo ABI */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_SLABINFO + +ssize_t slabinfo_write(struct file *file, const char __user * buffer, + size_t count, loff_t *ppos) +{ + return -EINVAL; +} + static void print_slabinfo_header(struct seq_file *m) { @@ -4201,4 +4208,4 @@ const struct seq_operations slabinfo_op = { .show = s_show, }; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_SLABINFO */ |