diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-13 08:22:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-13 08:22:41 -0800 |
| commit | 3174ffaa939d8f771019f83761c668b1d5c1973b (patch) | |
| tree | bcc73b265f225c33983d8935250f61b8ccadd51e /include/linux/cgroup_subsys.h | |
| parent | d7ab95f8c54aed896ad739f261f79ed945472aca (diff) | |
| parent | b68aa2300cabeb96801369a4bb37a4f19f59ed84 (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: rt-group: refure unrunnable tasks
sched: rt-group: clean up the ifdeffery
sched: rt-group: make rt groups scheduling configurable
sched: rt-group: interface
sched: rt-group: deal with PI
sched: fix incorrect irq lock usage in normalize_rt_tasks()
sched: fair-group: separate tg->shares from task_group_lock
hrtimer: more hrtimer_init_sleeper() fallout.
Diffstat (limited to 'include/linux/cgroup_subsys.h')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index 228235c5ae5..ac6aad98b60 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h @@ -25,7 +25,7 @@ SUBSYS(ns) /* */ -#ifdef CONFIG_FAIR_CGROUP_SCHED +#ifdef CONFIG_CGROUP_SCHED SUBSYS(cpu_cgroup) #endif |