diff options
| author | Roland McGrath <roland@redhat.com> | 2008-07-27 04:08:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 20:32:35 -0400 |
| commit | 95698466cf50b707d8a55af87e4dbec56b1533cb (patch) | |
| tree | c7aa313bc7aa43c52e59afc2047d0850a3b60ab4 | |
| parent | e35a8925e0e7af8b26161a2c161ea31be0296b80 (diff) | |
sparc64: tracehook_signal_handler
Call the standard hook after setting up signal handlers.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc64/kernel/signal.c | 3 | ||||
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 9424fdab306c..d1b84456a9ee 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/tty.h> | 23 | #include <linux/tty.h> |
| 24 | #include <linux/binfmts.h> | 24 | #include <linux/binfmts.h> |
| 25 | #include <linux/bitops.h> | 25 | #include <linux/bitops.h> |
| 26 | #include <linux/tracehook.h> | ||
| 26 | 27 | ||
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 28 | #include <asm/ptrace.h> | 29 | #include <asm/ptrace.h> |
| @@ -575,6 +576,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
| 575 | * clear the TS_RESTORE_SIGMASK flag. | 576 | * clear the TS_RESTORE_SIGMASK flag. |
| 576 | */ | 577 | */ |
| 577 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; | 578 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; |
| 579 | |||
| 580 | tracehook_signal_handler(signr, &info, &ka, regs, 0); | ||
| 578 | return; | 581 | return; |
| 579 | } | 582 | } |
| 580 | if (restart_syscall && | 583 | if (restart_syscall && |
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 97cdd1bf4a10..ba5b09ad6666 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/binfmts.h> | 19 | #include <linux/binfmts.h> |
| 20 | #include <linux/compat.h> | 20 | #include <linux/compat.h> |
| 21 | #include <linux/bitops.h> | 21 | #include <linux/bitops.h> |
| 22 | #include <linux/tracehook.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 24 | #include <asm/ptrace.h> | 25 | #include <asm/ptrace.h> |
| @@ -794,6 +795,8 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, | |||
| 794 | * clear the TS_RESTORE_SIGMASK flag. | 795 | * clear the TS_RESTORE_SIGMASK flag. |
| 795 | */ | 796 | */ |
| 796 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; | 797 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; |
| 798 | |||
| 799 | tracehook_signal_handler(signr, &info, &ka, regs, 0); | ||
| 797 | return; | 800 | return; |
| 798 | } | 801 | } |
| 799 | if (restart_syscall && | 802 | if (restart_syscall && |
