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

Commit 33fddff2 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Have trace_buffer_unlock_commit() call the _regs version with NULL 



There's no real difference between trace_buffer_unlock_commit() and
trace_buffer_unlock_commit_regs() except that the former passes NULL to
ftrace_stack_trace() instead of regs. Have the former be a static inline of
the latter which passes NULL for regs.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent a9fe48dc

kernel/trace/trace.c

+0 −11
Original line number Diff line number Diff line
@@ -1686,17 +1686,6 @@ __buffer_unlock_commit(struct ring_buffer *buffer, struct ring_buffer_event *eve 
	ring_buffer_unlock_commit(buffer, event);

}



void trace_buffer_unlock_commit(struct trace_array *tr,

				struct ring_buffer *buffer,

				struct ring_buffer_event *event,

				unsigned long flags, int pc)

{

	__buffer_unlock_commit(buffer, event);



	ftrace_trace_stack(tr, buffer, flags, 6, pc, NULL);

	ftrace_trace_userstack(buffer, flags, pc);

}



static struct ring_buffer *temp_buffer;



struct ring_buffer_event *

kernel/trace/trace.h

+9 −4
Original line number Diff line number Diff line
@@ -1069,15 +1069,20 @@ extern int call_filter_check_discard(struct trace_event_call *call, void *rec, 
				     struct ring_buffer *buffer,

				     struct ring_buffer_event *event);



void trace_buffer_unlock_commit(struct trace_array *tr,

				struct ring_buffer *buffer,

				struct ring_buffer_event *event,

				unsigned long flags, int pc);

void trace_buffer_unlock_commit_regs(struct trace_array *tr,

				     struct ring_buffer *buffer,

				     struct ring_buffer_event *event,

				     unsigned long flags, int pc,

				     struct pt_regs *regs);



static inline void trace_buffer_unlock_commit(struct trace_array *tr,

					      struct ring_buffer *buffer,

					      struct ring_buffer_event *event,

					      unsigned long flags, int pc)

{

	trace_buffer_unlock_commit_regs(tr, buffer, event, flags, pc, NULL);

}



/*

 * Helper function for event_trigger_unlock_commit{_regs}().

 * If there are event triggers attached to this event that requires