diff --git a/[refs] b/[refs]
index 6072adead1c4..20b2eb8cfbfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0c0b649d67aa775aa9851de61aade17504be70c
+refs/heads/master: 6405f7f4675884b671bee66678e1c2859bdb0e56
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 6d6d1ab39e7e..678bffa437c1 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1638,11 +1638,11 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info)
 	} else {
 		/*
 		 * By the time we got the lock, our tracer went away.
-		 * Don't stop here.
+		 * Don't drop the lock yet, another tracer may come.
 		 */
-		read_unlock(&tasklist_lock);
-		set_current_state(TASK_RUNNING);
+		__set_current_state(TASK_RUNNING);
 		current->exit_code = nostop_code;
+		read_unlock(&tasklist_lock);
 	}
 
 	/*