summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorOleg Nesterov2011-04-07 20:44:11 +0200
committerOleg Nesterov2011-04-07 20:44:11 +0200
commite46bc9b6fd65bc9f406a4211fbf95683cc9c2937 (patch)
tree57046f6b2f4674a0c9048ab1ad1ff50fae7e373a /fs
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
parentptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/ (diff)
downloadkernel-qcow2-linux-e46bc9b6fd65bc9f406a4211fbf95683cc9c2937.tar.gz
kernel-qcow2-linux-e46bc9b6fd65bc9f406a4211fbf95683cc9c2937.tar.xz
kernel-qcow2-linux-e46bc9b6fd65bc9f406a4211fbf95683cc9c2937.zip
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into ptrace
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 5e62d26a4fec..8328beb9016f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1659,6 +1659,7 @@ static int zap_process(struct task_struct *start, int exit_code)
t = start;
do {
+ task_clear_group_stop_pending(t);
if (t != current && t->mm) {
sigaddset(&t->pending.signal, SIGKILL);
signal_wake_up(t, 1);