Merge "sched: fix race between try_to_wake_up() and move_task()" (fd29eefe) · Commits · e / devices / android_kernel_sony_msm8994

kernel/sched/core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1642,8 +1642,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
		*/
		smp_mb__before_spinlock();
		raw_spin_lock_irqsave(&p->pi_lock, flags);
		src_cpu = task_cpu(p);
		cpu = src_cpu;
		src_cpu = cpu = task_cpu(p);

		if (!(p->state & state))
		goto out;
		@@ -1672,6 +1671,9 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
		p->sched_class->task_waking(p);

		cpu = select_task_rq(p, SD_BALANCE_WAKE, wake_flags);

		/* Refresh src_cpu as it could have changed since we last read it */
		src_cpu = task_cpu(p);
		if (src_cpu != cpu) {
		wake_flags \|= WF_MIGRATED;
		set_task_cpu(p, cpu);