Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6a65dff authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

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@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a1922ed6

kernel/trace/trace_ksym.c

+5 −4
Original line number Diff line number Diff line
@@ -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