diff --git a/[refs] b/[refs] index 6790903bcfe2..c91a9b2e607a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb3696da89743d580f869142d0a6e6ba9b7fe89a +refs/heads/master: 479bf98c1c29b40d86e40a4e6e4944c2f03d9493 diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 9fa99702645d..b8d3b47bb881 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1599,8 +1599,7 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace, * own children, it should create a separate process which * takes the role of real parent. */ - if (likely(!ptrace) && p->ptrace && - same_thread_group(p->parent, p->real_parent)) + if (likely(!ptrace) && p->ptrace && !ptrace_reparented(p)) return 0; /*