2 files changed, 3 insertions, 12 deletions

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index fd8669fc339f..9b5d2c901d06 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -227,6 +227,9 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
         if (unlikely(ptrace) && current->ptrace) {
                 child->ptrace = current->ptrace;
                 __ptrace_link(child, current->parent);
+
+                sigaddset(&child->pending.signal, SIGSTOP);
+                set_tsk_thread_flag(child, TIF_SIGPENDING);
         }
 }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 3c72a5b321a7..4d4117e01504 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -37,7 +37,6 @@
 #include <linux/swap.h>
 #include <linux/syscalls.h>
 #include <linux/jiffies.h>
-#include <linux/tracehook.h>
 #include <linux/futex.h>
 #include <linux/compat.h>
 #include <linux/kthread.h>
@@ -1522,17 +1521,6 @@ long do_fork(unsigned long clone_flags,
                 audit_finish_fork(p);
 
                 /*
-                 * Child is ready but hasn't started running yet.  Queue
-                 * SIGSTOP if it's gonna be ptraced - it doesn't matter who
-                 * attached/attaching to this task, the pending SIGSTOP is
-                 * right in any case.
-                 */
-                if (unlikely(p->ptrace)) {
-                        sigaddset(&p->pending.signal, SIGSTOP);
-                        set_tsk_thread_flag(p, TIF_SIGPENDING);
-                }
-
-                /*
                  * We set PF_STARTING at creation in case tracing wants to
                  * use this to distinguish a fully live task from one that
                  * hasn't finished SIGSTOP raising yet.  Now we clear it