From c4050a2087446c61365734cd54cc6cc11d7805ab Mon Sep 17 00:00:00 2001
From: Rajesh Bhagat <rajesh.lnx@gmail.com>
Date: Fri, 17 Feb 2012 13:59:15 +0530
Subject: [PATCH] --- yaml --- r: 298307 b: refs/heads/master c:
 db6544e0075d192e5ad16eda8689c55fa9c6f8f4 h: refs/heads/master i:   298305:
 1a72767f5f15f36b99a52d247f6b34cdc532e194   298303:
 14f53e50c7432b09dab8dd54e94e3934f3a17743 v: v3

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

diff --git a/[refs] b/[refs]
index 1b36539f1364..fccb222fcf46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b892e5c89787716b95a8e55d77d25a1c0748df10
+refs/heads/master: db6544e0075d192e5ad16eda8689c55fa9c6f8f4
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 867bd1dd2dd0..0fa92f677c92 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -249,7 +249,8 @@ static void update_ftrace_function(void)
 #else
 	__ftrace_trace_function = func;
 #endif
-	ftrace_trace_function = ftrace_test_stop_func;
+	ftrace_trace_function =
+		(func == ftrace_stub) ? func : ftrace_test_stop_func;
 #endif
 }