[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-70f1120527797adb31c68bdc6f1b45e182c342c7@git.kernel.org>
Date: Sun, 20 Dec 2009 22:33:36 GMT
From: tip-bot for Peter Zijlstra <peterz@...radead.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, peterz@...radead.org, sachinp@...ibm.com,
jens.axboe@...cle.com, benh@...nel.crashing.org,
heiko.carstens@...ibm.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:sched/urgent] sched: Fix hotplug hang
Commit-ID: 70f1120527797adb31c68bdc6f1b45e182c342c7
Gitweb: http://git.kernel.org/tip/70f1120527797adb31c68bdc6f1b45e182c342c7
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Sun, 20 Dec 2009 17:36:27 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 20 Dec 2009 23:31:23 +0100
sched: Fix hotplug hang
The hot-unplug kstopmachine usage does a wakeup after
deactivating the cpu, hence we cannot use cpu_active()
here but must rely on the good olde online.
Reported-by: Sachin Sant <sachinp@...ibm.com>
Reported-by: Jens Axboe <jens.axboe@...cle.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Tested-by: Jens Axboe <jens.axboe@...cle.com>
Cc: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
LKML-Reference: <1261326987.4314.24.camel@...top>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/sched.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 7ffde2a..87f1f47 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2346,7 +2346,7 @@ int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags)
* not worry about this generic constraint ]
*/
if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
- !cpu_active(cpu)))
+ !cpu_online(cpu)))
cpu = select_fallback_rq(task_cpu(p), p);
return cpu;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists