Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

1 files changed, 3 insertions, 5 deletions

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ca29e03c1fac..32047449b309 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -147,11 +147,9 @@ extern int ftrace_text_reserved(void *start, void *end);
 
 enum {
         FTRACE_FL_FREE          = (1 << 0),
-        FTRACE_FL_FAILED        = (1 << 1),
-        FTRACE_FL_FILTER        = (1 << 2),
-        FTRACE_FL_ENABLED       = (1 << 3),
-        FTRACE_FL_NOTRACE       = (1 << 4),
-        FTRACE_FL_CONVERTED     = (1 << 5),
+        FTRACE_FL_FILTER        = (1 << 1),
+        FTRACE_FL_ENABLED       = (1 << 2),
+        FTRACE_FL_NOTRACE       = (1 << 3),
 };
 
 struct dyn_ftrace {