Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81762
b: refs/heads/master
c: e1abb39
h: refs/heads/master
v: v3
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Dec 6, 2007
1 parent 9b1173a commit 9446479
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9514f6c6b95b5a747ba902858eff577281e8659
refs/heads/master: e1abb39c60971590b6580c0d3a12119dcbad9c50
6 changes: 3 additions & 3 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ static inline int wants_signal(int sig, struct task_struct *p)
return 0;
if (sig == SIGKILL)
return 1;
if (p->state & (TASK_STOPPED | TASK_TRACED))
if (task_is_stopped_or_traced(p))
return 0;
return task_curr(p) || !signal_pending(p);
}
Expand Down Expand Up @@ -1441,7 +1441,7 @@ void do_notify_parent(struct task_struct *tsk, int sig)
BUG_ON(sig == -1);

/* do_notify_parent_cldstop should have been called instead. */
BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
BUG_ON(task_is_stopped_or_traced(tsk));

BUG_ON(!tsk->ptrace &&
(tsk->group_leader != tsk || !thread_group_empty(tsk)));
Expand Down Expand Up @@ -1729,7 +1729,7 @@ static int do_signal_stop(int signr)
* so this check has no races.
*/
if (!t->exit_state &&
!(t->state & (TASK_STOPPED|TASK_TRACED))) {
!task_is_stopped_or_traced(t)) {
stop_count++;
signal_wake_up(t, 0);
}
Expand Down

0 comments on commit 9446479

Please sign in to comment.