Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45161
b: refs/heads/master
c: 241ceee
h: refs/heads/master
i:
  45159: 2b15587
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Dec 31, 2006
1 parent 9ac1187 commit 9ba69eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a
refs/heads/master: 241ceee0b442c69226fb882d61d9b9785743898f
8 changes: 4 additions & 4 deletions trunk/kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,10 @@ choose_new_parent(struct task_struct *p, struct task_struct *reaper)
static void
reparent_thread(struct task_struct *p, struct task_struct *father, int traced)
{
if (p->pdeath_signal)
/* We already hold the tasklist_lock here. */
group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);

/* Move the child from its dying parent to the new one. */
if (unlikely(traced)) {
/* Preserve ptrace links if someone else is tracing this child. */
Expand Down Expand Up @@ -631,10 +635,6 @@ reparent_thread(struct task_struct *p, struct task_struct *father, int traced)
/* We don't want people slaying init. */
if (p->exit_signal != -1)
p->exit_signal = SIGCHLD;

if (p->pdeath_signal)
/* We already hold the tasklist_lock here. */
group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);

/* If we'd notified the old parent about this child's death,
* also notify the new parent.
Expand Down

0 comments on commit 9ba69eb

Please sign in to comment.