diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-17 22:26:53 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-18 00:35:23 -0400 |
| commit | f0218b3e9974f06014b61be8987159f4a20e011e (patch) | |
| tree | 29a593c4d71ab18cb0c450a34e79bf6bea66877e /kernel/ptrace.c | |
| parent | 1eaa4787a774c4896518c81f24e8bccaa2244924 (diff) | |
| parent | 9d192e118a094087494997ea1c8a2faf39af38c5 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6
Conflicts:
include/trace/ftrace.h
kernel/trace/trace_kprobe.c
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 42ad8ae729a0..9fb51237b18c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -76,7 +76,6 @@ void __ptrace_unlink(struct task_struct *child) | |||
| 76 | child->parent = child->real_parent; | 76 | child->parent = child->real_parent; |
| 77 | list_del_init(&child->ptrace_entry); | 77 | list_del_init(&child->ptrace_entry); |
| 78 | 78 | ||
| 79 | arch_ptrace_untrace(child); | ||
| 80 | if (task_is_traced(child)) | 79 | if (task_is_traced(child)) |
| 81 | ptrace_untrace(child); | 80 | ptrace_untrace(child); |
| 82 | } | 81 | } |