af_iucv: remove duplicate sock_set_flag

[deliverable/linux.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 463af2efa5125945ad344c1dd2931ab026431a4b..b911adceb2c488523d0c2809049878dfde1eed27 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);