Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932357AbZDCOg4 (ORCPT ); Fri, 3 Apr 2009 10:36:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762335AbZDCOgn (ORCPT ); Fri, 3 Apr 2009 10:36:43 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:38838 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765063AbZDCOgm (ORCPT ); Fri, 3 Apr 2009 10:36:42 -0400 Date: Fri, 3 Apr 2009 10:36:39 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Ingo Molnar cc: linux-kernel@vger.kernel.org, Andrew Morton , Thomas Gleixner , Peter Zijlstra , Tom Zanussi , Frederic Weisbecker Subject: Re: [PATCH 0/4] [GIT PULL] for tip/tracing/filters In-Reply-To: <20090403121434.GJ31399@elte.hu> Message-ID: References: <20090402052721.013878388@goodmis.org> <20090403121434.GJ31399@elte.hu> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1962 Lines: 56 On Fri, 3 Apr 2009, Ingo Molnar wrote: > > * Steven Rostedt wrote: > > > > > Ingo, > > > > Please pull the latest tip/tracing/filters tree, which can be found at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git > > tip/tracing/filters > > > > > > Steven Rostedt (2): > > ring-buffer: add ring_buffer_discard_commit > > tracing/filters: use ring_buffer_discard_commit for discarded events > > > > Tom Zanussi (2): > > tracing/filters: add run-time field descriptions to TRACE_EVENT_FORMAT events > > tracing/filters: add TRACE_EVENT_FORMAT_NOFILTER event macro > > I've cherry-picked them into tip/tracing/filters, and there are some > new build failures: > > (.text+0x40795): undefined reference to `event_context_switch' > kernel/built-in.o: In function `probe_power_mark': > trace_power.c:(.text+0x44fd7): undefined reference to `event_power' > trace_power.c:(.text+0x44fe1): undefined reference to `event_power' > trace_power.c:(.text+0x44fe6): undefined reference to > `filter_match_preds' > kernel/built-in.o: In function `probe_power_end': > trace_power.c:(.text+0x45064): undefined reference to `event_power' > trace_power.c:(.text+0x4506e): undefined reference to `event_power' > trace_power.c:(.text+0x45073): undefined reference to > `filter_match_preds' > kernel/built-in.o: In function `kmemtrace_free': > > so i've excluded it from tip/master for now. I figured that is due to the missing pieces from the ftrace merge I did. But I guess we want to tone down on the inter merging of branches. Tom, could you check out the tracing/filters branch from tip and get that branch working. Thanks, -- Steve -- 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/