Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
"Another small bug reported to me by Chunyu Hu.

When perf added a "reg" function to the function tracing event (not a
tracepoint), it caused that event to be displayed as a tracepoint and
could cause errors in tracepoint handling. That was solved by adding
a flag to ignore ftrace non-tracepoint events. But that flag was
missed when displaying events in available_events, which should only
contain tracepoint events.

This broke a documented way to enable all events with:

cat available_events > set_event

As the function non-tracepoint event would cause that to error out.
The commit here fixes that by having the available_events file not
list events that have the ignore flag set"

* tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Fix showing function event in available_events

+2 -1
+2 -1
kernel/trace/trace_events.c
··· 869 869 * The ftrace subsystem is for showing formats only. 870 870 * They can not be enabled or disabled via the event files. 871 871 */ 872 - if (call->class && call->class->reg) 872 + if (call->class && call->class->reg && 873 + !(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)) 873 874 return file; 874 875 } 875 876