---

yaml --- r: 276421 b: refs/heads/master c: c7c6ec8 h: refs/heads/master i: 276419: 392f81b v: v3
git-mirror · Dec 5, 2011 · 447c8b8 · 447c8b8
1 parent 3db1d84
commit 447c8b8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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