[PATCH] fix a warning on kernel/trace/trace_branch.c

From: Zhenwen Xu
Date: Wed Oct 07 2009 - 02:42:19 EST


fix this warning:

kernel/trace/trace_branch.c: In function âprobe_likely_conditionâ:
kernel/trace/trace_branch.c:58: warning: passing argument 1 of â
trace_buffer_lock_reserveâ from incompatible pointer type

The "tr" should be "(struct buffer *)tr" or "tr->buffer" here!!!

Signed-off-by: Zhenwen Xu <helight.xu@xxxxxxxxx>
---
kernel/trace/trace_branch.c | 2 +-
1 files changed, 1 insertions(+), 1 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;
--
1.6.3.3

--
--------------------------------
http://zhwen.org - Open and Free
--
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/