aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-11-04 03:17:05 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-04 04:23:18 -0500
commit0a0db8f5c9d4bbb9bbfcc2b6cb6bce2d0ef4d73d (patch)
tree22a50ee7f1c5a4c6ae4a13c30b02c9faa52e0aa4 /kernel
parenteefd796a8e831408ce17e633d73d70430748c47a (diff)
sched debug: remove NULL checking in print_cfs/rt_rq()
Impact: cleanup cfs->tg is initialized in init_tg_cfs_entry() with tg != NULL, and will never be invalidated to NULL. And the underlying cgroup of a valid task_group is always valid. Same for rt->tg. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_debug.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 5ae17762ec3..d25cefe3f0e 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -121,14 +121,9 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
121 121
122#if defined(CONFIG_CGROUP_SCHED) && defined(CONFIG_FAIR_GROUP_SCHED) 122#if defined(CONFIG_CGROUP_SCHED) && defined(CONFIG_FAIR_GROUP_SCHED)
123 char path[128] = ""; 123 char path[128] = "";
124 struct cgroup *cgroup = NULL;
125 struct task_group *tg = cfs_rq->tg; 124 struct task_group *tg = cfs_rq->tg;
126 125
127 if (tg) 126 cgroup_path(tg->css.cgroup, path, sizeof(path));
128 cgroup = tg->css.cgroup;
129
130 if (cgroup)
131 cgroup_path(cgroup, path, sizeof(path));
132 127
133 SEQ_printf(m, "\ncfs_rq[%d]:%s\n", cpu, path); 128 SEQ_printf(m, "\ncfs_rq[%d]:%s\n", cpu, path);
134#else 129#else
@@ -193,14 +188,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
193{ 188{
194#if defined(CONFIG_CGROUP_SCHED) && defined(CONFIG_RT_GROUP_SCHED) 189#if defined(CONFIG_CGROUP_SCHED) && defined(CONFIG_RT_GROUP_SCHED)
195 char path[128] = ""; 190 char path[128] = "";
196 struct cgroup *cgroup = NULL;
197 struct task_group *tg = rt_rq->tg; 191 struct task_group *tg = rt_rq->tg;
198 192
199 if (tg) 193 cgroup_path(tg->css.cgroup, path, sizeof(path));
200 cgroup = tg->css.cgroup;
201
202 if (cgroup)
203 cgroup_path(cgroup, path, sizeof(path));
204 194
205 SEQ_printf(m, "\nrt_rq[%d]:%s\n", cpu, path); 195 SEQ_printf(m, "\nrt_rq[%d]:%s\n", cpu, path);
206#else 196#else