diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /kernel/signal.c | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 2c1f08defac2..84917fe507f7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -972,7 +972,7 @@ void zap_other_threads(struct task_struct *p) | |||
| 972 | } | 972 | } |
| 973 | } | 973 | } |
| 974 | 974 | ||
| 975 | int fastcall __fatal_signal_pending(struct task_struct *tsk) | 975 | int __fatal_signal_pending(struct task_struct *tsk) |
| 976 | { | 976 | { |
| 977 | return sigismember(&tsk->pending.signal, SIGKILL); | 977 | return sigismember(&tsk->pending.signal, SIGKILL); |
| 978 | } | 978 | } |