aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorDarren Hart <dvhltc@us.ibm.com>2009-09-22 01:29:59 -0400
committerIngo Molnar <mingo@elte.hu>2009-09-22 04:37:42 -0400
commit56ec1607b15b6a5f6de5aab14f16a763b88296fc (patch)
treec50e693727842194098e054db92573e2b1cf5ea0 /kernel/futex.c
parentb8c7f1dc5ca4e0d10709182233cdab932cef593d (diff)
futex: Correct futex_wait_requeue_pi() commentary
Correct various typos and formatting inconsistencies in the commentary of futex_wait_requeue_pi(). Signed-off-by: Darren Hart <dvhltc@us.ibm.com> Acked-by: Peter 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: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 248dd119a86e..6c498b145a4f 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2114,12 +2114,12 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,
2114 2114
2115/** 2115/**
2116 * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2 2116 * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2
2117 * @uaddr: the futex we initialyl wait on (non-pi) 2117 * @uaddr: the futex we initially wait on (non-pi)
2118 * @fshared: whether the futexes are shared (1) or not (0). They must be 2118 * @fshared: whether the futexes are shared (1) or not (0). They must be
2119 * the same type, no requeueing from private to shared, etc. 2119 * the same type, no requeueing from private to shared, etc.
2120 * @val: the expected value of uaddr 2120 * @val: the expected value of uaddr
2121 * @abs_time: absolute timeout 2121 * @abs_time: absolute timeout
2122 * @bitset: 32 bit wakeup bitset set by userspace, defaults to all. 2122 * @bitset: 32 bit wakeup bitset set by userspace, defaults to all
2123 * @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0) 2123 * @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0)
2124 * @uaddr2: the pi futex we will take prior to returning to user-space 2124 * @uaddr2: the pi futex we will take prior to returning to user-space
2125 * 2125 *
@@ -2246,7 +2246,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
2246 res = fixup_owner(uaddr2, fshared, &q, !ret); 2246 res = fixup_owner(uaddr2, fshared, &q, !ret);
2247 /* 2247 /*
2248 * If fixup_owner() returned an error, proprogate that. If it 2248 * If fixup_owner() returned an error, proprogate that. If it
2249 * acquired the lock, clear our -ETIMEDOUT or -EINTR. 2249 * acquired the lock, clear -ETIMEDOUT or -EINTR.
2250 */ 2250 */
2251 if (res) 2251 if (res)
2252 ret = (res < 0) ? res : 0; 2252 ret = (res < 0) ? res : 0;