diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 23 |
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 | |||
288 | 288 | ||
289 | Say N if unsure | 289 | Say N if unsure |
290 | 290 | ||
291 | config CGROUP_NS | ||
292 | bool "Namespace cgroup subsystem" | ||
293 | depends on CGROUPS | ||
294 | help | ||
295 | Provides a simple namespace cgroup subsystem to | ||
296 | provide hierarchical naming of sets of namespaces, | ||
297 | for instance virtual servers and checkpoint/restart | ||
298 | jobs. | ||
299 | |||
300 | config CGROUP_CPUACCT | ||
301 | bool "Simple CPU accounting cgroup subsystem" | ||
302 | depends on CGROUPS | ||
303 | help | ||
304 | Provides a simple Resource Controller for monitoring the | ||
305 | total CPU consumed by the tasks in a cgroup | ||
306 | |||
291 | config CPUSETS | 307 | config CPUSETS |
292 | bool "Cpuset support" | 308 | bool "Cpuset support" |
293 | depends on SMP && CGROUPS | 309 | depends on SMP && CGROUPS |
@@ -345,13 +361,6 @@ config PROC_PID_CPUSET | |||
345 | depends on CPUSETS | 361 | depends on CPUSETS |
346 | default y | 362 | default y |
347 | 363 | ||
348 | config CGROUP_CPUACCT | ||
349 | bool "Simple CPU accounting cgroup subsystem" | ||
350 | depends on CGROUPS | ||
351 | help | ||
352 | Provides a simple Resource Controller for monitoring the | ||
353 | total CPU consumed by the tasks in a cgroup | ||
354 | |||
355 | config RELAY | 364 | config RELAY |
356 | bool "Kernel->user space relay support (formerly relayfs)" | 365 | bool "Kernel->user space relay support (formerly relayfs)" |
357 | help | 366 | help |