git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: bb730b5833b5bddf5cb226865e5f4496770d00b0
Steven Rostedt (VMware) (4):
blktrace: Add SPDX License format header
tracing: Add SPDX License format to bpf_trace.c
tracing: Add SPDX License format tags to tracing files
tracing: Fix SPDX format headers to use C++ style comments
Vasily Gorbik (4):
tracing: Handle CC_FLAGS_FTRACE more accurately
tracing: Avoid calling cc-option -mrecord-mcount for every Makefile
tracing: Add -mcount-nop option support
s390/ftrace: Add -mfentry and -mnop-mcount support
----
Makefile | 24 ++++++++++++++++++++----
arch/s390/Kconfig | 2 ++
arch/s390/Makefile | 16 +++++++++-------
arch/s390/include/asm/ftrace.h | 6 +++---
arch/s390/kernel/ftrace.c | 2 +-
arch/s390/kernel/mcount.S | 2 +-
kernel/trace/Kconfig | 5 +++++
kernel/trace/blktrace.c | 14 +-------------
kernel/trace/bpf_trace.c | 5 +----
kernel/trace/ftrace.c | 3 +++
kernel/trace/ring_buffer.c | 1 +
kernel/trace/ring_buffer_benchmark.c | 1 +
kernel/trace/trace.c | 1 +
kernel/trace/trace.h | 2 +-
kernel/trace/trace_benchmark.h | 2 +-
kernel/trace/trace_clock.c | 1 +
kernel/trace/trace_entries.h | 2 +-
kernel/trace/trace_event_perf.c | 1 +
kernel/trace/trace_events.c | 1 +
kernel/trace/trace_events_filter.c | 15 +--------------
kernel/trace/trace_events_filter_test.h | 2 +-
kernel/trace/trace_events_hist.c | 11 +----------
kernel/trace/trace_events_trigger.c | 15 +--------------
kernel/trace/trace_hwlat.c | 4 +---
kernel/trace/trace_irqsoff.c | 1 +
kernel/trace/trace_kprobe.c | 13 +------------
kernel/trace/trace_kprobe_selftest.h | 2 +-
kernel/trace/trace_output.c | 1 +
kernel/trace/trace_output.h | 2 +-
kernel/trace/trace_printk.c | 1 +
kernel/trace/trace_probe.c | 14 +-------------
kernel/trace/trace_probe.h | 14 +-------------
kernel/trace/trace_seq.c | 1 +
kernel/trace/trace_stat.h | 2 +-
kernel/trace/trace_uprobe.c | 14 +-------------
kernel/trace/tracing_map.c | 11 +----------
kernel/trace/tracing_map.h | 2 +-
scripts/Makefile.build | 9 +++------
38 files changed, 76 insertions(+), 149 deletions(-)
