diff options
| author | James Morris <jmorris@namei.org> | 2009-06-09 09:27:53 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-09 09:27:53 +1000 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /kernel/ptrace.c | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
| download | talos-obmc-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.gz talos-obmc-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 2 |
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) if (child->ptrace) { child->exit_code = data; dead = __ptrace_detach(current, child); + if (!child->exit_state) + wake_up_process(child); } write_unlock_irq(&tasklist_lock); |
