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>
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
11
mm/slub.c
11
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 */
|
||||
|
||||
Reference in New Issue
Block a user