diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 10:57:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 10:57:51 +0200 |
| commit | 4983955c049d1debe5f6bee3aeb54ff5942fcd39 (patch) | |
| tree | aa3c9b03d92c31f8c9414d9b1f1534b47c83a4c0 /include/linux | |
| parent | e227051b13956b8f71c0abecc41ad351e64671c8 (diff) | |
| parent | 7374e82771c6d5a9af2080be46f64a5826c7efb1 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull ftrace robustization fixes from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace_event.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 176a939d1547..1aff18346c71 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -207,6 +207,9 @@ struct ftrace_event_call { * bit 1: enabled * bit 2: filter_active * bit 3: enabled cmd record + * bit 4: allow trace by non root (cap any) + * bit 5: failed to apply filter + * bit 6: ftrace internal event (do not enable) * * Changes to flags must hold the event_mutex. * |