Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753522AbbGFJlY (ORCPT ); Mon, 6 Jul 2015 05:41:24 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:37062 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbbGFJlX (ORCPT ); Mon, 6 Jul 2015 05:41:23 -0400 Date: Mon, 6 Jul 2015 11:41:17 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Riku Voipio , Rusty Russell , Peter Zijlstra , mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org, "Paul E. McKenney" Subject: Re: [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h usable in user-space Message-ID: <20150706094117.GA15868@gmail.com> References: <20150617060952.GA5375@kos.to> <20150617091703.GA2883@gmail.com> <20150706181332.0f7f61f7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150706181332.0f7f61f7@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1947 Lines: 53 * Stephen Rothwell wrote: > Hi Ingo, > > On Wed, 17 Jun 2015 11:17:04 +0200 Ingo Molnar wrote: > > > > * Riku Voipio wrote: > > > > > The commit: > > > > > > commit d72da4a4d973d8a0a0d3c97e7cdebf287fbe3a99 > > > Author: Peter Zijlstra > > > Date: Wed May 27 11:09:36 2015 +0930 > > > > > > rbtree: Make lockless searches non-fatal > > > > > > Adds to rbtree.h, which in turn is included from perf userspace > > > headers. Now building tools/perf will fail with hundreds of lines of gcc complaining > > > about kernel defines not available. Reverting the patch makes perf build again. > > > This is with gcc-4.9 from debian but I don't think it's compiler specific. > > > > Does the patch below make things work? > > > > This fix could go into the modules tree, as this commit came via Rusty. > > > > Stephen, feel free to add: > > > > make -C tools/perf > > > > to the linux-next build tests. It's always supposed to build without failure, in > > pretty much whatever x86 distro you run your build tests on. > > OK, I have started doing that, but int order to make it build at all, I > have added the patch below to my fixes tree (since the breakage is now > in Linus' tree). > > This means that it will get a conflict with the tip tree tomorrow, but > I will just fix the conflict by using the version from the tip tree. > Once the tip tree fixes are sent to Linus, I will drop this patch from > my fixes tree. On next linux-next iteration you should be able to just drop your merge conflict resolution, and use the -tip tree as-is with no extra fixups. Thanks, Ingo -- 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/