diff options
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 8 | 
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 464c2b172f0..9578c1ae19c 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -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.  @@ -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) @@ -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;  | 
