diff --git a/[refs] b/[refs] index f5c58b4686d5..347edf2ab24c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52af40923fc91a12e3c7152d833e0c0c6a508f6 +refs/heads/master: 06eb23b1ba39c61ee5d5faeb42a097635693e370 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 242a706e7721..43c039d55e95 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1093,7 +1093,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, #ifdef CONFIG_DEBUG_MUTEXES p->blocked_on = NULL; /* not blocked yet */ #endif - if (unlikely(ptrace_reparented(current))) + if (unlikely(current->ptrace)) ptrace_fork(p, clone_flags); /* Perform scheduler related setup. Assign this task to a CPU. */