aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c4
-rw-r--r--kernel/ptrace.c10
2 files changed, 2 insertions, 12 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 660c2b8765bc..69bde7a22e9b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1086,8 +1086,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
1086#ifdef CONFIG_DEBUG_MUTEXES 1086#ifdef CONFIG_DEBUG_MUTEXES
1087 p->blocked_on = NULL; /* not blocked yet */ 1087 p->blocked_on = NULL; /* not blocked yet */
1088#endif 1088#endif
1089 if (unlikely(current->ptrace)) 1089
1090 ptrace_fork(p, clone_flags); 1090 p->bts = NULL;
1091 1091
1092 /* Perform scheduler related setup. Assign this task to a CPU. */ 1092 /* Perform scheduler related setup. Assign this task to a CPU. */
1093 sched_fork(p, clone_flags); 1093 sched_fork(p, clone_flags);
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index aaad0ec34194..321127d965c2 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -27,16 +27,6 @@
27 27
28 28
29/* 29/*
30 * Initialize a new task whose father had been ptraced.
31 *
32 * Called from copy_process().
33 */
34void ptrace_fork(struct task_struct *child, unsigned long clone_flags)
35{
36 arch_ptrace_fork(child, clone_flags);
37}
38
39/*
40 * ptrace a task: make the debugger its new parent and 30 * ptrace a task: make the debugger its new parent and
41 * move it to the ptrace list. 31 * move it to the ptrace list.
42 * 32 *