diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 650c1d1a55d0..1daa7f46bccd 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -1481,8 +1481,8 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p) | |||
1481 | * then ->notask_error is 0 if @p is an eligible child, | 1481 | * then ->notask_error is 0 if @p is an eligible child, |
1482 | * or another error from security_task_wait(), or still -ECHILD. | 1482 | * or another error from security_task_wait(), or still -ECHILD. |
1483 | */ | 1483 | */ |
1484 | static int wait_consider_task(struct wait_opts *wo, struct task_struct *parent, | 1484 | static int wait_consider_task(struct wait_opts *wo, int ptrace, |
1485 | int ptrace, struct task_struct *p) | 1485 | struct task_struct *p) |
1486 | { | 1486 | { |
1487 | int ret = eligible_child(wo, p); | 1487 | int ret = eligible_child(wo, p); |
1488 | if (!ret) | 1488 | if (!ret) |
@@ -1550,7 +1550,7 @@ static int do_wait_thread(struct wait_opts *wo, struct task_struct *tsk) | |||
1550 | * Do not consider detached threads. | 1550 | * Do not consider detached threads. |
1551 | */ | 1551 | */ |
1552 | if (!task_detached(p)) { | 1552 | if (!task_detached(p)) { |
1553 | int ret = wait_consider_task(wo, tsk, 0, p); | 1553 | int ret = wait_consider_task(wo, 0, p); |
1554 | if (ret) | 1554 | if (ret) |
1555 | return ret; | 1555 | return ret; |
1556 | } | 1556 | } |
@@ -1564,7 +1564,7 @@ static int ptrace_do_wait(struct wait_opts *wo, struct task_struct *tsk) | |||
1564 | struct task_struct *p; | 1564 | struct task_struct *p; |
1565 | 1565 | ||
1566 | list_for_each_entry(p, &tsk->ptraced, ptrace_entry) { | 1566 | list_for_each_entry(p, &tsk->ptraced, ptrace_entry) { |
1567 | int ret = wait_consider_task(wo, tsk, 1, p); | 1567 | int ret = wait_consider_task(wo, 1, p); |
1568 | if (ret) | 1568 | if (ret) |
1569 | return ret; | 1569 | return ret; |
1570 | } | 1570 | } |