sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
authorYong Zhang <yong.zhang0@gmail.com>
Fri, 31 Dec 2010 13:58:58 +0000 (21:58 +0800)
committerIngo Molnar <mingo@elte.hu>
Tue, 4 Jan 2011 08:42:03 +0000 (09:42 +0100)
CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c

index 3925a1bbf5ddfac43271aec828bb260a1892111b..9f9dd8dda53caf5ead915330a61e2adba800e068 100644 (file)
@@ -7777,7 +7777,6 @@ void __init sched_init(void)
 #ifdef CONFIG_FAIR_GROUP_SCHED
                init_task_group.shares = init_task_group_load;
                INIT_LIST_HEAD(&rq->leaf_cfs_rq_list);
-#ifdef CONFIG_CGROUP_SCHED
                /*
                 * How much cpu bandwidth does init_task_group get?
                 *
@@ -7798,15 +7797,12 @@ void __init sched_init(void)
                 * directly in rq->cfs (i.e init_task_group->se[] = NULL).
                 */
                init_tg_cfs_entry(&init_task_group, &rq->cfs, NULL, i, NULL);
-#endif
 #endif /* CONFIG_FAIR_GROUP_SCHED */
 
                rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime;
 #ifdef CONFIG_RT_GROUP_SCHED
                INIT_LIST_HEAD(&rq->leaf_rt_rq_list);
-#ifdef CONFIG_CGROUP_SCHED
                init_tg_rt_entry(&init_task_group, &rq->rt, NULL, i, NULL);
-#endif
 #endif
 
                for (j = 0; j < CPU_LOAD_IDX_MAX; j++)