diff --git a/[refs] b/[refs] index 33611a5ad71d..e57293769c13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 087806b1281563e4ae7a5bce3155f894af5f4118 +refs/heads/master: 0347e17739095c58c0194fed6a61aced3536d258 diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h index bb157bdd0c55..eae381d584f9 100644 --- a/trunk/include/linux/ptrace.h +++ b/trunk/include/linux/ptrace.h @@ -136,7 +136,7 @@ extern bool ptrace_may_access(struct task_struct *task, unsigned int mode); static inline int ptrace_reparented(struct task_struct *child) { - return child->real_parent != child->parent; + return !same_thread_group(child->real_parent, child->parent); } static inline void ptrace_unlink(struct task_struct *child)