3 files changed, 6 insertions, 8 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 2b55b74cd999..8adfe5ddb688 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1510,7 +1510,7 @@ long do_fork(unsigned long clone_flags,
                 if (!(clone_flags & CLONE_STOPPED))
                         wake_up_new_task(p, clone_flags);
                 else
-                        p->state = TASK_STOPPED;
+                        __set_task_state(p, TASK_STOPPED);
 
                 if (unlikely (trace)) {
                         current->ptrace_message = nr;
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index b0d4ab4dfd3d..74730e0c1be1 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -53,7 +53,7 @@ void ptrace_untrace(struct task_struct *child)
         spin_lock(&child->sighand->siglock);
         if (task_is_traced(child)) {
                 if (child->signal->flags & SIGNAL_STOP_STOPPED) {
-                        child->state = TASK_STOPPED;
+                        __set_task_state(child, TASK_STOPPED);
                 } else {
                         signal_wake_up(child, 1);
                 }
@@ -103,18 +103,16 @@ int ptrace_check_attach(struct task_struct *child, int kill)
             && child->signal != NULL) {
                 ret = 0;
                 spin_lock_irq(&child->sighand->siglock);
-                if (task_is_stopped(child)) {
+                if (task_is_stopped(child))
                         child->state = TASK_TRACED;
-                } else if (!task_is_traced(child) && !kill) {
+                else if (!task_is_traced(child) && !kill)
                         ret = -ESRCH;
-                }
                 spin_unlock_irq(&child->sighand->siglock);
         }
         read_unlock(&tasklist_lock);
 
-        if (!ret && !kill) {
+        if (!ret && !kill)
                 wait_task_inactive(child);
-        }
 
         /* All systems go.. */
         return ret;
diff --git a/kernel/signal.c b/kernel/signal.c
index 6a5f97cd337a..e46971560fcb 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1601,7 +1601,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info)
         current->exit_code = exit_code;
 
         /* Let the debugger run.  */
-        set_current_state(TASK_TRACED);
+        __set_current_state(TASK_TRACED);
         spin_unlock_irq(&current->sighand->siglock);
         try_to_freeze();
         read_lock(&tasklist_lock);