aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-29 12:12:30 -0400
committerSage Weil <sage@newdream.net>2010-05-29 12:12:30 -0400
commit0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb (patch)
treec944cf9abba9a6afb3d1259140c73101d0e222a0 /kernel/sched.c
parent240ed68eb567d80dd6bab739341999a5ab0ad55d (diff)
sched: add wait_for_completion_killable_timeout
Add missing _killable_timeout variant for wait_for_completion that will return when a timeout expires or the task is killed. CC: Ingo Molnar <mingo@elte.hu> CC: Andreas Herrmann <andreas.herrmann3@amd.com> CC: Thomas Gleixner <tglx@linutronix.de> CC: Mike Galbraith <efault@gmx.de> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 3c2a54f70ffe..4d051c7517fd 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4161,6 +4161,23 @@ int __sched wait_for_completion_killable(struct completion *x)
4161EXPORT_SYMBOL(wait_for_completion_killable); 4161EXPORT_SYMBOL(wait_for_completion_killable);
4162 4162
4163/** 4163/**
4164 * wait_for_completion_killable_timeout: - waits for completion of a task (w/(to,killable))
4165 * @x: holds the state of this particular completion
4166 * @timeout: timeout value in jiffies
4167 *
4168 * This waits for either a completion of a specific task to be
4169 * signaled or for a specified timeout to expire. It can be
4170 * interrupted by a kill signal. The timeout is in jiffies.
4171 */
4172unsigned long __sched
4173wait_for_completion_killable_timeout(struct completion *x,
4174 unsigned long timeout)
4175{
4176 return wait_for_common(x, timeout, TASK_KILLABLE);
4177}
4178EXPORT_SYMBOL(wait_for_completion_killable_timeout);
4179
4180/**
4164 * try_wait_for_completion - try to decrement a completion without blocking 4181 * try_wait_for_completion - try to decrement a completion without blocking
4165 * @x: completion structure 4182 * @x: completion structure
4166 * 4183 *