From 447c8b8479cfc7df25b19738f11dfbd788d35a2c Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 4 Nov 2011 10:45:23 -0400
Subject: [PATCH] --- yaml --- r: 276421 b: refs/heads/master c:
 c7c6ec8becaf742b223c7b491f4893014be23a07 h: refs/heads/master i:   276419:
 392f81b2b950a603f8d9594344ff206a19fd5b20 v: v3

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

diff --git a/[refs] b/[refs]
index fbeee7a16523..46428edfd939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b14b56af081ec7edeefb3a38b2c9577cc5ef48
+refs/heads/master: c7c6ec8becaf742b223c7b491f4893014be23a07
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 900b409543db..1276b3ca1598 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -152,7 +152,6 @@ void clear_ftrace_function(void)
 	ftrace_pid_function = ftrace_stub;
 }
 
-#undef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
 #ifndef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
 /*
  * For those archs that do not test ftrace_trace_stop in their