diff options
Diffstat (limited to 'kernel/exit.c')
-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 289f59d686bf..e5cc05644609 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -765,7 +765,7 @@ static void reparent_leader(struct task_struct *father, struct task_struct *p, | |||
765 | p->exit_signal = SIGCHLD; | 765 | p->exit_signal = SIGCHLD; |
766 | 766 | ||
767 | /* If it has exited notify the new parent about this child's death. */ | 767 | /* If it has exited notify the new parent about this child's death. */ |
768 | if (!task_ptrace(p) && | 768 | if (!p->ptrace && |
769 | p->exit_state == EXIT_ZOMBIE && thread_group_empty(p)) { | 769 | p->exit_state == EXIT_ZOMBIE && thread_group_empty(p)) { |
770 | do_notify_parent(p, p->exit_signal); | 770 | do_notify_parent(p, p->exit_signal); |
771 | if (task_detached(p)) { | 771 | if (task_detached(p)) { |
@@ -795,7 +795,7 @@ static void forget_original_parent(struct task_struct *father) | |||
795 | do { | 795 | do { |
796 | t->real_parent = reaper; | 796 | t->real_parent = reaper; |
797 | if (t->parent == father) { | 797 | if (t->parent == father) { |
798 | BUG_ON(task_ptrace(t)); | 798 | BUG_ON(t->ptrace); |
799 | t->parent = t->real_parent; | 799 | t->parent = t->real_parent; |
800 | } | 800 | } |
801 | if (t->pdeath_signal) | 801 | if (t->pdeath_signal) |
@@ -1565,7 +1565,7 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace, | |||
1565 | * Notification and reaping will be cascaded to the real | 1565 | * Notification and reaping will be cascaded to the real |
1566 | * parent when the ptracer detaches. | 1566 | * parent when the ptracer detaches. |
1567 | */ | 1567 | */ |
1568 | if (likely(!ptrace) && unlikely(task_ptrace(p))) { | 1568 | if (likely(!ptrace) && unlikely(p->ptrace)) { |
1569 | /* it will become visible, clear notask_error */ | 1569 | /* it will become visible, clear notask_error */ |
1570 | wo->notask_error = 0; | 1570 | wo->notask_error = 0; |
1571 | return 0; | 1571 | return 0; |
@@ -1608,7 +1608,7 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace, | |||
1608 | * own children, it should create a separate process which | 1608 | * own children, it should create a separate process which |
1609 | * takes the role of real parent. | 1609 | * takes the role of real parent. |
1610 | */ | 1610 | */ |
1611 | if (likely(!ptrace) && task_ptrace(p) && | 1611 | if (likely(!ptrace) && p->ptrace && |
1612 | same_thread_group(p->parent, p->real_parent)) | 1612 | same_thread_group(p->parent, p->real_parent)) |
1613 | return 0; | 1613 | return 0; |
1614 | 1614 | ||