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

Commit 3612fdf7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ftrace' of... 

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
parents 654952bc 633ddaa7

kernel/trace/trace_events_stage_3.h

+4 −4
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ static int ftrace_reg_event_##call(void) \ 
	int ret;							\

									\

	ret = register_trace_##call(ftrace_event_##call);		\

	if (!ret)							\

	if (ret)							\

		pr_info("event trace: Could not activate trace point "	\

			"probe to " #call);				\

			"probe to " #call "\n");			\

	return ret;							\

}									\

									\
@@ -195,9 +195,9 @@ static int ftrace_raw_reg_event_##call(void) \ 
	int ret;							\

									\

	ret = register_trace_##call(ftrace_raw_event_##call);		\

	if (!ret)							\

	if (ret)							\

		pr_info("event trace: Could not activate trace point "	\

			"probe to " #call);				\

			"probe to " #call "\n");			\

	return ret;							\

}									\

									\