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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index d62fcee9a08a..9ec43186ba80 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -30,3 +30,10 @@ SUBSYS(cpu_cgroup) | |||
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | /* */ | 32 | /* */ |
| 33 | |||
| 34 | #ifdef CONFIG_CGROUP_CPUACCT | ||
| 35 | SUBSYS(cpuacct) | ||
| 36 | #endif | ||
| 37 | |||
| 38 | /* */ | ||
| 39 | |||