diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-12-06 11:59:46 -0500 |
|---|---|---|
| committer | Matthew Wilcox <willy@linux.intel.com> | 2007-12-06 17:40:07 -0500 |
| commit | 294d5cc233d81ec4aec77ebc60dc5752a3d0082a (patch) | |
| tree | 9b75eba307934d5cb156202617bd4bfa7c7f01ee | |
| parent | da78451190bdaae0e67d6c96b1ec3366abc45474 (diff) | |
Add schedule_timeout_killable
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | kernel/timer.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 95395c143bab..e4921aad4063 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -314,6 +314,7 @@ extern int in_sched_functions(unsigned long addr); #define MAX_SCHEDULE_TIMEOUT LONG_MAX extern signed long FASTCALL(schedule_timeout(signed long timeout)); extern signed long schedule_timeout_interruptible(signed long timeout); +extern signed long schedule_timeout_killable(signed long timeout); extern signed long schedule_timeout_uninterruptible(signed long timeout); asmlinkage void schedule(void); diff --git a/kernel/timer.c b/kernel/timer.c index a05817c021d6..66d7d8bca1a3 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1100,6 +1100,13 @@ signed long __sched schedule_timeout_interruptible(signed long timeout) } EXPORT_SYMBOL(schedule_timeout_interruptible); +signed long __sched schedule_timeout_killable(signed long timeout) +{ + __set_current_state(TASK_KILLABLE); + return schedule_timeout(timeout); +} +EXPORT_SYMBOL(schedule_timeout_killable); + signed long __sched schedule_timeout_uninterruptible(signed long timeout) { __set_current_state(TASK_UNINTERRUPTIBLE); |