---

yaml
---
r: 96325
b: refs/heads/master
c: 8513c42
h: refs/heads/master
i:
  96323: a49803e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d39270d31b91647722823a0919164dea9fd4ad7
+refs/heads/master: 8513c42edb3f1c91a8418fae11846c87cf7b8581

trunk/arch/blackfin/kernel/signal.c

@@ -42,6 +42,9 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+/* Location of the trace bit in SYSCFG. */
+#define TRACE_BITS 0x0001
+
 struct fdpic_func_descriptor {
 	unsigned long	text;
 	unsigned long	GOT;
@@ -225,6 +228,16 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
 	regs->r1 = (unsigned long)(&frame->info);
 	regs->r2 = (unsigned long)(&frame->uc);
 
+	/*
+	 * Clear the trace flag when entering the signal handler, but
+	 * notify any tracer that was single-stepping it. The tracer
+	 * may want to single-step inside the handler too.
+	 */
+	if (regs->syscfg & TRACE_BITS) {
+		regs->syscfg &= ~TRACE_BITS;
+		ptrace_notify(SIGTRAP);
+	}
+
 	return 0;
 
  give_sigsegv: