From: Nishanth Aravamudan <nacc@us.ibm.com>
Add schedule_timeout_{,un}interruptible() interfaces so that
schedule_timeout() callers don't have to worry about forgetting to add the
set_current_state() call beforehand.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
include/linux/sched.h | 2 ++
kernel/timer.c | 14 ++++++++++++++
2 files changed, 16 insertions(+)
diff -puN include/linux/sched.h~schedule_timeout_uninterruptible include/linux/sched.h
--- devel/include/linux/sched.h~schedule_timeout_uninterruptible 2005-08-21 23:49:58.000000000 -0700
+++ devel-akpm/include/linux/sched.h 2005-08-21 23:49:58.000000000 -0700
@@ -204,6 +204,8 @@ extern int in_sched_functions(unsigned l
#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_uninterruptible(signed long timeout);
asmlinkage void schedule(void);
struct namespace;
diff -puN kernel/timer.c~schedule_timeout_uninterruptible kernel/timer.c
--- devel/kernel/timer.c~schedule_timeout_uninterruptible 2005-08-21 23:49:58.000000000 -0700
+++ devel-akpm/kernel/timer.c 2005-08-21 23:49:58.000000000 -0700
@@ -1169,6 +1169,20 @@ fastcall signed long __sched schedule_ti
EXPORT_SYMBOL(schedule_timeout);
+signed long __sched schedule_timeout_interruptible(signed long timeout)
+{
+ set_current_state(TASK_INTERRUPTIBLE);
+ return schedule_timeout(timeout);
+}
+EXPORT_SYMBOL(schedule_timeout_interruptible);
+
+signed long __sched schedule_timeout_uninterruptible(signed long timeout)
+{
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ return schedule_timeout(timeout);
+}
+EXPORT_SYMBOL(schedule_timeout_uninterruptible);
+
/* Thread ID - the internal kernel "pid" */
asmlinkage long sys_gettid(void)
{
_