summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-12-06 17:59:46 +0100
committerMatthew Wilcox <willy@linux.intel.com>2007-12-06 23:40:07 +0100
commit294d5cc233d81ec4aec77ebc60dc5752a3d0082a (patch)
tree9b75eba307934d5cb156202617bd4bfa7c7f01ee /kernel/timer.c
parentUse mutex_lock_killable in vfs_readdir (diff)
downloadlinux-294d5cc233d81ec4aec77ebc60dc5752a3d0082a.tar.xz
linux-294d5cc233d81ec4aec77ebc60dc5752a3d0082a.zip
Add schedule_timeout_killable
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c7
1 files changed, 7 insertions, 0 deletions
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);