git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 6171a0310a06a7a0cb83713fa7068bdd4192de19


Colin Ian King (1):
      tracing: Remove redundant unread variable ret

Joel Fernandes (1):
      tracing: Remove obsolete sched_switch tracer selftest

Steven Rostedt (VMware) (7):
      tracing: Reverse the order of trace_types_lock and event_mutex
      ring-buffer: Rewrite trace_recursive_(un)lock() to be simpler
      ftrace: Add a ftrace_free_mem() function for modules to use
      ftrace: Allow module init functions to be traced
      ftrace: Save module init functions kallsyms symbols for tracing
      ftrace: Add freeing algorithm to free ftrace_mod_maps
      ftrace/kallsyms: Have /proc/kallsyms show saved mod init functions

Tom Zanussi (7):
      tracing: Exclude 'generic fields' from histograms
      tracing: Remove lookups from tracing_map hitcount
      tracing: Increase tracing map KEYS_MAX size
      tracing: Make traceprobe parsing code reusable
      tracing: Clean up hist_field_flags enum
      tracing: Add hist_field_name() accessor
      tracing: Reimplement log2

----
 include/linux/ftrace.h           |  27 +++++
 include/linux/init.h             |   4 +-
 kernel/kallsyms.c                |  43 +++++++-
 kernel/module.c                  |   2 +
 kernel/trace/ftrace.c            | 230 ++++++++++++++++++++++++++++++++++++++-
 kernel/trace/ring_buffer.c       |  64 +++--------
 kernel/trace/trace.c             |  91 ++++++++++++++++
 kernel/trace/trace.h             |   9 +-
 kernel/trace/trace_events.c      |  31 +++---
 kernel/trace/trace_events_hist.c | 128 +++++++++++++++-------
 kernel/trace/trace_kprobe.c      |  18 +--
 kernel/trace/trace_probe.c       |  86 ---------------
 kernel/trace/trace_probe.h       |   7 --
 kernel/trace/trace_selftest.c    |  32 ------
 kernel/trace/trace_uprobe.c      |   2 +-
 kernel/trace/tracing_map.c       |   3 +-
 kernel/trace/tracing_map.h       |   2 +-
 17 files changed, 521 insertions(+), 258 deletions(-)

Reply via email to