From 1635d396a5eaa2c79cafd05d6730c426583ef6bb Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Fri, 31 Mar 2006 02:30:06 -0800 Subject: [PATCH] --- yaml --- r: 24855 b: refs/heads/master c: 85b6bce3658a823aa169586fe71ffba0f12ccc71 h: refs/heads/master i: 24853: 4d2509bbc1602fb2924a013cef1b0bfdb3472453 24851: bf2b8aac8877fc8ca47711dca6afdc25cc79f1a9 24847: 7e124a7788b310b9927a4fd222c4968fc7bdf3dc v: v3 --- [refs] | 2 +- trunk/kernel/power/process.c | 3 +-- trunk/kernel/signal.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1615afafe9bd..b0a5d27780d8 100644 --- 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 index 8ac7c35fad77..b2a5f671d6cd 100644 --- 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 index 4922928d91f6..92025b108791 100644 --- 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(¤t->sighand->siglock); + try_to_freeze(); read_lock(&tasklist_lock); if (likely(current->ptrace & PT_PTRACED) && likely(current->parent != current->real_parent ||