diff --git a/[refs] b/[refs] index 41b9ea64913c..960e22e88452 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0811af28ce49fab963e3e6b8abcf8c460f971cd4 +refs/heads/master: bb6f6dbaa48c53525a7a4f9d4df719c3b0b582af diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 2075b674d85e..fd02ea4a81e9 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -1462,6 +1462,7 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) if (!(current->signal->flags & SIGNAL_GROUP_EXIT)) { current->signal->flags = SIGNAL_GROUP_EXIT; current->signal->group_exit_code = exit_code; + current->signal->group_stop_count = 0; retval = 0; } spin_unlock_irq(¤t->sighand->siglock); @@ -1477,7 +1478,6 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) * Clear any false indication of pending signals that might * be seen by the filesystem code called to write the core file. */ - current->signal->group_stop_count = 0; clear_thread_flag(TIF_SIGPENDING); if (current->signal->rlim[RLIMIT_CORE].rlim_cur < binfmt->min_coredump)