git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: d3c07fac565261101337b9535df072361297ea2d
Axel Rasmussen (1):
tracing: support "bool" type in synthetic trace events
Gaurav Kohli (1):
tracing: Fix race in trace_open and buffer resize call
Masami Hiramatsu (1):
tracing/boot: Add ftrace.instance.*.alloc_snapshot option
Qiujun Huang (1):
tracing: Fix some typos in comments
Steven Rostedt (VMware) (1):
tracing: Check return value of __create_val_fields() before using its
result
Tom Zanussi (7):
tracing: Don't show dynamic string internals in synthetic event
description
tracing: Move is_good_name() from trace_probe.h to trace.h
tracing: Check that the synthetic event and field names are legal
tracing: Add synthetic event error logging
selftests/ftrace: Change synthetic event name for inter-event-combined
test
tracing: Handle synthetic event array field type checking correctly
selftests/ftrace: Add test case for synthetic event syntax errors
----
kernel/trace/ring_buffer.c | 10 ++
kernel/trace/trace.c | 4 +-
kernel/trace/trace.h | 21 +++-
kernel/trace/trace_boot.c | 6 +
kernel/trace/trace_events_hist.c | 2 +-
kernel/trace/trace_events_synth.c | 127 ++++++++++++++++++++-
kernel/trace/trace_probe.h | 13 ---
.../trigger-inter-event-combined-hist.tc | 8 +-
.../trigger-synthetic_event_syntax_errors.tc | 19 +++
9 files changed, 180 insertions(+), 30 deletions(-)
create mode 100644
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
