aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2010-12-31 21:58:58 +0800
committerIngo Molnar <mingo@elte.hu>2011-01-04 09:42:03 +0100
commit6706125e291bd3dddd269e043323a6ab93ccd5fb (patch)
tree89dfe09c093cdac25b8c51f828fd32f801f17a34
parent19e5eebb8eaa5ca3ff8aa18cb57ccb7a9f67277d (diff)
downloadkernel_samsung_smdk4412-6706125e291bd3dddd269e043323a6ab93ccd5fb.zip
kernel_samsung_smdk4412-6706125e291bd3dddd269e043323a6ab93ccd5fb.tar.gz
kernel_samsung_smdk4412-6706125e291bd3dddd269e043323a6ab93ccd5fb.tar.bz2
sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
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>
-rw-r--r--kernel/sched.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 3925a1b..9f9dd8d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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,16 +7797,13 @@ 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++)
rq->cpu_load[j] = 0;