summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorSage Weil2010-05-29 18:12:30 +0200
committerSage Weil2010-05-29 18:12:30 +0200
commit0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb (patch)
treec944cf9abba9a6afb3d1259140c73101d0e222a0 /include/linux
parentceph: reuse mon subscribe message instead of allocated anew (diff)
downloadkernel-qcow2-linux-0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb.tar.gz
kernel-qcow2-linux-0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb.tar.xz
kernel-qcow2-linux-0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb.zip
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 'include/linux')
-rw-r--r--include/linux/completion.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 4a6b604ef7e4..51e3145196f6 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -83,6 +83,8 @@ extern unsigned long wait_for_completion_timeout(struct completion *x,
unsigned long timeout);
extern unsigned long wait_for_completion_interruptible_timeout(
struct completion *x, unsigned long timeout);
+extern unsigned long wait_for_completion_killable_timeout(
+ struct completion *x, unsigned long timeout);
extern bool try_wait_for_completion(struct completion *x);
extern bool completion_done(struct completion *x);