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

Head SHA1: 696ced4fb1d76802f864d8848aa4716633f83c17


Alban Crequy (1):
      tracing/kprobes: expose maxactive for kretprobe in kprobe_events

Steven Rostedt (VMware) (6):
      ftrace: Clean up __seq_open_private() return check
      ftrace: Assign iter->hash to filter or notrace hashes on seq read
      ftrace: Return NULL at end of t_start() instead of calling t_hash_start()
      ftrace: Update func_pos in t_start() when all functions are enabled
      ftrace: Create separate t_func_next() to simplify the function / hash 
logic
      ftrace: Have init/main.c call ftrace directly to free init memory

----
 Documentation/trace/kprobetrace.txt                |  5 +-
 include/linux/ftrace.h                             |  6 +-
 init/main.c                                        |  1 +
 kernel/trace/ftrace.c                              | 96 +++++++++++++---------
 kernel/trace/trace_kprobe.c                        | 39 +++++++--
 mm/page_alloc.c                                    |  3 -
 .../ftrace/test.d/kprobe/kretprobe_maxactive.tc    | 39 +++++++++
 7 files changed, 137 insertions(+), 52 deletions(-)
 create mode 100644 
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc

Reply via email to