Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754863AbYHCKu2 (ORCPT ); Sun, 3 Aug 2008 06:50:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751472AbYHCKuS (ORCPT ); Sun, 3 Aug 2008 06:50:18 -0400 Received: from x346.tv-sign.ru ([89.108.83.215]:37118 "EHLO mail.screens.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbYHCKuR (ORCPT ); Sun, 3 Aug 2008 06:50:17 -0400 Date: Sun, 3 Aug 2008 14:53:38 +0400 From: Oleg Nesterov To: oliver.pntr@gmail.com Cc: stable@kernel.org, Roland McGrath , Andrew Morton , Linus Torvalds , linux-kernel@vger.kernel.org Subject: Re: [RFC, 2.6.26.2-rc1] signals: do_signal_stop: kill the SIGNAL_UNKILLABLE check Message-ID: <20080803105338.GB79@tv-sign.ru> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1794 Lines: 45 On 08/02, Oliver Pinter wrote: > > >From 2b201a9eddf509e8e935b45e573648e36f4b623f Mon Sep 17 00:00:00 2001 > From: Oleg Nesterov > Date: Fri, 25 Jul 2008 01:47:31 -0700 > Subject: [PATCH] signals: do_signal_stop: kill the SIGNAL_UNKILLABLE check > > [ Upstream commit 2b201a9eddf509e8e935b45e573648e36f4b623f ] > > fae5fa44f1fd079ffbed8e0add929dd7bbd1347f changed do_signal_stop() to check > SIGNAL_UNKILLABLE, this wasn't needed. If signal_group_exit() == F, the > signal sent to SIGNAL_UNKILLABLE task must be already filtered out by the > caller, get_signal_to_deliver(). And if signal_group_exit() == T we are > not going to stop. > > Signed-off-by: Oleg Nesterov > Acked-by: Roland McGrath > Signed-off-by: Andrew Morton > Signed-off-by: Linus Torvalds > CC: Oliver Pinter > > diff --git a/kernel/signal.c b/kernel/signal.c > index 15f901a..0514da5 100644 > --- a/kernel/signal.c > +++ b/kernel/signal.c > @@ -1649,8 +1649,7 @@ static int do_signal_stop(int signr) > } else { > struct task_struct *t; > > - if (unlikely((sig->flags & (SIGNAL_STOP_DEQUEUED | SIGNAL_UNKILLABLE)) > - != SIGNAL_STOP_DEQUEUED) || > + if (!likely(sig->flags & SIGNAL_STOP_DEQUEUED) || Again, I don't think this minor cleanup is good for -stable. It doesn't fix any bug, it only removes the unnecessary uglification (which was previously added by me in fae5fa44f1fd079ffbed8e0add929dd7bbd1347f). Oleg. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/