From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756328Ab1HSQrX (ORCPT ); Fri, 19 Aug 2011 12:47:23 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:57255 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751160Ab1HSQrW (ORCPT ); Fri, 19 Aug 2011 12:47:22 -0400 From: Matt Fleming To: Oleg Nesterov Cc: linux-kernel@vger.kernel.org, Hans-Christian Egtvedt , Havard Skinnemoen Subject: [PATCH v2 06/43] avr32: Use block_sigmask() Date: Fri, 19 Aug 2011 17:46:22 +0100 Message-Id: <1313772419-21951-7-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 Use the new helper function block_sigmask() which centralises the code for updating current->blocked after successfully delivering a signal and reduces the amount of duplicate code across architectures. In the past some architectures got this code wrong, so using this helper function should stop that from happening again. Cc: Oleg Nesterov Cc: Hans-Christian Egtvedt Cc: Havard Skinnemoen Signed-off-by: Matt Fleming --- v2 of this patch depends on "[PATCH 01/43] signal: Add block_sigmask() for adding sigmask to current->blocked" so they need to go through the same tree but this patch would benefit from some maintainer ACK's. arch/avr32/kernel/signal.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index 06f4293..feeb77b 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c @@ -223,7 +223,6 @@ static inline void handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs, int syscall) { - sigset_t blocked; int ret; /* @@ -244,10 +243,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, /* * Block the signal if we were successful. */ - sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask); - if (!(ka->sa.sa_flags & SA_NODEFER)) - sigaddset(&blocked, sig); - set_current_blocked(&blocked); + block_sigmask(ka, sig); } /* -- 1.7.4.4