• Linus Torvalds's avatar
    Merge tag 'trace-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · c17488d0
    Linus Torvalds authored
    Pull tracing updates from Steven Rostedt:
     "Not much new with tracing for this release.  Mostly just clean ups and
      minor fixes.
    
      Here's what else is new:
    
       - A new TRACE_EVENT_FN_COND macro, combining both _FN and _COND for
         those that want both.
    
       - New selftest to test the instance create and delete
    
       - Better debug output when ftrace fails"
    
    * tag 'trace-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (24 commits)
      ftrace: Fix the race between ftrace and insmod
      ftrace: Add infrastructure for delayed enabling of module functions
      x86: ftrace: Fix the comments for ftrace_modify_code_direct()
      tracing: Fix comment to use tracing_on over tracing_enable
      metag: ftrace: Fix the comments for ftrace_modify_code
      sh: ftrace: Fix the comments for ftrace_modify_code()
      ia64: ftrace: Fix the comments for ftrace_modify_code()
      ftrace: Clean up ftrace_module_init() code
      ftrace: Join functions ftrace_module_init() and ftrace_init_module()
      tracing: Introduce TRACE_EVENT_FN_COND macro
      tracing: Use seq_buf_used() in seq_buf_to_user() instead of len
      bpf: Constify bpf_verifier_ops structure
      ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags too
      ftrace: Remove use of control list and ops
      ftrace: Fix output of enabled_functions for showing tramp
      ftrace: Fix a typo in comment
      ftrace: Show all tramps registered to a record on ftrace_bug()
      ftrace: Add variable ftrace_expected for archs to show expected code
      ftrace: Add new type to distinguish what kind of ftrace_bug()
      tracing: Update cond flag when enabling or disabling a trigger
      ...
    c17488d0
ftrace.h 29.4 KB