Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 8368b0e0 authored Mar 28, 2012 by Matt Fleming Committed by Paul Mundt Mar 29, 2012

sh: 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 had
no effect on signal delivery.

Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent b448d6ad

arch/sh/kernel/signal_32.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -548,9 +548,6 @@ handle_signal(unsigned long sig, struct k_sigaction ka, siginfo_t info,
	else		else
	ret = setup_frame(sig, ka, oldset, regs);		ret = setup_frame(sig, ka, oldset, regs);

	if (ka->sa.sa_flags & SA_ONESHOT)
	ka->sa.sa_handler = SIG_DFL;

	if (ret == 0) {		if (ret == 0) {
	spin_lock_irq(&current->sighand->siglock);		spin_lock_irq(&current->sighand->siglock);
	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);

arch/sh/kernel/signal_64.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -734,9 +734,6 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
	else		else
	ret = setup_frame(sig, ka, oldset, regs);		ret = setup_frame(sig, ka, oldset, regs);

	if (ka->sa.sa_flags & SA_ONESHOT)
	ka->sa.sa_handler = SIG_DFL;

	if (ret == 0) {		if (ret == 0) {
	spin_lock_irq(&current->sighand->siglock);		spin_lock_irq(&current->sighand->siglock);
	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);