Re: [PATCH] futex: futex_wait_requeue_pi commentary corrections
From: Darren Hart <hidden>
Date: 2009-07-31 23:18:36
Also in:
lkml
Darren Hart wrote:
quoted hunk ↗ jump to hunk
futex: futex_wait_requeue_pi commentary corrections From: Darren Hart <redacted> 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 <redacted> Cc: Thomas Gleixner <redacted> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <redacted> --- 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(structfutex_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 [off-list ref] -- Darren Hart IBM Linux Technology Center Real-Time Linux Team