From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756879AbZJHBKS (ORCPT ); Wed, 7 Oct 2009 21:10:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756836AbZJHBKR (ORCPT ); Wed, 7 Oct 2009 21:10:17 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:45250 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756834AbZJHBKQ (ORCPT ); Wed, 7 Oct 2009 21:10:16 -0400 Subject: Re: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c From: Steven Rostedt Reply-To: rostedt@goodmis.org To: Li Zefan Cc: Zhenwen Xu , linux-kernel@vger.kernel.org, Ingo Molnar , Frederic Weisbecker In-Reply-To: <4ACD37C7.4060305@cn.fujitsu.com> References: <20091007113915.GA5265@helight> <4ACD37C7.4060305@cn.fujitsu.com> Content-Type: text/plain Organization: Kihon Technologies Inc. Date: Wed, 07 Oct 2009 21:08:17 -0400 Message-Id: <1254964097.1696.196.camel@gandalf.stny.rr.com> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2009-10-08 at 08:52 +0800, Li Zefan wrote: > Zhenwen Xu wrote: > > fix warnings that caused the API change of trace_buffer_lock_reserve() > > change files: kernel/trace/trace_hw_branch.c > > kernel/trace/trace_branch.c > > > > Signed-off-by: Zhenwen Xu > > --- > > kernel/trace/trace_branch.c | 2 +- > > kernel/trace/trace_hw_branches.c | 6 ++++-- > > 2 files changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c > > index 7a7a9fd..216e2dd 100644 > > --- a/kernel/trace/trace_branch.c > > +++ b/kernel/trace/trace_branch.c > > @@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) > > goto out; > > > > pc = preempt_count(); > > - event = trace_buffer_lock_reserve(tr, TRACE_BRANCH, > > + event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH, > > sizeof(*entry), flags, pc); > > As Steven has picked up the previous patch, this part can be removed now. Actually, you can keep it in. Since I noticed that this requires the local "buffer" variable, I decided not to pull it in yet. > > > if (!event) > > goto out; > > diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c > > index 23b6385..e40f5fb 100644 > > --- a/kernel/trace/trace_hw_branches.c > > +++ b/kernel/trace/trace_hw_branches.c > > @@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to) > > struct ftrace_event_call *call = &event_hw_branch; > > struct trace_array *tr = hw_branch_trace; > > struct ring_buffer_event *event; > > + struct ring_buffer *buf; > > Just use one space: > > + struct ring_buffer *buf; > > > struct hw_branch_entry *entry; > > unsigned long irq1; > > int cpu; > > @@ -180,7 +181,8 @@ void trace_hw_branch(u64 from, u64 to) > > if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) > > goto out; > > > > - event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES, > > + buf = tr->buffer > > + event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES, > > sizeof(*entry), 0, 0); > > if (!event) > > goto out; > > @@ -190,7 +192,7 @@ void trace_hw_branch(u64 from, u64 to) > > entry->from = from; > > entry->to = to; > > if (!filter_check_discard(call, entry, tr->buffer, event)) > > s/tr->buffer/buf > > > - trace_buffer_unlock_commit(tr, event, 0, 0); > > + trace_buffer_unlock_commit(buf, event, 0, 0); > > > > out: > > atomic_dec(&tr->data[cpu]->disabled); > > Otherwise looks good. Yep, I agree. Looking for the second patch with both files updated. Thanks, -- Steve