From 49a9ecdb493da0e97767b1402aa2f750ad55fdf3 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Sun, 27 Jul 2008 01:08:02 -0700
Subject: [PATCH] --- yaml --- r: 106679 b: refs/heads/master c:
 95698466cf50b707d8a55af87e4dbec56b1533cb h: refs/heads/master i:   106677:
 bfb779ebd07c5084bc97f6eb4ca48bce221332aa   106675:
 10c6fa3b6d52edbeb7d509fda08683d1e7d20276   106671:
 e918d6cc52687cd186826fed99efb8ec69b0d1ab v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sparc64/kernel/signal.c   | 3 +++
 trunk/arch/sparc64/kernel/signal32.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41d163e63127..7eb61a43980a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35a8925e0e7af8b26161a2c161ea31be0296b80
+refs/heads/master: 95698466cf50b707d8a55af87e4dbec56b1533cb
diff --git a/trunk/arch/sparc64/kernel/signal.c b/trunk/arch/sparc64/kernel/signal.c
index 9424fdab306c..d1b84456a9ee 100644
--- a/trunk/arch/sparc64/kernel/signal.c
+++ b/trunk/arch/sparc64/kernel/signal.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/binfmts.h>
 #include <linux/bitops.h>
+#include <linux/tracehook.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -575,6 +576,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 		 * clear the TS_RESTORE_SIGMASK flag.
 		 */
 		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
+
+		tracehook_signal_handler(signr, &info, &ka, regs, 0);
 		return;
 	}
 	if (restart_syscall &&
diff --git a/trunk/arch/sparc64/kernel/signal32.c b/trunk/arch/sparc64/kernel/signal32.c
index 97cdd1bf4a10..ba5b09ad6666 100644
--- a/trunk/arch/sparc64/kernel/signal32.c
+++ b/trunk/arch/sparc64/kernel/signal32.c
@@ -19,6 +19,7 @@
 #include <linux/binfmts.h>
 #include <linux/compat.h>
 #include <linux/bitops.h>
+#include <linux/tracehook.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -794,6 +795,8 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs,
 		 * clear the TS_RESTORE_SIGMASK flag.
 		 */
 		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
+
+		tracehook_signal_handler(signr, &info, &ka, regs, 0);
 		return;
 	}
 	if (restart_syscall &&