diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d601fb0406ca..da7c5d23cc03 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4599,10 +4599,7 @@ do_wait_for_common(struct completion *x, long timeout, int state) | |||
4599 | wait.flags |= WQ_FLAG_EXCLUSIVE; | 4599 | wait.flags |= WQ_FLAG_EXCLUSIVE; |
4600 | __add_wait_queue_tail(&x->wait, &wait); | 4600 | __add_wait_queue_tail(&x->wait, &wait); |
4601 | do { | 4601 | do { |
4602 | if ((state == TASK_INTERRUPTIBLE && | 4602 | if (signal_pending_state(state, current)) { |
4603 | signal_pending(current)) || | ||
4604 | (state == TASK_KILLABLE && | ||
4605 | fatal_signal_pending(current))) { | ||
4606 | timeout = -ERESTARTSYS; | 4603 | timeout = -ERESTARTSYS; |
4607 | break; | 4604 | break; |
4608 | } | 4605 | } |