summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-02 13:04:48 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-02 13:04:48 -0800
commit158a962422e4a54dc256b6a9b9562f3d30d34d9c (patch)
tree21a71d7d671d12388f4b085e31b0258d1047f125 /init
parent6b6adc22a01941165d5af9a3e69e28e948b28f47 (diff)
downloadlinux-stable-158a962422e4a54dc256b6a9b9562f3d30d34d9c.tar.gz
linux-stable-158a962422e4a54dc256b6a9b9562f3d30d34d9c.tar.bz2
linux-stable-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 'init')
-rw-r--r--init/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 404bbf3699be..b9d11a899b88 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -658,6 +658,12 @@ endchoice
endmenu # General setup
+config SLABINFO
+ bool
+ depends on PROC_FS
+ depends on SLAB || SLUB
+ default y
+
config RT_MUTEXES
boolean
select PLIST