---

yaml --- r: 309011 b: refs/heads/master c: 70b58d8 h: refs/heads/master i: 309009: 7bbe9e9 309007: 485ab39 v: v3
git-mirror · May 21, 2012 · 03073f0 · 03073f0
1 parent 6274743
commit 03073f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d181b9626057c1f4fb4d231a3c176271782f459
+refs/heads/master: 70b58d896b1b30e4b89d369fbeb244c0e952cf9f
diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
@@ -932,20 +932,7 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 	 */
 	ip = regs->ARM_ip;
 	regs->ARM_ip = why;
-
-	/* 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;
-	}
+	ptrace_report_syscall(regs);
 	regs->ARM_ip = ip;
 
 	return current_thread_info()->syscall;