1 files changed, 5 insertions, 1 deletions

diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index c5b33634c980..77fc7c16bf48 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -179,7 +179,11 @@ do_signal_return:
         addql   #8,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
-        jbra    resume_userspace
+        tstl    %d0
+        jeq     resume_userspace
+        | when single stepping into handler stop at the first insn
+        btst    #6,%curptr@(TASK_INFO+TINFO_FLAGS+2)
+        jeq     resume_userspace
 
 do_delayed_trace:
         bclr    #7,%sp@(PT_OFF_SR)      | clear trace bit in SR