diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-01 19:11:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-01 19:11:42 +0200 |
| commit | ac0a3260f37b8616da8d33488ec94b94e6ae5b31 (patch) | |
| tree | 0db61f7492d45f1d548b0bcef06a0df9c904442c /include | |
| parent | 809435ff4f43a5c0cb0201b3b89176253d5ade18 (diff) | |
| parent | b9df92d2a94eef8811061aecb1396290df440e2e (diff) | |
| download | linux-ac0a3260f37b8616da8d33488ec94b94e6ae5b31.tar.bz2 | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace.h | 8 |
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 { |