Merge branch 'master' into next

2009-06-09 09:27:53 +10:00
parent 04288f4203 3af968e066
commit 0b4ec6e4e0
353 changed files with 12683 additions and 1550 deletions
--- 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);