From ac496293a0caa122bf9b3a7e5b4c18cc4af32481 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 23 Feb 2008 18:05:03 -0800
Subject: [PATCH] --- yaml --- r: 86254 b: refs/heads/master c:
 04e2f1741d235ba599037734878d72e57cb302b5 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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))