---

yaml --- r: 81765 b: refs/heads/master c: f776d12 h: refs/heads/master i: 81763: 00bed09 v: v3
git-mirror · Dec 6, 2007 · 8c4c2a0 · 8c4c2a0
1 parent dcee469
commit 8c4c2a0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f021a3c2b14d0dd082c2cee890c204d9e1dee52b
+refs/heads/master: f776d12dd16da1b0cd55a1240002c1b31f315d5d
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1872,7 +1872,14 @@ static inline int signal_pending(struct task_struct *p)
 {
 	return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING));
 }
-
+
+extern int FASTCALL(__fatal_signal_pending(struct task_struct *p));
+
+static inline int fatal_signal_pending(struct task_struct *p)
+{
+	return signal_pending(p) && __fatal_signal_pending(p);
+}
+
 static inline int need_resched(void)
 {
 	return unlikely(test_thread_flag(TIF_NEED_RESCHED));

diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -994,6 +994,11 @@ void zap_other_threads(struct task_struct *p)
 	}
 }
 
+int fastcall __fatal_signal_pending(struct task_struct *tsk)
+{
+	return sigismember(&tsk->pending.signal, SIGKILL);
+}
+
 /*
  * Must be called under rcu_read_lock() or with tasklist_lock read-held.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -994,6 +994,11 @@ void zap_other_threads(struct task_struct *p) @@
     	}
     }
+    int fastcall __fatal_signal_pending(struct task_struct *tsk)
+    {
+    	return sigismember(&tsk->pending.signal, SIGKILL);
+    }
     /*
      * Must be called under rcu_read_lock() or with tasklist_lock read-held.
      */
@@ Expand Down @@