diff options
| -rw-r--r-- | kernel/sched/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 86f6d3334e5d..2437232010c7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2103,8 +2103,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; @@ -2160,6 +2159,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, p->wake_cpu, 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); |