Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63636
b: refs/heads/master
c: 2472844
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Aug 3, 2007
1 parent 9b5df7b commit b7fe8d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 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: b6b1d87785712474d0ed80689c17107d616a1171
refs/heads/master: 247284481ca40288bd120cf0707681c3bdbee78f
8 changes: 2 additions & 6 deletions trunk/kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ static void exit_notify(struct task_struct *tsk)
__kill_pgrp_info(SIGCONT, SEND_SIG_PRIV, pgrp);
}

/* Let father know we died
/* Let father know we died
*
* Thread signals are configurable, but you aren't going to use
* that to send signals to arbitary processes.
Expand All @@ -826,9 +826,7 @@ static void exit_notify(struct task_struct *tsk)
* If our self_exec id doesn't match our parent_exec_id then
* we have changed execution domain as these two values started
* the same after a fork.
*
*/

if (tsk->exit_signal != SIGCHLD && tsk->exit_signal != -1 &&
( tsk->parent_exec_id != t->self_exec_id ||
tsk->self_exec_id != tsk->parent_exec_id)
Expand All @@ -848,9 +846,7 @@ static void exit_notify(struct task_struct *tsk)
}

state = EXIT_ZOMBIE;
if (tsk->exit_signal == -1 &&
(likely(tsk->ptrace == 0) ||
unlikely(tsk->parent->signal->flags & SIGNAL_GROUP_EXIT)))
if (tsk->exit_signal == -1 && likely(!tsk->ptrace))
state = EXIT_DEAD;
tsk->exit_state = state;

Expand Down
4 changes: 0 additions & 4 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1561,10 +1561,6 @@ static inline int may_ptrace_stop(void)
(current->ptrace & PT_ATTACHED)))
return 0;

if (unlikely(current->signal == current->parent->signal) &&
unlikely(current->signal->flags & SIGNAL_GROUP_EXIT))
return 0;

/*
* Are we in the middle of do_coredump?
* If so and our tracer is also part of the coredump stopping
Expand Down

0 comments on commit b7fe8d1

Please sign in to comment.