summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig23
1 files changed, 16 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 6687f805b38d..0007d1b5e867 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -288,6 +288,22 @@ config CGROUP_DEBUG
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 && CGROUPS
@@ -345,13 +361,6 @@ config PROC_PID_CPUSET
depends on CPUSETS
default y
-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 RELAY
bool "Kernel->user space relay support (formerly relayfs)"
help