---

yaml --- r: 110702 b: refs/heads/master c: 94d3d82 h: refs/heads/master v: v3
git-mirror · Aug 22, 2008 · 9d59a86 · 9d59a86
1 parent 2774a2c
commit 9d59a86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f58e2c33ffa31b8d4a71609a5e71e8d893574a07
+refs/heads/master: 94d3d8247de22c5b0624aa00616ceca459498e55
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -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;
 			}