|
@@ -4599,10 +4599,7 @@ do_wait_for_common(struct completion *x, long timeout, int state)
|
|
|
wait.flags |= WQ_FLAG_EXCLUSIVE;
|
|
|
__add_wait_queue_tail(&x->wait, &wait);
|
|
|
do {
|
|
|
- if ((state == TASK_INTERRUPTIBLE &&
|
|
|
- signal_pending(current)) ||
|
|
|
- (state == TASK_KILLABLE &&
|
|
|
- fatal_signal_pending(current))) {
|
|
|
+ if (signal_pending_state(state, current)) {
|
|
|
timeout = -ERESTARTSYS;
|
|
|
break;
|
|
|
}
|