diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:27:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:27:36 +0100 |
commit | 467386fbbf085e716570813a5d3be3927c348e11 (patch) | |
tree | 217d3138600f8a7bec23dc9bf0dc845caf715700 /kernel/sched/sched.h | |
parent | 525628c73bd6af65f27d927e699e7460d7d55ed3 (diff) | |
parent | ecf7d01c229d11a44609c0067889372c91fb4f36 (diff) | |
download | op-kernel-dev-467386fbbf085e716570813a5d3be3927c348e11.zip op-kernel-dev-467386fbbf085e716570813a5d3be3927c348e11.tar.gz |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
-rw-r--r-- | kernel/sched/sched.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2eb2002..cdae23d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1073,6 +1073,9 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev) * We must ensure this doesn't happen until the switch is completely * finished. * + * In particular, the load of prev->state in finish_task_switch() must + * happen before this. + * * Pairs with the control dependency and rmb in try_to_wake_up(). */ smp_store_release(&prev->on_cpu, 0); |