git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 9a6944fee68e25084130386c608c5ac8db487581
Cao jin (1):
bootconfig: Update prototype of setup_boot_config()
Colin Ian King (1):
ftrace: Fix spelling mistake "disabed" -> "disabled"
Steven Rostedt (VMware) (10):
ring-buffer: Separate out internal use of ring_buffer_event_time_stamp()
ring-buffer: Add a event_stamp to cpu_buffer for each level of nesting
tracing: Pass buffer of event to trigger operations
ring-buffer: Allow ring_buffer_event_time_stamp() to return time stamp of
all events
tracing: Use a no_filter_buffering_ref to stop using the filter buffer
ring-buffer: Add verifier for using ring_buffer_event_time_stamp()
tracing: Add tracing_event_time_stamp() API
tracing: Add check of trace event print fmts for dereferencing pointers
seq_buf: Add seq_buf_terminate() API
tracing: Add a verifier to check string pointers for trace events
Xu Wang (1):
tools/latency-collector: Remove unneeded semicolon
----
arch/csky/kernel/probes/ftrace.c | 2 +-
arch/riscv/kernel/probes/ftrace.c | 2 +-
arch/x86/kernel/kprobes/ftrace.c | 2 +-
include/linux/ring_buffer.h | 3 +-
include/linux/seq_buf.h | 25 ++++
include/linux/trace_events.h | 5 +-
init/main.c | 6 +-
kernel/trace/ring_buffer.c | 138 ++++++++++++++---
kernel/trace/trace.c | 238 +++++++++++++++++++++++++++---
kernel/trace/trace.h | 12 +-
kernel/trace/trace_events.c | 210 ++++++++++++++++++++++++++
kernel/trace/trace_events_hist.c | 100 ++++++++-----
kernel/trace/trace_events_trigger.c | 45 +++---
kernel/trace/trace_output.c | 2 +-
kernel/trace/trace_printk.c | 11 ++
tools/tracing/latency/latency-collector.c | 4 +-
16 files changed, 697 insertions(+), 108 deletions(-)
