Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7a2b39d authored by Nikanth Karthikesan's avatar Nikanth Karthikesan Committed by Ingo Molnar
Browse files

sched: Remove unused argument dest_cpu to migrate_task() 



Remove unused argument, 'dest_cpu' of migrate_task(), and pass runqueue,
as it is always known at the call site.

Signed-off-by: default avatarNikanth Karthikesan <knikanth@suse.de>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <201011261237.09187.knikanth@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 335d7afb

kernel/sched.c

+3 −5
Original line number Diff line number Diff line
@@ -2061,10 +2061,8 @@ 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 migrate_task(struct task_struct *p, int dest_cpu)

static bool migrate_task(struct task_struct *p, struct rq *rq)

{

	struct rq *rq = task_rq(p);



	/*

	 * If the task is not on a runqueue (and not running), then

	 * the next wake-up will properly place the task.
@@ -3224,7 +3222,7 @@ void sched_exec(void) 
	 * select_task_rq() can race against ->cpus_allowed

	 */

	if (cpumask_test_cpu(dest_cpu, &p->cpus_allowed) &&

	    likely(cpu_active(dest_cpu)) && migrate_task(p, dest_cpu)) {

	    likely(cpu_active(dest_cpu)) && migrate_task(p, rq)) {

		struct migration_arg arg = { p, dest_cpu };



		task_rq_unlock(rq, &flags);
@@ -5504,7 +5502,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 (migrate_task(p, dest_cpu)) {

	if (migrate_task(p, rq)) {

		struct migration_arg arg = { p, dest_cpu };

		/* Need help from migration thread: drop lock and wait. */

		task_rq_unlock(rq, &flags);