Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/rostedt/linux-2.6-trace into perf/core
mariux64 · May 1, 2011 · ac0a326 · ac0a326
2 parents 809435f + b9df92d
commit ac0a326
Show file tree

Hide file tree

Showing 2 changed files with 141 additions and 214 deletions.
diff --git 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 {