diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-03-21 16:33:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 17:54:55 -0700 |
| commit | ff6d21e7aafe3cf4b20697f67e656caa4daef40b (patch) | |
| tree | 9a2a0060088f1b97533c21dfaafdfaca1794873e | |
| parent | fa47ac59020e91082386f65a01f3e8cc6116ef95 (diff) | |
| download | linux-ff6d21e7aafe3cf4b20697f67e656caa4daef40b.tar.gz | |
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 <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>
| -rw-r--r-- | arch/xtensa/kernel/signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
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)) |