---

yaml --- r: 256864 b: refs/heads/master c: 6634ae1 h: refs/heads/master v: v3
git-mirror · Jul 17, 2011 · 27f3c22 · 27f3c22
1 parent 7d9d9c2
commit 27f3c22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 961c4675c75112717705fa5c0c53cb9664051479
+refs/heads/master: 6634ae1033ceaeca5877dd75723210f8c2648c17
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
@@ -217,16 +217,17 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
 {
 	INIT_LIST_HEAD(&child->ptrace_entry);
 	INIT_LIST_HEAD(&child->ptraced);
-	child->parent = child->real_parent;
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+	atomic_set(&child->ptrace_bp_refcnt, 1);
+#endif
+	child->jobctl = 0;
 	child->ptrace = 0;
-	if (unlikely(ptrace) && (current->ptrace & PT_PTRACED)) {
+	child->parent = child->real_parent;
+
+	if (unlikely(ptrace) && current->ptrace) {
 		child->ptrace = current->ptrace;
 		__ptrace_link(child, current->parent);
 	}
-
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-	atomic_set(&child->ptrace_bp_refcnt, 1);
-#endif
 }
 
 /**