X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fptrace.c;h=9254ba2f46fc147b756407d6d21fdff16a117f84;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=b145c7e1fca858018e5220ac997b1649ea304ce6;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index b145c7e1f..9254ba2f4 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -812,18 +812,34 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 {
 	unsigned long ip;
 
-	if (test_thread_flag(TIF_SYSCALL_TRACE)) {
-		/*
-		 * Save IP.  IP is used to denote syscall entry/exit:
-		 *  IP = 0 -> entry, = 1 -> exit
-		 */
-		ip = regs->ARM_ip;
-		regs->ARM_ip = why;
-
-		tracehook_report_syscall(regs, why);
-
-		regs->ARM_ip = ip;
+	if (!test_thread_flag(TIF_SYSCALL_TRACE))
+		return scno;
+	if (!(current->ptrace & PT_PTRACED))
+		return scno;
+
+	/*
+	 * Save IP.  IP is used to denote syscall entry/exit:
+	 *  IP = 0 -> entry, = 1 -> exit
+	 */
+	ip = regs->ARM_ip;
+	regs->ARM_ip = why;
+
+	current->ptrace_message = scno;
+
+	/* the 0x80 provides a way for the tracing parent to distinguish
+	   between a syscall stop and SIGTRAP delivery */
+	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+				 ? 0x80 : 0));
+	/*
+	 * this isn't the same as continuing with a signal, but it will do
+	 * for normal use.  strace only continues with a signal if the
+	 * stopping signal is not SIGTRAP.  -brl
+	 */
+	if (current->exit_code) {
+		send_sig(current->exit_code, current, 1);
+		current->exit_code = 0;
 	}
+	regs->ARM_ip = ip;
 
-	return scno;
+	return current->ptrace_message;
 }