From 5499dfa8f8d9f4624ab67305099ddf1240701fe5 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 5 Aug 2008 13:01:13 -0700
Subject: [PATCH] --- yaml --- r: 107662 b: refs/heads/master c:
 5b2becc8cffdccdd60c63099f592ddd35aa6c34f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/semaphore.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0738a081da1c..d955e4b4e178 100644
--- 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
index aaaeae8244e7..94a62c0d4ade 100644
--- 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;