Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index c3bb2fce11ba2cb10bd69550f8cfc48b9638623c..4949d336d88d21edf82e51fceaa6b3960fad8790 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1656,6 +1656,12 @@ out:
 static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
                                struct hrtimer_sleeper *timeout)
 {
+       /*
+        * The task state is guaranteed to be set before another task can
+        * wake it. set_current_state() is implemented using set_mb() and
+        * queue_me() calls spin_unlock() upon completion, both serializing
+        * access to the hash list and forcing another memory barrier.
+        */
        set_current_state(TASK_INTERRUPTIBLE);
        queue_me(q, hb);