diff --git a/[refs] b/[refs] index d35447b7074c..028292a34056 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f221e726bf4e082a05dcd573379ac859bfba7126 +refs/heads/master: 07edbde508869be63c38c5f2504bd8e8279cc535 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 4a790f2e224e..cfb5656b2cdc 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -825,8 +825,6 @@ static int de_thread(struct task_struct *tsk) schedule(); } - if (unlikely(task_child_reaper(tsk) == leader)) - task_active_pid_ns(tsk)->child_reaper = tsk; /* * The only record we have of the real-time age of a * process, regardless of execs it's done, is start_time.