From 8c427ec12d4fe7c08a77e07b0a5a80bc1b2b7f99 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: 277263 b: refs/heads/master c:
 8ee3c92b7f2751c392be2d8fc360a410480b8757 h: refs/heads/master i:   277261:
 c436ddcc0980c43c15f586fb65526a2d6d7bb338   277259:
 f9d74cb05b2c84b94d9374a3b10abfd8a2ab3fc1   277255:
 f39d2d956be379dd4733d6a4a01ade660bb4b6dd   277247:
 62e164e0e57e929349f32a3829dc504874908abe v: v3

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

diff --git a/[refs] b/[refs]
index 4992c6db817d..1e505c2adc7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e78d08f3ab3094783b8df08a5b6d1d1a56a58f
+refs/heads/master: 8ee3c92b7f2751c392be2d8fc360a410480b8757
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 077d85387908..0fcc6caead1c 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -151,7 +151,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