---

yaml --- r: 24855 b: refs/heads/master c: 85b6bce h: refs/heads/master i: 24853: 4d2509b 24851: bf2b8aa 24847: 7e124a7 v: v3
git-mirror · Mar 31, 2006 · 1635d39 · 1635d39
1 parent e2bdb9f
commit 1635d39
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a75a3f0680d9c4bc4761512658b6fd664032e18
+refs/heads/master: 85b6bce3658a823aa169586fe71ffba0f12ccc71
diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c
@@ -26,8 +26,7 @@ static inline int freezeable(struct task_struct * p)
 	    (p->flags & PF_NOFREEZE) ||
 	    (p->exit_state == EXIT_ZOMBIE) ||
 	    (p->exit_state == EXIT_DEAD) ||
-	    (p->state == TASK_STOPPED) ||
-	    (p->state == TASK_TRACED))
+	    (p->state == TASK_STOPPED))
 		return 0;
 	return 1;
 }

diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -1560,6 +1560,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info)
 	/* Let the debugger run.  */
 	set_current_state(TASK_TRACED);
 	spin_unlock_irq(&current->sighand->siglock);
+	try_to_freeze();
 	read_lock(&tasklist_lock);
 	if (likely(current->ptrace & PT_PTRACED) &&
 	    likely(current->parent != current->real_parent ||