Merge branch 'linus' into x86/gart

1 files changed, 1 insertions, 3 deletions

diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index aaaeae8244e7..94a62c0d4ade 100644
--- a/kernel/semaphore.c
+++ b/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;