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

Commit a26449da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix cpu hotplug, cleanup
  sched: fix cpu hotplug
parents 9cc30892 b1e38734

kernel/sched.c

+4 −3
Original line number Diff line number Diff line
@@ -5622,10 +5622,10 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) 
	double_rq_lock(rq_src, rq_dest);

	/* Already moved. */

	if (task_cpu(p) != src_cpu)

		goto out;

		goto done;

	/* Affinity changed (again). */

	if (!cpu_isset(dest_cpu, p->cpus_allowed))

		goto out;

		goto fail;



	on_rq = p->se.on_rq;

	if (on_rq)
@@ -5636,8 +5636,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) 
		activate_task(rq_dest, p, 0);

		check_preempt_curr(rq_dest, p);

	}

done:

	ret = 1;

out:

fail:

	double_rq_unlock(rq_src, rq_dest);

	return ret;

}