From 4a5274191e2617e5fea721d783e930924f43ed59 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntrae@de.ibm.com>
Date: Sat, 5 Aug 2006 12:13:52 -0700
Subject: [PATCH] --- yaml --- r: 33224 b: refs/heads/master c:
 e91467ecd1ef381377fd327c0ded922835ec52ab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b18d33362acf..6ffdffbf928d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72f0b4e2133ba1d65147d06016c0b6d2202235ca
+refs/heads/master: e91467ecd1ef381377fd327c0ded922835ec52ab
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index dda2049692a2..c2b2e0b83abf 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -948,6 +948,7 @@ static int unqueue_me(struct futex_q *q)
 	/* In the common case we don't take the spinlock, which is nice. */
  retry:
 	lock_ptr = q->lock_ptr;
+	barrier();
 	if (lock_ptr != 0) {
 		spin_lock(lock_ptr);
 		/*