diff --git a/[refs] b/[refs]
index bcd9bea3227c..f5701e9b3d47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6a47cc2ccf9649ee09eeddd70a6d061bde69568
+refs/heads/master: 6580807da14c423f0d0a708108e6df6ebc8bc83d
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index b6cbd33dde80..202a0ba63d3c 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1210,9 +1210,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 		p->sas_ss_sp = p->sas_ss_size = 0;
 
 	/*
-	 * Syscall tracing should be turned off in the child regardless
-	 * of CLONE_PTRACE.
+	 * Syscall tracing and stepping should be turned off in the
+	 * child regardless of CLONE_PTRACE.
 	 */
+	user_disable_single_step(p);
 	clear_tsk_thread_flag(p, TIF_SYSCALL_TRACE);
 #ifdef TIF_SYSCALL_EMU
 	clear_tsk_thread_flag(p, TIF_SYSCALL_EMU);