* [PATCH -tip] sched: remove redundant CONFIG_CGROUP_SCHED ifdef
@ 2010-12-31 13:58 Yong Zhang
2011-01-04 9:24 ` [tip:sched/core] sched: Remove " tip-bot for Yong Zhang
0 siblings, 1 reply; 2+ messages in thread
From: Yong Zhang @ 2010-12-31 13:58 UTC (permalink / raw)
To: linux-kernel; +Cc: Ingo Molnar, Peter Zijlstra
CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
---
kernel/sched.c | 4 ----
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;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:sched/core] sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
2010-12-31 13:58 [PATCH -tip] sched: remove redundant CONFIG_CGROUP_SCHED ifdef Yong Zhang
@ 2011-01-04 9:24 ` tip-bot for Yong Zhang
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Yong Zhang @ 2011-01-04 9:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, peterz, yong.zhang0, tglx, mingo
Commit-ID: 6706125e291bd3dddd269e043323a6ab93ccd5fb
Gitweb: http://git.kernel.org/tip/6706125e291bd3dddd269e043323a6ab93ccd5fb
Author: Yong Zhang <yong.zhang0@gmail.com>
AuthorDate: Fri, 31 Dec 2010 21:58:58 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 4 Jan 2011 09:42:03 +0100
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>
---
kernel/sched.c | 4 ----
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-04 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-31 13:58 [PATCH -tip] sched: remove redundant CONFIG_CGROUP_SCHED ifdef Yong Zhang
2011-01-04 9:24 ` [tip:sched/core] sched: Remove " tip-bot for Yong Zhang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.