From 8ae8e60df7ee71483dab81a5f756a54917fea903 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 5 Apr 2011 17:23:59 +0200 Subject: [PATCH] --- yaml --- r: 245590 b: refs/heads/master c: bd8e7dded88a3e1c085c333f19ff31387616f71a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 490f36b7a6c6..d623d30704ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 317f394160e9beb97d19a84c39b7e5eb3d7815a8 +refs/heads/master: bd8e7dded88a3e1c085c333f19ff31387616f71a diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 9e3ede120e81..cd597c7442a3 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2198,21 +2198,6 @@ struct migration_arg { static int migration_cpu_stop(void *data); -/* - * The task's runqueue lock must be held. - * Returns true if you have to wait for migration thread. - */ -static bool need_migrate_task(struct task_struct *p) -{ - /* - * If the task is not on a runqueue (and not running), then - * the next wake-up will properly place the task. - */ - bool running = p->on_rq || p->on_cpu; - smp_rmb(); /* finish_lock_switch() */ - return running; -} - /* * wait_task_inactive - wait for a thread to unschedule. * @@ -5985,7 +5970,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask) goto out; dest_cpu = cpumask_any_and(cpu_active_mask, new_mask); - if (need_migrate_task(p)) { + if (p->on_rq) { struct migration_arg arg = { p, dest_cpu }; /* Need help from migration thread: drop lock and wait. */ task_rq_unlock(rq, p, &flags);