diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-11-14 19:59:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:40 -0500 |
commit | cfb5285660aad4931b2ebbfa902ea48a37dfffa1 (patch) | |
tree | 6c345c4f00a139d7ccbc4efc5f2b9829aec21d24 /init | |
parent | 45c682a68a87251d9a01383ce076ab21ee09812e (diff) |
revert "Task Control Groups: example CPU accounting subsystem"
Revert 62d0df64065e7c135d0002f069444fbdfc64768f.
This was originally intended as a simple initial example of how to create a
control groups subsystem; it wasn't intended for mainline, but I didn't make
this clear enough to Andrew.
The CFS cgroup subsystem now has better functionality for the per-cgroup usage
accounting (based directly on CFS stats) than the "usage" status file in this
patch, and the "load" status file is rather simplistic - although having a
per-cgroup load average report would be a useful feature, I don't believe this
patch actually provides it. If it gets into the final 2.6.24 we'd probably
have to support this interface for ever.
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8b88d0bedcbd..5b92e3aa1366 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -301,13 +301,6 @@ config CGROUP_NS | |||
301 | for instance virtual servers and checkpoint/restart | 301 | for instance virtual servers and checkpoint/restart |
302 | jobs. | 302 | jobs. |
303 | 303 | ||
304 | config CGROUP_CPUACCT | ||
305 | bool "Simple CPU accounting cgroup subsystem" | ||
306 | depends on CGROUPS | ||
307 | help | ||
308 | Provides a simple Resource Controller for monitoring the | ||
309 | total CPU consumed by the tasks in a cgroup | ||
310 | |||
311 | config CPUSETS | 304 | config CPUSETS |
312 | bool "Cpuset support" | 305 | bool "Cpuset support" |
313 | depends on SMP && CGROUPS | 306 | depends on SMP && CGROUPS |