Darren Hart wrote:
futex: futex_wait_requeue_pi commentary corrections
From: Darren Hart <dvhltc@xxxxxxxxxx>
The state machine described in the comments wasn't updated with a follow-on
fix. Address that and cleanup the corresponding commentary in the
function.
Signed-off-by: Darren Hart <dvhltc@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
---
kernel/futex.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index 0672ff8..18752ae 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2102,11 +2102,11 @@ int handle_early_requeue_pi_wakeup(struct
futex_hash_bucket *hb,
* We call schedule in futex_wait_queue_me() when we enqueue and return
there
* via the following:
* 1) wakeup on uaddr2 after an atomic lock acquisition by futex_requeue()
- * 2) wakeup on uaddr2 after a requeue and subsequent unlock
- * 3) signal (before or after requeue)
- * 4) timeout (before or after requeue)
+ * 2) wakeup on uaddr2 after a requeue
+ * 3) signal
+ * 4) timeout
*
- * If 3, we setup a restart_block with futex_wait_requeue_pi() as the
function.
+ * If 3, we setup a restart_block and return -ERESTARTNOINTR.
Gah, not we don't. We removed the restart block altogether. Sorry. V2
en route.
Nacked-by: Darren Hart <dvhltc@xxxxxxxxxx>
--
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
