aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-04-04 22:37:28 -0400
committerTejun Heo <tj@kernel.org>2010-04-04 22:37:28 -0400
commit336f5899d287f06d8329e208fc14ce50f7ec9698 (patch)
tree9b762d450d5eb248a6ff8317badb7e223d93ed58 /kernel/sched.c
parenta4ab2773205e8b94c18625455f85e3b6bb9d7ad6 (diff)
parentdb217dece3003df0841bacf9556b5c06aa097dae (diff)
Merge branch 'master' into export-slabh
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 86c7cc1d7c9d..a3dff1f3f9b0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5388,7 +5388,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
5388 5388
5389 get_task_struct(mt); 5389 get_task_struct(mt);
5390 task_rq_unlock(rq, &flags); 5390 task_rq_unlock(rq, &flags);
5391 wake_up_process(rq->migration_thread); 5391 wake_up_process(mt);
5392 put_task_struct(mt); 5392 put_task_struct(mt);
5393 wait_for_completion(&req.done); 5393 wait_for_completion(&req.done);
5394 tlb_migrate_finish(p->mm); 5394 tlb_migrate_finish(p->mm);