]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
OpenRISC: No need to reset handler if SA_ONESHOT
authorMatt Fleming <matt.fleming@intel.com>
Tue, 14 Feb 2012 11:40:55 +0000 (11:40 +0000)
committerJonas Bonn <jonas@southpole.se>
Fri, 17 Feb 2012 08:55:23 +0000 (09:55 +0100)
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>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux@lists.openrisc.net
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Jonas Bonn <jonas@southpole.se>
arch/openrisc/kernel/signal.c

index 53741ba0210e16e1b5e70886bd76e0f32b14c307..92d2218fcb97d5ddc277a2ab8808f2f5444847ef 100644 (file)
@@ -260,9 +260,6 @@ handle_signal(unsigned long sig,
 {
        setup_rt_frame(sig, ka, info, oldset, regs);
 
-       if (ka->sa.sa_flags & SA_ONESHOT)
-               ka->sa.sa_handler = SIG_DFL;
-
        spin_lock_irq(&current->sighand->siglock);
        sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
        if (!(ka->sa.sa_flags & SA_NODEFER))