From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756502Ab1HSQr6 (ORCPT ); Fri, 19 Aug 2011 12:47:58 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:57320 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756379Ab1HSQrx (ORCPT ); Fri, 19 Aug 2011 12:47:53 -0400 From: Matt Fleming To: Oleg Nesterov Cc: linux-kernel@vger.kernel.org, Jonas Bonn , Arnd Bergmann Subject: [PATCH v2 21/43] OpenRISC: No need to reset handler if SA_ONESHOT Date: Fri, 19 Aug 2011 17:46:37 +0100 Message-Id: <1313772419-21951-22-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1313772419-21951-1-git-send-email-matt@console-pimps.org> References: <1313772419-21951-1-git-send-email-matt@console-pimps.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming 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: Jonas Bonn Cc: Arnd Bergmann Signed-off-by: Matt Fleming --- arch/openrisc/kernel/signal.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c index c023db9..2f75e74 100644 --- a/arch/openrisc/kernel/signal.c +++ b/arch/openrisc/kernel/signal.c @@ -267,9 +267,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(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); if (!(ka->sa.sa_flags & SA_NODEFER)) -- 1.7.4.4