git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: a96a5037ed0f52e2d86739f4a1ef985bd036e575
Peter Zijlstra (4):
perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on
ftrace:function")
perf/ftrace: Fix function trace events
perf/ftrace: Small cleanup
ftrace: Kill FTRACE_OPS_FL_PER_CPU
Steven Rostedt (VMware) (3):
tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on
tracing, thermal: Hide devfreq trace events when not in use
tracing, thermal: Hide cpu cooling trace events when not in use
----
drivers/dma-buf/dma-fence.c | 1 -
include/linux/ftrace.h | 83 +++++++---------------------------------
include/linux/perf_event.h | 2 +-
include/linux/trace_events.h | 9 ++++-
include/trace/events/dma_fence.h | 40 -------------------
include/trace/events/thermal.h | 4 ++
kernel/events/core.c | 13 ++-----
kernel/trace/ftrace.c | 55 +++-----------------------
kernel/trace/trace_event_perf.c | 82 +++++++++++++++++++++++----------------
kernel/trace/trace_kprobe.c | 4 +-
kernel/trace/trace_syscalls.c | 4 +-
kernel/trace/trace_uprobe.c | 2 +-
12 files changed, 90 insertions(+), 209 deletions(-)
