From 57fe7e2631204dc8cd05e88f641fe2808cd19ee8 Mon Sep 17 00:00:00 2001
From: Liming Wang <liming.wang@windriver.com>
Date: Tue, 2 Dec 2008 10:33:08 +0800
Subject: [PATCH] --- yaml --- r: 121231 b: refs/heads/master c:
 66eafebc1086014709dc38f52ddcb3d67d9b346c h: refs/heads/master i:   121229:
 97ae6cbeaac64f1f4354df799413338b2c21556c   121227:
 46a0ff733cdb9a5ffc690558b477a0ecd2f5e37d   121223:
 c1c962c4c3567a173c11482a317d1a69a1334eb6   121215:
 2883d1d19005e88f1d6a9c3619b304e8c9b1da78 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d88cf2342aa5..cc97db462985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222658e08f72cd539d01f3aabdc258c596f487e2
+refs/heads/master: 66eafebc1086014709dc38f52ddcb3d67d9b346c
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 08b536a2614e..6d89ab46c6e3 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -243,10 +243,8 @@ static void ftrace_update_pid_func(void)
 		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