summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-03-22 00:33:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 01:54:55 +0100
commitfa47ac59020e91082386f65a01f3e8cc6116ef95 (patch)
tree0dec4f41b6c8c020b1bea7c05fdf32e770b359ce /arch/xtensa
parentseq_file: fix mishandling of consecutive pread() invocations. (diff)
downloadlinux-fa47ac59020e91082386f65a01f3e8cc6116ef95.tar.xz
linux-fa47ac59020e91082386f65a01f3e8cc6116ef95.zip
xtensa: don't reimplement force_sigsegv()
Instead of open coding the sequence from force_sigsegv() just call it. This also fixes a bug because we were modifying ka->sa.sa_handler (which is a copy of sighand->action[]), whereas the intention of the code was to modify sighand->action[] directly. As the original code was working with a copy it had no effect on signal delivery. Acked-by: Oleg Nesterov <oleg@redhat.com> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/signal.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index f2220b5bdce6..4f53770c42ec 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -425,9 +425,7 @@ static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
return;
give_sigsegv:
- if (sig == SIGSEGV)
- ka->sa.sa_handler = SIG_DFL;
- force_sig(SIGSEGV, current);
+ force_sigsegv(sig, current);
}
/*