]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
microblaze: No need to reset handler if SA_ONESHOT
authorMatt Fleming <matt.fleming@intel.com>
Fri, 19 Aug 2011 16:46:31 +0000 (17:46 +0100)
committerOleg Nesterov <oleg@redhat.com>
Wed, 24 Aug 2011 18:13:05 +0000 (20:13 +0200)
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: Oleg Nesterov <oleg@redhat.com>
arch/microblaze/kernel/signal.c

index 90de06da3f6fc548873d374d332d4000a8653b8d..9e749c032af8086bd69390f5275fea523c39aaa2 100644 (file)
@@ -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,