From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbcCJNmM (ORCPT ); Thu, 10 Mar 2016 08:42:12 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:39015 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbcCJNmJ (ORCPT ); Thu, 10 Mar 2016 08:42:09 -0500 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: paulmck@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Date: Thu, 10 Mar 2016 05:41:46 -0800 From: "Paul E. McKenney" To: Peter Zijlstra Cc: Thomas Gleixner , linux-kernel@vger.kernel.org Subject: Re: [PATCH] rcu: Remove some superfluous lines Message-ID: <20160310134146.GK3452@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com References: <20160310084904.GP6344@twins.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160310084904.GP6344@twins.programming.kicks-ass.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16031013-0013-0000-0000-00001DD987CF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 10, 2016 at 09:49:04AM +0100, Peter Zijlstra wrote: > > I think you'll find this condition is superfluous, as the whole function > is under #ifdef of that same. > > Signed-off-by: Peter Zijlstra (Intel) Right you are! It got moved under that #ifdef in the process of merging the RCU, hotplug, and swait changes, and I failed to notice. Good catch! I will apply this to my tree once -rc1 comes out, as it will apply to -rcu at that point. Or maybe we should remove the #ifdef and add IS_ENABLED() to the other functions under that #ifdef. Thoughts? Thanx, Paul > --- > kernel/rcu/tree.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c > index 4f7369d54de0..dd2646e56456 100644 > --- a/kernel/rcu/tree.c > +++ b/kernel/rcu/tree.c > @@ -4237,9 +4237,6 @@ static void rcu_cleanup_dying_idle_cpu(int cpu, struct rcu_state *rsp) > struct rcu_data *rdp = per_cpu_ptr(rsp->rda, cpu); > struct rcu_node *rnp = rdp->mynode; /* Outgoing CPU's rdp & rnp. */ > > - if (!IS_ENABLED(CONFIG_HOTPLUG_CPU)) > - return; > - > /* Remove outgoing CPU from mask in the leaf rcu_node structure. */ > mask = rdp->grpmask; > raw_spin_lock_irqsave_rcu_node(rnp, flags); /* Enforce GP memory-order guarantee. */ >