Merge tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

Pull tracing updates from Steven Rostedt:
 "This includes two new updates for the ftrace infrastructure.

   - With the changing of the code for filtering events by pid, from a
     list of pids to a bitmask, we can now easily implement following
     forks.  With a new tracing option "event-fork" which, when set,
     will have tasks with pids in set_event_pid, when they fork, to have
     their child pids added to set_event_pid and the child will be
     traced as well.

     Note, if "event-fork" is set and a task with its pid in
     set_event_pid exits, its pid will be removed from set_event_pid

   - The addition of Tom Zanussi's hist triggers.  This includes a very
     thorough documentatino on how to use the hist triggers with events.
     This introduces a quick and easy way to get histogram data from
     events and their fields.

  Some other cleanups and updates were added as well.  Like Masami
  Hiramatsu added test cases for the event trigger and hist triggers.
  Also I added a speed up of filtering by using a temp buffer when
  filters are set"

* tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (45 commits)
  tracing: Use temp buffer when filtering events
  tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER logic
  tracing: Remove unused function trace_current_buffer_lock_reserve()
  tracing: Remove one use of trace_current_buffer_lock_reserve()
  tracing: Have trace_buffer_unlock_commit() call the _regs version with NULL
  tracing: Remove unused function trace_current_buffer_discard_commit()
  tracing: Move trace_buffer_unlock_commit{_regs}() to local header
  tracing: Fold filter_check_discard() into its only user
  tracing: Make filter_check_discard() local
  tracing: Move event_trigger_unlock_commit{_regs}() to local header
  tracing: Don't use the address of the buffer array name in copy_from_user
  tracing: Handle tracing_map_alloc_elts() error path correctly
  tracing: Add check for NULL event field when creating hist field
  tracing: checking for NULL instead of IS_ERR()
  tracing: Do not inherit event-fork option for instances
  tracing: Fix unsigned comparison to zero in hist trigger code
  kselftests/ftrace: Add a test for log2 modifier of hist trigger
  tracing: Add hist trigger 'log2' modifier
  kselftests/ftrace: Add hist trigger testcases
  kselftests/ftrace : Add event trigger testcases
  ...

diff --cc Documentation/trace/ftrace.txt
Simple merge

diff --cc include/linux/trace_events.h
Simple merge

diff --cc kernel/trace/trace_events.c
index b7b0760ba6ee9984521691704aa9483c034f54d6,4d006707b9475b056d2e55147b78856374192595..3d4155892a1e78cf6b8b7850e9a64c460fe825b5
--- 1/kernel/trace/trace_events.c
--- 2/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@@ -2113,14 -2148,13 +2166,18 @@@ event_create_dir(struct dentry *parent
        trace_create_file("filter", 0644, file->dir, file,
                          &ftrace_event_filter_fops);
  
 -      trace_create_file("trigger", 0644, file->dir, file,
 -                        &event_trigger_fops);
 +      /*
 +       * Only event directories that can be enabled should have
 +       * triggers.
 +       */
 +      if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE))
 +              trace_create_file("trigger", 0644, file->dir, file,
 +                                &event_trigger_fops);
  
+ #ifdef CONFIG_HIST_TRIGGERS
+       trace_create_file("hist", 0444, file->dir, file,
+                         &event_hist_fops);
+ #endif
        trace_create_file("format", 0444, file->dir, call,
                          &ftrace_event_format_fops);