diff --git a/[refs] b/[refs] index c292de0c9ad1..251080dd8a63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a3716eb04ccfdbef6e872a343ba7ce309237e79 +refs/heads/master: 04e2f1741d235ba599037734878d72e57cb302b5 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index c4bc8c210958..b387a8de26a5 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1831,6 +1831,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync) long old_state; struct rq *rq; + smp_wmb(); rq = task_rq_lock(p, &flags); old_state = p->state; if (!(old_state & state))