Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6

[mirror_ubuntu-artful-kernel.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 4980a073237ff45ed28c39b38225c40923da0848..b92c3c9f8b9a24529e18eb2a1a1bf75f87840f10 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2221,8 +2221,7 @@ sys_rt_sigtimedwait(const sigset_t __user *uthese,
                        recalc_sigpending();
                        spin_unlock_irq(&current->sighand->siglock);
 
-                       current->state = TASK_INTERRUPTIBLE;
-                       timeout = schedule_timeout(timeout);
+                       timeout = schedule_timeout_interruptible(timeout);
 
                        try_to_freeze();
                        spin_lock_irq(&current->sighand->siglock);