From ff6d21e7aafe3cf4b20697f67e656caa4daef40b Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 21 Mar 2012 16:33:44 -0700 Subject: xtensa: 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 Cc: Chris Zankel Signed-off-by: Matt Fleming Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/xtensa/kernel/signal.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/xtensa/kernel/signal.c') diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index 4f53770c42ec..24655e31d8fb 100644 --- a/arch/xtensa/kernel/signal.c +++ b/arch/xtensa/kernel/signal.c @@ -536,9 +536,6 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) /* Set up the stack frame */ setup_frame(signr, &ka, &info, oldset, regs); - if (ka.sa.sa_flags & SA_ONESHOT) - ka.sa.sa_handler = SIG_DFL; - spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka.sa.sa_mask); if (!(ka.sa.sa_flags & SA_NODEFER)) -- cgit