Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56ec1607 authored by Darren Hart's avatar Darren Hart Committed by Ingo Molnar
Browse files

futex: Correct futex_wait_requeue_pi() commentary 



Correct various typos and formatting inconsistencies in the
commentary of futex_wait_requeue_pi().

Signed-off-by: default avatarDarren Hart <dvhltc@us.ibm.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Dinakar Guniguntala <dino@in.ibm.com>
Cc: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <20090922052958.8717.21932.stgit@Aeon>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b8c7f1dc

kernel/futex.c

+3 −3
Original line number Diff line number Diff line
@@ -2114,12 +2114,12 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, 


/**

 * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2

 * @uaddr:	the futex we initialyl wait on (non-pi)

 * @uaddr:	the futex we initially wait on (non-pi)

 * @fshared:	whether the futexes are shared (1) or not (0).  They must be

 * 		the same type, no requeueing from private to shared, etc.

 * @val:	the expected value of uaddr

 * @abs_time:	absolute timeout

 * @bitset:	32 bit wakeup bitset set by userspace, defaults to all.

 * @bitset:	32 bit wakeup bitset set by userspace, defaults to all

 * @clockrt:	whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0)

 * @uaddr2:	the pi futex we will take prior to returning to user-space

 *
@@ -2246,7 +2246,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, 
		res = fixup_owner(uaddr2, fshared, &q, !ret);

		/*

		 * If fixup_owner() returned an error, proprogate that.  If it

		 * acquired the lock, clear our -ETIMEDOUT or -EINTR.

		 * acquired the lock, clear -ETIMEDOUT or -EINTR.

		 */

		if (res)

			ret = (res < 0) ? res : 0;