sysfs: make SYSFS_DEPRECATED depend on SYSFS

[cascardo/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index d35e44f..f5becd2 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -354,8 +354,16 @@ config FAIR_CGROUP_SCHED
 
 endchoice
 
+config CGROUP_CPUACCT
+       bool "Simple CPU accounting cgroup subsystem"
+       depends on CGROUPS
+       help
+         Provides a simple Resource Controller for monitoring the
+         total CPU consumed by the tasks in a cgroup
+
 config SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"
+       depends on SYSFS
        default y
        help
          This option creates deprecated symlinks such as the
@@ -651,6 +659,12 @@ endchoice
 
 endmenu                # General setup
 
+config SLABINFO
+       bool
+       depends on PROC_FS
+       depends on SLAB || SLUB
+       default y
+
 config RT_MUTEXES
        boolean
        select PLIST