aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sched.h5
-rw-r--r--kernel/signal.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9e5a88afe6be..e951bd2eb9fc 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2337,7 +2337,10 @@ static inline int signal_pending(struct task_struct *p)
2337 return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING)); 2337 return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING));
2338} 2338}
2339 2339
2340extern int __fatal_signal_pending(struct task_struct *p); 2340static inline int __fatal_signal_pending(struct task_struct *p)
2341{
2342 return unlikely(sigismember(&p->pending.signal, SIGKILL));
2343}
2341 2344
2342static inline int fatal_signal_pending(struct task_struct *p) 2345static inline int fatal_signal_pending(struct task_struct *p)
2343{ 2346{
diff --git a/kernel/signal.c b/kernel/signal.c
index c6d7a24a86a1..6705320784fd 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1050,12 +1050,6 @@ void zap_other_threads(struct task_struct *p)
1050 } 1050 }
1051} 1051}
1052 1052
1053int __fatal_signal_pending(struct task_struct *tsk)
1054{
1055 return sigismember(&tsk->pending.signal, SIGKILL);
1056}
1057EXPORT_SYMBOL(__fatal_signal_pending);
1058
1059struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags) 1053struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags)
1060{ 1054{
1061 struct sighand_struct *sighand; 1055 struct sighand_struct *sighand;