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

Commit 8a49f3e0 authored May 17, 2017 by Steven Rostedt (VMware)

ftrace: Remove #ifdef from code and add clear_ftrace_function_probes() stub



No need to add ugly #ifdefs in the code. Having a standard stub file is much
prettier.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent a0e6369e

kernel/trace/trace.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -7550,9 +7550,7 @@ static int instance_rmdir(const char *name)
		}

		tracing_set_nop(tr);
		#if defined(CONFIG_FUNCTION_TRACER) && defined(CONFIG_DYNAMIC_FTRACE)
		clear_ftrace_function_probes(tr);
		#endif
		event_trace_del_tracer(tr);
		ftrace_clear_pids(tr);
		ftrace_destroy_function_files(tr);

kernel/trace/trace.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -999,6 +999,10 @@ static inline __init int unregister_ftrace_command(char *cmd_name)
		{
		return -EINVAL;
		}
		static inline void clear_ftrace_function_probes(struct trace_array *tr)
		{
		}

		/*
		* The ops parameter passed in is usually undefined.
		* This must be a macro.