diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:21:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:21:06 -0500 |
| commit | ca6435f188a0ce40eae716c158053e49130886a3 (patch) | |
| tree | 99d58ba96adc568bd227c48669940ab726ca18bf /init | |
| parent | 26145f7e7ebc8a5f1b29425d6da62e872031be4a (diff) | |
| parent | d842de871c8c5e2110c7e4f3f29bbe7b1a519ab8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: cpu accounting controller (V2)
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index d35e44f4dd6b..404bbf3699be 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -354,6 +354,13 @@ config FAIR_CGROUP_SCHED | |||
| 354 | 354 | ||
| 355 | endchoice | 355 | endchoice |
| 356 | 356 | ||
| 357 | config CGROUP_CPUACCT | ||
| 358 | bool "Simple CPU accounting cgroup subsystem" | ||
| 359 | depends on CGROUPS | ||
| 360 | help | ||
| 361 | Provides a simple Resource Controller for monitoring the | ||
| 362 | total CPU consumed by the tasks in a cgroup | ||
| 363 | |||
| 357 | config SYSFS_DEPRECATED | 364 | config SYSFS_DEPRECATED |
| 358 | bool "Create deprecated sysfs files" | 365 | bool "Create deprecated sysfs files" |
| 359 | default y | 366 | default y |