Merge tag 'mm-nonmm-stable-2024-01-09-10-33' of git://git.kernel.org/pub/scm/linux...

[linux-block.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 5c579fb9a5e3d99eeb77587d818528b0040b6801..2fabd497d6598831d1144ecb8696e85ca4fb3f3d 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -145,20 +145,9 @@ void __ptrace_unlink(struct task_struct *child)
         */
        if (!(child->flags & PF_EXITING) &&
            (child->signal->flags & SIGNAL_STOP_STOPPED ||
-            child->signal->group_stop_count)) {
+            child->signal->group_stop_count))
                child->jobctl |= JOBCTL_STOP_PENDING;
 
-               /*
-                * This is only possible if this thread was cloned by the
-                * traced task running in the stopped group, set the signal
-                * for the future reports.
-                * FIXME: we should change ptrace_init_task() to handle this
-                * case.
-                */
-               if (!(child->jobctl & JOBCTL_STOP_SIGMASK))
-                       child->jobctl |= SIGSTOP;
-       }
-
        /*
         * If transition to TASK_STOPPED is pending or in TASK_TRACED, kick
         * @child in the butt.  Note that @resume should be used iff @child