---

yaml --- r: 139698 b: refs/heads/master c: 1ee1184 h: refs/heads/master v: v3
git-mirror · Apr 3, 2009 · aad48f7 · aad48f7
1 parent 00411cf
commit aad48f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95a3540da9c81a5987be810e1d9a83640a366bd5
+refs/heads/master: 1ee1184485df9c9a3503d3a684b911fb7c73d259
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
@@ -60,11 +60,15 @@ static void ptrace_untrace(struct task_struct *child)
 {
 	spin_lock(&child->sighand->siglock);
 	if (task_is_traced(child)) {
-		if (child->signal->flags & SIGNAL_STOP_STOPPED) {
+		/*
+		 * If the group stop is completed or in progress,
+		 * this thread was already counted as stopped.
+		 */
+		if (child->signal->flags & SIGNAL_STOP_STOPPED ||
+		    child->signal->group_stop_count)
 			__set_task_state(child, TASK_STOPPED);
-		} else {
+		else
 			signal_wake_up(child, 1);
-		}
 	}
 	spin_unlock(&child->sighand->siglock);
 }