From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932518AbZJGLlf (ORCPT ); Wed, 7 Oct 2009 07:41:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759073AbZJGLle (ORCPT ); Wed, 7 Oct 2009 07:41:34 -0400 Received: from mail-px0-f179.google.com ([209.85.216.179]:55006 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758959AbZJGLld (ORCPT ); Wed, 7 Oct 2009 07:41:33 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:mime-version :content-type:content-disposition:user-agent; b=eqcxoJ/rJh9rINYYOxFFs6LLqb2D3CjnHLf8rfJ/Gy792ACDr7NEImszwCfbx32+JC dgymEgsR9VN956LkRmTXPogbJ9cgDSVcqYsLVIYoQxsAGKN9az1cYdCX/ZNallMlmhIh L2Sz/q51n6C86UpJQXJomGFpl6iby9kSlj4Dc= Date: Wed, 7 Oct 2009 19:39:15 +0800 From: Zhenwen Xu To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Frederic Weisbecker , Steven Rostedt Subject: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c Message-ID: <20091007113915.GA5265@helight> Reply-To: Zhenwen Xu MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); 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; 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)) - trace_buffer_unlock_commit(tr, event, 0, 0); + trace_buffer_unlock_commit(buf, event, 0, 0); out: atomic_dec(&tr->data[cpu]->disabled); -- 1.6.3.3 -- -------------------------------- http://zhwen.org - Open and Free