From a78d32838cd63651f26e5e33707a144da5fe1f18 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 21 Jul 2009 13:56:38 +0200
Subject: [PATCH] --- yaml --- r: 158339 b: refs/heads/master c:
 693525e3bea25cf2ee6cf2b862ba7c148e891df2 h: refs/heads/master i:   158337:
 b203fd06594991bd2460733a390c8c1959e0bb77   158335:
 5d36b2e7e304e4eecc4e98f628298ccc0ce769ed v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6898dedc2ad..4319c8aed49b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f48894fcc89ddec62e1762f73a0825793e59e91
+refs/heads/master: 693525e3bea25cf2ee6cf2b862ba7c148e891df2
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 475138c42548..7f83be35d65c 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -7078,8 +7078,12 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
 
 	if (migrate_task(p, cpumask_any_and(cpu_online_mask, new_mask), &req)) {
 		/* Need help from migration thread: drop lock and wait. */
+		struct task_struct *mt = rq->migration_thread;
+
+		get_task_struct(mt);
 		task_rq_unlock(rq, &flags);
 		wake_up_process(rq->migration_thread);
+		put_task_struct(mt);
 		wait_for_completion(&req.done);
 		tlb_migrate_finish(p->mm);
 		return 0;