---

yaml --- r: 256857 b: refs/heads/master c: d4f7c51 h: refs/heads/master i: 256855: c191627 v: v3
git-mirror · Jun 27, 2011 · d443c35 · d443c35
1 parent 03adfb5
commit d443c35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e550f14dc6322e794d4e70825f63c9c99177ae8b
+refs/heads/master: d4f7c511c1c2a67eb287987cf1ce9554149030e6
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
@@ -384,7 +384,6 @@ static bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
 			dead = do_notify_parent(p, p->exit_signal);
 		else if (ignoring_children(tracer->sighand)) {
 			__wake_up_parent(p, tracer);
-			p->exit_signal = -1;
 			dead = true;
 		}
 	}

diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -1650,7 +1650,6 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
 		 * it, just use SIG_IGN instead).
 		 */
 		autoreap = true;
-		tsk->exit_signal = -1;
 		if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN)
 			sig = 0;
 	}