Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759403Ab0FJSlO (ORCPT ); Thu, 10 Jun 2010 14:41:14 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:51817 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276Ab0FJSlN (ORCPT ); Thu, 10 Jun 2010 14:41:13 -0400 X-Authority-Analysis: v=1.1 cv=rR912iD8TqKBQWPhXASLR67rt2rT9ApkpBWj5XB9Duc= c=1 sm=0 a=eX2VPhT_8KEA:10 a=uEzv4HemXiYA:10 a=7U3hwN5JcxgA:10 a=Q9fys5e9bTEA:10 a=gMqfjgEr1zLu/65IO0LwxA==:17 a=D4EBODMCcXe7Nzv1V5gA:9 a=MtvAgvWJPsDJci2yuHw0hwP6YKoA:4 a=PUjeQqilurYA:10 a=gMqfjgEr1zLu/65IO0LwxA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.89.75 Subject: Re: [PATCH][RFC] tracing: Use class->reg() for all registering of events From: Steven Rostedt Reply-To: rostedt@goodmis.org To: Srikar Dronamraju Cc: Peter Zijlstra , LKML , Ingo Molnar , Frederic Weisbecker , Masami Hiramatsu , Ananth N Mavinakayanahalli In-Reply-To: <1276024211.15884.107.camel@gandalf.stny.rr.com> References: <1276011215.15884.96.camel@gandalf.stny.rr.com> <1276012661.2046.120.camel@twins> <20100608173559.GE2800@linux.vnet.ibm.com> <1276024211.15884.107.camel@gandalf.stny.rr.com> Content-Type: text/plain; charset="ISO-8859-15" Organization: Kihon Technologies Inc. Date: Thu, 10 Jun 2010 14:41:11 -0400 Message-ID: <1276195271.28329.2.camel@gandalf.stny.rr.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1688 Lines: 49 On Tue, 2010-06-08 at 15:10 -0400, Steven Rostedt wrote: > On Tue, 2010-06-08 at 23:05 +0530, Srikar Dronamraju wrote: > > > On Tue, 2010-06-08 at 11:33 -0400, Steven Rostedt wrote: > > > I tested the patch and it fixed the regression where > > perf record -e probe:do_fork -aR sleep 1 would fail. > > > > Thanks! Unfortunately the patch does two things, one is to fix this > regression, the other is a clean up. Linus is currently only wanting > fixes now and may not accept the clean up part of this patch. Can you > test the patch below. It only addresses the regression. > Peter, Can I get an Acked-by from you on this patch? I know you acked the clean up version. But this is a minimal fix for .35. We'll add the clean up version to .36. Thanks, -- Steve > diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c > index e6f6588..8a2b73f 100644 > --- a/kernel/trace/trace_event_perf.c > +++ b/kernel/trace/trace_event_perf.c > @@ -96,7 +96,9 @@ int perf_trace_init(struct perf_event *p_event) > mutex_lock(&event_mutex); > list_for_each_entry(tp_event, &ftrace_events, list) { > if (tp_event->event.type == event_id && > - tp_event->class && tp_event->class->perf_probe && > + tp_event->class && > + (tp_event->class->perf_probe || > + tp_event->class->reg) && > try_module_get(tp_event->mod)) { > ret = perf_trace_event_init(tp_event, p_event); > break; > -- 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/