diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-19 12:52:53 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:17:58 +0300 |
| commit | 9beeaa2d689842f7760aa16c512e6bb8182d38b6 (patch) | |
| tree | 62cea0772127c4b1c0b476e46dec6830d36809c1 /kernel/ptrace.c | |
| parent | 3246af0ece6c61689847417977733f0b12dc4b6f (diff) | |
| parent | a1645ce12adb6c9cc9e19d7695466204e3f017fe (diff) | |
| download | blackbird-obmc-linux-9beeaa2d689842f7760aa16c512e6bb8182d38b6.tar.gz blackbird-obmc-linux-9beeaa2d689842f7760aa16c512e6bb8182d38b6.zip | |
Merge branch 'perf'
Signed-off-by: Avi Kivity <avi@redhat.com>
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) child->parent = child->real_parent; list_del_init(&child->ptrace_entry); - arch_ptrace_untrace(child); if (task_is_traced(child)) ptrace_untrace(child); } |
