Skip to contentSkip to conversation

tracing fixes

GIT PULL Ingo Molnar 1 participant 1 message Oct 2, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest tracing-fixes-for-linus git tree from:

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

Thanks,

Ingo

------------------>
Matt Fleming (1):
tracing: Fix infinite recursion in ftrace_update_pid_func()

Paul Mundt (1):
kmemtrace: Fix up tracer registration

 kernel/trace/ftrace.c    |    4 ++++
 kernel/trace/kmemtrace.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
kernel/trace/ftrace.c +4 -0
index 46592fe..3724756 100644
@@ -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
index 81b1645..a91da69 100644
@@ -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;
 	}