aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze/kernel
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-05-11 10:58:04 +1000
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-21 23:52:33 -0400
commita12c3694aeb0321d5e6a50321c63881bd92a1bf2 (patch)
tree3ba754f5809032912f9f11c58447ce99f289521d /arch/microblaze/kernel
parentde8f2ddd69fc817b66138b36d656a2973d6afd8a (diff)
downloadlinux-linaro-stable-a12c3694aeb0321d5e6a50321c63881bd92a1bf2.tar.gz
microblaze: no need to reset handler if SA_ONESHOT
get_signal_to_deliver() already resets the signal handler if SA_ONESHOT is set in ka->sa.sa_flags, there's no need to do it again in handle_signal(). Furthermore, because we were modifying ka->sa.sa_handler (which is a copy of sighand->action[]) instead of sighand->action[] the original code actually had no effect on signal delivery. Acked-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r--arch/microblaze/kernel/signal.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 90de06da3f6f..9e749c032af8 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -320,9 +320,6 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
else
setup_rt_frame(sig, ka, NULL, oldset, regs);
- if (ka->sa.sa_flags & SA_ONESHOT)
- ka->sa.sa_handler = SIG_DFL;
-
if (!(ka->sa.sa_flags & SA_NODEFER)) {
spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked,