X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fsemaphore.c;h=94a62c0d4ade651b8c4e2a5c7cbb8ff26110738f;hb=d942fb6c7d391baba3dddb566eb735fbf3df8528;hp=5c2942e768cdd44371ae305d5870abfe7428732c;hpb=00b41ec2611dc98f87f30753ee00a53db648d662;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 5c2942e..94a62c0 100644
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -31,6 +31,7 @@
 #include <linux/sched.h>
 #include <linux/semaphore.h>
 #include <linux/spinlock.h>
+#include <linux/ftrace.h>
 
 static noinline void __down(struct semaphore *sem);
 static noinline int __down_interruptible(struct semaphore *sem);
@@ -211,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;