freezer,sched: Rewrite core freezer logic

[linux-2.6-block.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 1893d909e45ca6c575efb105ce12f35da7eadbb7..54482193e1edc2c665a8f32f08c4d81300757dbc 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -269,7 +269,7 @@ static int ptrace_check_attach(struct task_struct *child, bool ignore_state)
        read_unlock(&tasklist_lock);
 
        if (!ret && !ignore_state &&
-           WARN_ON_ONCE(!wait_task_inactive(child, __TASK_TRACED)))
+           WARN_ON_ONCE(!wait_task_inactive(child, __TASK_TRACED|TASK_FROZEN)))
                ret = -ESRCH;
 
        return ret;