Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 9ddf501..c27bb56 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -594,6 +594,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);
                /*