From 4e1db5488566dbf62668106c8c84b5b312c58306 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Mon, 29 Oct 2007 21:18:11 +0100 Subject: [PATCH] --- yaml --- r: 72759 b: refs/heads/master c: 7bae49d498de87f0da0c20c67adaa278eac84566 h: refs/heads/master i: 72757: 5bb5b51619693574483342e2f71c99f261e0deaa 72755: 6d11858f7f5b73688805ebb28b0265f6b27793ea 72751: c8ef8fbf111bf0282fd15e5065357787e1f552af v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6d6fe73f31cd..70b5f4fdd6e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a2bcb0edb9ffb0b007b3546b430e2c6e415eee +refs/heads/master: 7bae49d498de87f0da0c20c67adaa278eac84566 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 74dbb4020cf5..235952b100eb 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -7041,7 +7041,7 @@ static void free_sched_group(struct rcu_head *rhp) /* Destroy runqueue etc associated with a task group */ void sched_destroy_group(struct task_group *tg) { - struct cfs_rq *cfs_rq; + struct cfs_rq *cfs_rq = NULL; int i; for_each_possible_cpu(i) { @@ -7049,7 +7049,7 @@ void sched_destroy_group(struct task_group *tg) list_del_rcu(&cfs_rq->leaf_cfs_rq_list); } - cfs_rq = tg->cfs_rq[0]; + BUG_ON(!cfs_rq); /* wait for possible concurrent references to cfs_rqs complete */ call_rcu(&cfs_rq->rcu, free_sched_group);