Re: [PATCH V4] fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

From: Li Zefan
Date: Wed Oct 07 2009 - 21:40:16 EST


>> diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
>> index 23b6385..52a5903 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

And here won't compile..

>> + event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
>> sizeof(*entry), 0, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/