git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
genirq: Move two IRQ functions from .init.text to .text
[safe/jmp/linux-2.6]
/
kernel
/
semaphore.c
diff --git
a/kernel/semaphore.c
b/kernel/semaphore.c
index
5c2942e
..
94a62c0
100644
(file)
--- 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/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);
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 (;;) {
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;
goto interrupted;
if (timeout <= 0)
goto timed_out;