aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/exit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 723a69b69fa1..190a4cdcdb4d 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1351,7 +1351,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap,
1351 * the lock and this task is uninteresting. If we return nonzero, we have 1351 * the lock and this task is uninteresting. If we return nonzero, we have
1352 * released the lock and the system call should return. 1352 * released the lock and the system call should return.
1353 */ 1353 */
1354static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, 1354static int wait_task_stopped(struct task_struct *p,
1355 int noreap, struct siginfo __user *infop, 1355 int noreap, struct siginfo __user *infop,
1356 int __user *stat_addr, struct rusage __user *ru) 1356 int __user *stat_addr, struct rusage __user *ru)
1357{ 1357{
@@ -1365,8 +1365,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,
1365 if (unlikely(!task_is_stopped_or_traced(p))) 1365 if (unlikely(!task_is_stopped_or_traced(p)))
1366 goto unlock_sig; 1366 goto unlock_sig;
1367 1367
1368 if (delayed_group_leader && !(p->ptrace & PT_PTRACED) && 1368 if (!(p->ptrace & PT_PTRACED) && p->signal->group_stop_count > 0)
1369 p->signal->group_stop_count > 0)
1370 /* 1369 /*
1371 * A group stop is in progress and this is the group leader. 1370 * A group stop is in progress and this is the group leader.
1372 * We won't report until all threads have stopped. 1371 * We won't report until all threads have stopped.
@@ -1522,7 +1521,7 @@ repeat:
1522 !(options & WUNTRACED)) 1521 !(options & WUNTRACED))
1523 continue; 1522 continue;
1524 1523
1525 retval = wait_task_stopped(p, ret == 2, 1524 retval = wait_task_stopped(p,
1526 (options & WNOWAIT), infop, 1525 (options & WNOWAIT), infop,
1527 stat_addr, ru); 1526 stat_addr, ru);
1528 } else if (p->exit_state == EXIT_ZOMBIE) { 1527 } else if (p->exit_state == EXIT_ZOMBIE) {