aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/ptrace.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-08 19:27:53 -0400
committerJames Morris <jmorris@namei.org>2009-06-08 19:27:53 -0400
commit0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch)
tree1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /kernel/ptrace.c
parent04288f42033607099cebf5ca15ce8dcec3a9688b (diff)
parent3af968e066d593bc4dacc021715f3e95ddf0996f (diff)
Merge branch 'master' into next
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r--kernel/ptrace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 27ac80298bfa..43a5a3b0be79 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -305,6 +305,8 @@ int ptrace_detach(struct task_struct *child, unsigned int data)
305 if (child->ptrace) { 305 if (child->ptrace) {
306 child->exit_code = data; 306 child->exit_code = data;
307 dead = __ptrace_detach(current, child); 307 dead = __ptrace_detach(current, child);
308 if (!child->exit_state)
309 wake_up_process(child);
308 } 310 }
309 write_unlock_irq(&tasklist_lock); 311 write_unlock_irq(&tasklist_lock);
310 312