---

yaml --- r: 81770 b: refs/heads/master c: 294d5cc h: refs/heads/master v: v3
git-mirror · Dec 6, 2007 · 141de36 · 141de36
1 parent ec70235
commit 141de36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da78451190bdaae0e67d6c96b1ec3366abc45474
+refs/heads/master: 294d5cc233d81ec4aec77ebc60dc5752a3d0082a
diff --git a/trunk/include/linux/sched.h b/trunk/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/trunk/kernel/timer.c b/trunk/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);