1 files changed, 50 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a29a688c47d3..541382d539ad 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -270,9 +270,43 @@ config LOG_BUF_SHIFT
                      13 =>  8 KB
                      12 =>  4 KB
 
+config CGROUPS
+        bool "Control Group support"
+        help
+          This option will let you use process cgroup subsystems
+          such as Cpusets
+
+          Say N if unsure.
+
+config CGROUP_DEBUG
+        bool "Example debug cgroup subsystem"
+        depends on CGROUPS
+        help
+          This option enables a simple cgroup subsystem that
+          exports useful debugging information about the cgroups
+          framework
+
+          Say N if unsure
+
+config CGROUP_NS
+        bool "Namespace cgroup subsystem"
+        depends on CGROUPS
+        help
+          Provides a simple namespace cgroup subsystem to
+          provide hierarchical naming of sets of namespaces,
+          for instance virtual servers and checkpoint/restart
+          jobs.
+
+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 CPUSETS
         bool "Cpuset support"
-        depends on SMP
+        depends on SMP && CGROUPS
         help
           This option will let you create and manage CPUSETs which
           allow dynamically partitioning a system into sets of CPUs and
@@ -300,6 +334,16 @@ config FAIR_USER_SCHED
           This option will choose userid as the basis for grouping
           tasks, thus providing equal CPU bandwidth to each user.
 
+config FAIR_CGROUP_SCHED
+        bool "Control groups"
+        depends on CGROUPS
+        help
+          This option allows you to create arbitrary task groups
+          using the "cgroup" pseudo filesystem and control
+          the cpu bandwidth allocated to each such task group.
+          Refer to Documentation/cgroups.txt for more information
+          on "cgroup" pseudo filesystem.
+
 endchoice
 
 config SYSFS_DEPRECATED
@@ -322,6 +366,11 @@ config SYSFS_DEPRECATED
           If you are using a distro that was released in 2006 or later,
           it should be safe to say N here.
 
+config PROC_PID_CPUSET
+        bool "Include legacy /proc/<pid>/cpuset file"
+        depends on CPUSETS
+        default y
+
 config RELAY
         bool "Kernel->user space relay support (formerly relayfs)"
         help