From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751617AbaESU41 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 19 May 2014 16:56:27 -0400
Received: from g2t2354.austin.hp.com ([15.217.128.53]:8385 "EHLO
	g2t2354.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750851AbaESU4W (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 19 May 2014 16:56:22 -0400
Message-ID: <1400532980.6399.0.camel@buesod1.americas.hpqcorp.net>
Subject: Re: linux-next: build warning after merge of the akpm tree
From: Davidlohr Bueso <davidlohr@hp.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Tim Chen <tim.c.chen@linux.intel.com>
Date: Mon, 19 May 2014 13:56:20 -0700
In-Reply-To: <20140519124850.7d4470e179c237552f363658@linux-foundation.org>
References: <20140519181314.1b92c548@canb.auug.org.au>
	 <1400512396.2560.9.camel@buesod1.americas.hpqcorp.net>
	 <20140519124850.7d4470e179c237552f363658@linux-foundation.org>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.6.4 (3.6.4-3.fc18) 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 2014-05-19 at 12:48 -0700, Andrew Morton wrote:
> On Mon, 19 May 2014 08:13:16 -0700 Davidlohr Bueso <davidlohr@hp.com> wrote:
> 
> > > Presumably a result of commit fe2038c57c03 ("rwsem: Support optimistic
> > > spinning").
> > 
> > If CONFIG_SMP, we add two new fields to the rwsem structure
> > (include/linux/rwsem.h) and likewise we update the
> > __RWSEM_INITIALIZER(name) macro. Afaict the only way to trigger
> > something like that is to be using the spinlock variant
> > (rwsem-spinlock.h).
> > 
> > The fix for that would be:
> > 
> > diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
> > index 3e108f1..091d993 100644
> > --- a/include/linux/rwsem.h
> > +++ b/include/linux/rwsem.h
> > @@ -64,7 +64,7 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)
> >  # define __RWSEM_DEP_MAP_INIT(lockname)
> >  #endif
> >  
> > -#ifdef CONFIG_SMP
> > +#if defined(CONFIG_SMP) && defined(CONFIG_RWSEM_XCHGADD_ALGORITHM)
> >  #define __RWSEM_INITIALIZER(name)                      \
> >         { RWSEM_UNLOCKED_VALUE,                         \
> >           __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),     \
> 
> that squishes the warnings for me.

You guys know best, but shouldn't this change be routed through -tip?