---

yaml --- r: 165689 b: refs/heads/master c: d958872 h: refs/heads/master i: 165687: 72d0aa9 v: v3
git-mirror · Sep 24, 2009 · 99fd403 · 99fd403
1 parent 9a1f358
commit 99fd403
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba0a6c9f6fceed11c6a99e8326f0477fe383e6b5
+refs/heads/master: d9588725e52650e82989707f8fd2feb67ad2dc8e
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -2337,7 +2337,10 @@ static inline int signal_pending(struct task_struct *p)
 	return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING));
 }
 
-extern int __fatal_signal_pending(struct task_struct *p);
+static inline int __fatal_signal_pending(struct task_struct *p)
+{
+	return unlikely(sigismember(&p->pending.signal, SIGKILL));
+}
 
 static inline int fatal_signal_pending(struct task_struct *p)
 {

diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -1050,12 +1050,6 @@ void zap_other_threads(struct task_struct *p)
 	}
 }
 
-int __fatal_signal_pending(struct task_struct *tsk)
-{
-	return sigismember(&tsk->pending.signal, SIGKILL);
-}
-EXPORT_SYMBOL(__fatal_signal_pending);
-
 struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags)
 {
 	struct sighand_struct *sighand;