aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorScot Doyle <lkml14@scotdoyle.com>2014-08-24 13:12:27 -0400
committerIngo Molnar <mingo@kernel.org>2014-09-05 06:37:10 -0400
commit6b44f519017b219a12b37173c7eef8dfce2c0100 (patch)
tree011afccc53ba6ac2e63ab8ab779c5e2ef79925b2 /include/linux
parent35b123e2f701b28977db2cde7dbbdb3fad28cad1 (diff)
sched/wait: Document timeout corner case
The timeout may elapse without 0 being returned, such as when waiting on an unused queue. Document this possibility. Signed-off-by: Scot Doyle <lkml14@scotdoyle.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/alpine.LNX.2.11.1408241710070.6462@localhost.localdomain Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/wait.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 6fb1ba5f9b2f..034f6fc7c65f 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -280,9 +280,11 @@ do { \
280 * wake_up() has to be called after changing any variable that could 280 * wake_up() has to be called after changing any variable that could
281 * change the result of the wait condition. 281 * change the result of the wait condition.
282 * 282 *
283 * The function returns 0 if the @timeout elapsed, or the remaining 283 * Returns:
284 * jiffies (at least 1) if the @condition evaluated to %true before 284 * 0 if the @condition evaluated to %false after the @timeout elapsed,
285 * the @timeout elapsed. 285 * 1 if the @condition evaluated to %true after the @timeout elapsed,
286 * or the remaining jiffies (at least 1) if the @condition evaluated
287 * to %true before the @timeout elapsed.
286 */ 288 */
287#define wait_event_timeout(wq, condition, timeout) \ 289#define wait_event_timeout(wq, condition, timeout) \
288({ \ 290({ \
@@ -363,9 +365,11 @@ do { \
363 * change the result of the wait condition. 365 * change the result of the wait condition.
364 * 366 *
365 * Returns: 367 * Returns:
366 * 0 if the @timeout elapsed, -%ERESTARTSYS if it was interrupted by 368 * 0 if the @condition evaluated to %false after the @timeout elapsed,
367 * a signal, or the remaining jiffies (at least 1) if the @condition 369 * 1 if the @condition evaluated to %true after the @timeout elapsed,
368 * evaluated to %true before the @timeout elapsed. 370 * the remaining jiffies (at least 1) if the @condition evaluated
371 * to %true before the @timeout elapsed, or -%ERESTARTSYS if it was
372 * interrupted by a signal.
369 */ 373 */
370#define wait_event_interruptible_timeout(wq, condition, timeout) \ 374#define wait_event_interruptible_timeout(wq, condition, timeout) \
371({ \ 375({ \