Skip to content
  • Linus Torvalds's avatar
    Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · c9b88e95
    Linus Torvalds authored
    Pull tracing filter cleanups from Steven Rostedt:
     "Oleg Nesterov did several clean ups with the tracing filter code.  As
      he found some small bugs that went into 3.16, and these changes were
      based on that, I had to apply his changes to a separate branch than my
      main development branch.
    
      This was based on work that was already pulled into 3.16, and is a
      separate pull request to keep from having local merges in my pull
      request"
    
    * tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing: Kill "filter_string" arg of replace_preds()
      tracing: Change apply_subsystem_event_filter() paths to check file->system == dir
      tracing: Kill ftrace_event_call->files
      tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic
      tracing: Kill call_filter_disable()
      tracing: Kill destroy_call_preds()
      tracing: Kill destroy_preds() and destroy_file_preds()
    c9b88e95