Commit-ID: d6a65dffb30d8636b1e5d4c201564ef401a246cf
Gitweb: http://git.kernel.org/tip/d6a65dffb30d8636b1e5d4c201564ef401a246cf
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
AuthorDate: Mon, 7 Sep 2009 03:23:20 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 7 Sep 2009 08:22:10 +0200
tracing: Fix ring-buffer and ksym tracer merge interaction
The compiler warns us about:
kernel/trace/trace_ksym.c: In function ksym_hbp_handler:
kernel/trace/trace_ksym.c:92: attention : passing argument 1 of trace_buffer_lock_reserve from incompatible pointer type
kernel/trace/trace_ksym.c:106: attention : passing argument 1 of trace_buffer_unlock_commit from incompatible pointer type
Commit "e77405ad" (tracing: pass around ring buffer
instead of tracer) has changed the central tracing
APIs. And this change has updated every callsites of
these APIs except those that aren't in tracing/core,
such as the ksym tracer.
Cc: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/trace/trace_ksym.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index 2fde875..6d5609c 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -78,17 +78,18 @@ void ksym_collect_stats(unsigned long hbp_hit_addr)
void ksym_hbp_handler(struct hw_breakpoint *hbp, struct pt_regs *regs)
{
struct ring_buffer_event *event;
- struct trace_array *tr;
struct ksym_trace_entry *entry;
+ struct ring_buffer *buffer;
int pc;
if (!ksym_tracing_enabled)
return;
- tr = ksym_trace_array;
+ buffer = ksym_trace_array->buffer;
+
pc = preempt_count();
- event = trace_buffer_lock_reserve(tr, TRACE_KSYM,
+ event = trace_buffer_lock_reserve(buffer, TRACE_KSYM,
sizeof(*entry), 0, pc);
if (!event)
return;
@@ -103,7 +104,7 @@ void ksym_hbp_handler(struct hw_breakpoint *hbp, struct pt_regs *regs)
ksym_collect_stats(hbp->info.address);
#endif /* CONFIG_PROFILE_KSYM_TRACER */
- trace_buffer_unlock_commit(tr, event, 0, pc);
+ trace_buffer_unlock_commit(buffer, event, 0, pc);
}
/* Valid access types are represented as
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|