diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2010-12-31 08:58:58 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 03:42:03 -0500 |
commit | 6706125e291bd3dddd269e043323a6ab93ccd5fb (patch) | |
tree | 89dfe09c093cdac25b8c51f828fd32f801f17a34 /kernel/sched.c | |
parent | 19e5eebb8eaa5ca3ff8aa18cb57ccb7a9f67277d (diff) |
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>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 3925a1bbf5dd..9f9dd8dda53c 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -7777,7 +7777,6 @@ void __init sched_init(void) | |||
7777 | #ifdef CONFIG_FAIR_GROUP_SCHED | 7777 | #ifdef CONFIG_FAIR_GROUP_SCHED |
7778 | init_task_group.shares = init_task_group_load; | 7778 | init_task_group.shares = init_task_group_load; |
7779 | INIT_LIST_HEAD(&rq->leaf_cfs_rq_list); | 7779 | INIT_LIST_HEAD(&rq->leaf_cfs_rq_list); |
7780 | #ifdef CONFIG_CGROUP_SCHED | ||
7781 | /* | 7780 | /* |
7782 | * How much cpu bandwidth does init_task_group get? | 7781 | * How much cpu bandwidth does init_task_group get? |
7783 | * | 7782 | * |
@@ -7798,16 +7797,13 @@ void __init sched_init(void) | |||
7798 | * directly in rq->cfs (i.e init_task_group->se[] = NULL). | 7797 | * directly in rq->cfs (i.e init_task_group->se[] = NULL). |
7799 | */ | 7798 | */ |
7800 | init_tg_cfs_entry(&init_task_group, &rq->cfs, NULL, i, NULL); | 7799 | init_tg_cfs_entry(&init_task_group, &rq->cfs, NULL, i, NULL); |
7801 | #endif | ||
7802 | #endif /* CONFIG_FAIR_GROUP_SCHED */ | 7800 | #endif /* CONFIG_FAIR_GROUP_SCHED */ |
7803 | 7801 | ||
7804 | rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime; | 7802 | rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime; |
7805 | #ifdef CONFIG_RT_GROUP_SCHED | 7803 | #ifdef CONFIG_RT_GROUP_SCHED |
7806 | INIT_LIST_HEAD(&rq->leaf_rt_rq_list); | 7804 | INIT_LIST_HEAD(&rq->leaf_rt_rq_list); |
7807 | #ifdef CONFIG_CGROUP_SCHED | ||
7808 | init_tg_rt_entry(&init_task_group, &rq->rt, NULL, i, NULL); | 7805 | init_tg_rt_entry(&init_task_group, &rq->rt, NULL, i, NULL); |
7809 | #endif | 7806 | #endif |
7810 | #endif | ||
7811 | 7807 | ||
7812 | for (j = 0; j < CPU_LOAD_IDX_MAX; j++) | 7808 | for (j = 0; j < CPU_LOAD_IDX_MAX; j++) |
7813 | rq->cpu_load[j] = 0; | 7809 | rq->cpu_load[j] = 0; |