lkml.org 
[lkml]   [2009]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c
On Wed, Oct 07, 2009 at 07:39:15PM +0800, 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 <helight.xu@gmail.com>
> ---
> 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);



Your change in kernel/trace/trace_hw_branches.c is fine, because
you have handled the fact the buffer can be changed and then
saved it in a temporary var.

But you forgot to do it in trace_branch.c

Frederic.



\
 
 \ /
  Last update: 2009-10-07 17:49    [W:1.180 / U:0.640 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site