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

Commit 0f26ec69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kmemtrace: Fix up tracer registration
  tracing: Fix infinite recursion in ftrace_update_pid_func()
parents 46302b46 f9ac5a69

kernel/trace/ftrace.c

+4 −0
Original line number Diff line number Diff line
@@ -225,7 +225,11 @@ static void ftrace_update_pid_func(void) 
	if (ftrace_trace_function == ftrace_stub)

		return;



#ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST

	func = ftrace_trace_function;

#else

	func = __ftrace_trace_function;

#endif



	if (ftrace_pid_trace) {

		set_ftrace_pid_function(func);

kernel/trace/kmemtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int __init init_kmem_tracer(void) 
		return 1;

	}



	if (!register_tracer(&kmem_tracer)) {

	if (register_tracer(&kmem_tracer) != 0) {

		pr_warning("Warning: could not register the kmem tracer\n");

		return 1;

	}