aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-12-06 11:07:35 -0500
committerMatthew Wilcox <willy@linux.intel.com>2007-12-06 17:35:04 -0500
commite1abb39c60971590b6580c0d3a12119dcbad9c50 (patch)
treeeed33345fb9a46029c54eea84aa03d7587038294
parentd9514f6c6b95b5a747ba902858eff577281e8659 (diff)
signal: Use task_is_*
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
-rw-r--r--kernel/signal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index afa4f781f924..c5a401aa715c 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -838,7 +838,7 @@ static inline int wants_signal(int sig, struct task_struct *p)
838 return 0; 838 return 0;
839 if (sig == SIGKILL) 839 if (sig == SIGKILL)
840 return 1; 840 return 1;
841 if (p->state & (TASK_STOPPED | TASK_TRACED)) 841 if (task_is_stopped_or_traced(p))
842 return 0; 842 return 0;
843 return task_curr(p) || !signal_pending(p); 843 return task_curr(p) || !signal_pending(p);
844} 844}
@@ -1441,7 +1441,7 @@ void do_notify_parent(struct task_struct *tsk, int sig)
1441 BUG_ON(sig == -1); 1441 BUG_ON(sig == -1);
1442 1442
1443 /* do_notify_parent_cldstop should have been called instead. */ 1443 /* do_notify_parent_cldstop should have been called instead. */
1444 BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED)); 1444 BUG_ON(task_is_stopped_or_traced(tsk));
1445 1445
1446 BUG_ON(!tsk->ptrace && 1446 BUG_ON(!tsk->ptrace &&
1447 (tsk->group_leader != tsk || !thread_group_empty(tsk))); 1447 (tsk->group_leader != tsk || !thread_group_empty(tsk)));
@@ -1729,7 +1729,7 @@ static int do_signal_stop(int signr)
1729 * so this check has no races. 1729 * so this check has no races.
1730 */ 1730 */
1731 if (!t->exit_state && 1731 if (!t->exit_state &&
1732 !(t->state & (TASK_STOPPED|TASK_TRACED))) { 1732 !task_is_stopped_or_traced(t)) {
1733 stop_count++; 1733 stop_count++;
1734 signal_wake_up(t, 0); 1734 signal_wake_up(t, 0);
1735 } 1735 }