1 files changed, 20 insertions, 12 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index 13e2b513be01..f4152fcd9f8e 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1154,6 +1154,20 @@ fastcall signed long __sched schedule_timeout(signed long timeout)
 
 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)
 {
@@ -1170,8 +1184,7 @@ static long __sched nanosleep_restart(struct restart_block *restart)
         if (!time_after(expire, now))
                 return 0;
 
-        current->state = TASK_INTERRUPTIBLE;
-        expire = schedule_timeout(expire - now);
+        expire = schedule_timeout_interruptible(expire - now);
 
         ret = 0;
         if (expire) {
@@ -1199,8 +1212,7 @@ asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __us
                 return -EINVAL;
 
         expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec);
-        current->state = TASK_INTERRUPTIBLE;
-        expire = schedule_timeout(expire);
+        expire = schedule_timeout_interruptible(expire);
 
         ret = 0;
         if (expire) {
@@ -1598,10 +1610,8 @@ void msleep(unsigned int msecs)
 {
         unsigned long timeout = msecs_to_jiffies(msecs) + 1;
 
-        while (timeout) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                timeout = schedule_timeout(timeout);
-        }
+        while (timeout)
+                timeout = schedule_timeout_uninterruptible(timeout);
 }
 
 EXPORT_SYMBOL(msleep);
@@ -1614,10 +1624,8 @@ unsigned long msleep_interruptible(unsigned int msecs)
 {
         unsigned long timeout = msecs_to_jiffies(msecs) + 1;
 
-        while (timeout && !signal_pending(current)) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                timeout = schedule_timeout(timeout);
-        }
+        while (timeout && !signal_pending(current))
+                timeout = schedule_timeout_interruptible(timeout);
         return jiffies_to_msecs(timeout);
 }