diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:21:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:21:06 -0800 |
| commit | ca6435f188a0ce40eae716c158053e49130886a3 (patch) | |
| tree | 99d58ba96adc568bd227c48669940ab726ca18bf /include/linux | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | sched: cpu accounting controller (V2) (diff) | |
| download | linux-dev-ca6435f188a0ce40eae716c158053e49130886a3.tar.xz linux-dev-ca6435f188a0ce40eae716c158053e49130886a3.zip | |
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) #endif /* */ + +#ifdef CONFIG_CGROUP_CPUACCT +SUBSYS(cpuacct) +#endif + +/* */ + |