1 files changed, 6 insertions, 0 deletions

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 500ac6d483a0..056013749157 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -591,6 +591,12 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
         if (clone_flags & CLONE_SETTLS)
                 t->kregs->u_regs[UREG_G7] = regs->u_regs[UREG_I3];
 
+        /* We do not want to accidently trigger system call restart
+         * handling in the new thread.  Therefore, clear out the trap
+         * type, which will make pt_regs_regs_is_syscall() return false.
+         */
+        pt_regs_clear_trap_type(t->kregs);
+
         return 0;
 }