---

yaml --- r: 107662 b: refs/heads/master c: 5b2becc h: refs/heads/master v: v3
git-mirror · Aug 5, 2008 · 5499dfa · 5499dfa
1 parent abe8d5e
commit 5499dfa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32194450330be327f3b25bf6b66298bd122599e9
+refs/heads/master: 5b2becc8cffdccdd60c63099f592ddd35aa6c34f
diff --git a/trunk/kernel/semaphore.c b/trunk/kernel/semaphore.c
@@ -212,9 +212,7 @@ static inline int __sched __down_common(struct semaphore *sem, long state,
 	waiter.up = 0;
 
 	for (;;) {
-		if (state == TASK_INTERRUPTIBLE && signal_pending(task))
-			goto interrupted;
-		if (state == TASK_KILLABLE && fatal_signal_pending(task))
+		if (signal_pending_state(state, task))
 			goto interrupted;
 		if (timeout <= 0)
 			goto timed_out;