Merge branch 'linus'; commit 'v3.0-rc2' into next

[deliverable/linux.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index ad5e818baacc43fb5e4046926bf52dde55acacfa..86c32b884f8efbb8f071b6343b3c37667b4e8fa3 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3023,8 +3023,10 @@ SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler)
 
 SYSCALL_DEFINE0(pause)
 {
-       current->state = TASK_INTERRUPTIBLE;
-       schedule();
+       while (!signal_pending(current)) {
+               current->state = TASK_INTERRUPTIBLE;
+               schedule();
+       }
        return -ERESTARTNOHAND;
 }