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

tracing: Remove ftrace_trace_stack_regs() 



ftrace_trace_stack_regs() is used in only one place, and because that is
such a simple function, just move its code into the location that it was
used in (trace_buffer_unlock_commit_regs()).

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

kernel/trace/trace.c

+14 −10
Original line number Diff line number Diff line
@@ -468,6 +468,18 @@ static inline void trace_access_lock_init(void) 


#endif



#ifdef CONFIG_STACKTRACE

static void __ftrace_trace_stack(struct ring_buffer *buffer,

				 unsigned long flags,

				 int skip, int pc, struct pt_regs *regs);

#else

static inline void __ftrace_trace_stack(struct ring_buffer *buffer,

					unsigned long flags,

					int skip, int pc, struct pt_regs *regs)

{

}

#endif



/* trace_flags holds trace_options default values */

unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK |

	TRACE_ITER_ANNOTATE | TRACE_ITER_CONTEXT_INFO | TRACE_ITER_SLEEP_TIME |
@@ -1744,7 +1756,8 @@ void trace_buffer_unlock_commit_regs(struct ring_buffer *buffer, 
{

	__buffer_unlock_commit(buffer, event);



	ftrace_trace_stack_regs(buffer, flags, 0, pc, regs);

	if (trace_flags & TRACE_ITER_STACKTRACE)

		__ftrace_trace_stack(buffer, flags, 0, pc, regs);

	ftrace_trace_userstack(buffer, flags, pc);

}

EXPORT_SYMBOL_GPL(trace_buffer_unlock_commit_regs);
@@ -1873,15 +1886,6 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, 


}



void ftrace_trace_stack_regs(struct ring_buffer *buffer, unsigned long flags,

			     int skip, int pc, struct pt_regs *regs)

{

	if (!(trace_flags & TRACE_ITER_STACKTRACE))

		return;



	__ftrace_trace_stack(buffer, flags, skip, pc, regs);

}



void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags,

			int skip, int pc)

{

kernel/trace/trace.h

+0 −9
Original line number Diff line number Diff line
@@ -614,9 +614,6 @@ void update_max_tr_single(struct trace_array *tr, 
void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags,

			int skip, int pc);



void ftrace_trace_stack_regs(struct ring_buffer *buffer, unsigned long flags,

			     int skip, int pc, struct pt_regs *regs);



void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,

			    int pc);
@@ -628,12 +625,6 @@ static inline void ftrace_trace_stack(struct ring_buffer *buffer, 
{

}



static inline void ftrace_trace_stack_regs(struct ring_buffer *buffer,

					   unsigned long flags, int skip,

					   int pc, struct pt_regs *regs)

{

}



static inline void ftrace_trace_userstack(struct ring_buffer *buffer,

					  unsigned long flags, int pc)

{