diff --git a/[refs] b/[refs] index 6fc07d5cd2de..f2cdb18e1662 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1dc6725882b5ca54eb9a04436a3b47d58f2cbc7 +refs/heads/master: 2a30c11f6a037e2475f3c651bc57e697e79fa963 diff --git a/trunk/include/linux/ftrace_event.h b/trunk/include/linux/ftrace_event.h index 4d79d2dc189c..0b0814d90164 100644 --- a/trunk/include/linux/ftrace_event.h +++ b/trunk/include/linux/ftrace_event.h @@ -204,6 +204,7 @@ enum { * FILTERED - The event has a filter attached * CAP_ANY - Any user can enable for perf * NO_SET_FILTER - Set when filter has error and is to be ignored + * IGNORE_ENABLE - For ftrace internal events, do not enable with debugfs file */ enum { TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT),