commit f0461d0146ee30927bc7efa2ae24ea8c6693b725
author Ingo Molnar <mingo@elte.hu> Wed Dec 03 08:49:21 2008 +0100
committer Ingo Molnar <mingo@elte.hu> Wed Dec 03 08:49:21 2008 +0100
tree 6a6b416c76c0e1a569af5531454fb45fe06e07ba
parent 66eafebc1086014709dc38f52ddcb3d67d9b346c
parent 48d68b20d00865035b8b65e69af343d0f53fac9d

Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

kernel/trace/ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f724996..2e78628 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -243,10 +243,8 @@
 		set_ftrace_pid_function(func);
 		func = ftrace_pid_func;
 	} else {
-		if (func != ftrace_pid_func)
-			goto out;
-
-		set_ftrace_pid_function(func);
+		if (func == ftrace_pid_func)
+			func = ftrace_pid_function;
 	}
 
 #ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST