Skip to content
  • Linus Torvalds's avatar
    Merge tag 'trace-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 59a47fff
    Linus Torvalds authored
    Pull tracing update from Steven Rostedt:
     "Mostly this is just clean ups and micro optimizations.
    
      The changes with more meat are:
    
       - Allowing the trace event filters to filter on CPU number and
         process ids
    
       - Two new markers for trace output latency were added (10 and 100
         msec latencies)
    
       - Have tracing_thresh filter function profiling time
    
      I also worked on modifying the ring buffer code for some future work,
      and moved the adding of the timestamp around.  One of my changes
      caused a regression, and since other changes were built on top of it
      and already tested, I had to operate a revert of that change.  Instead
      of rebasing, this change set has the code that caused a regression as
      well as the code to revert that change without touching the other
      changes that were made on top of it"
    
    * tag 'trace-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      ring-buffer: Revert "ring-buffer: Get timestamp after event is allocated"
      tracing: Don't make assumptions about length of string on task rename
      tracing: Allow triggers to filter for CPU ids and process names
      ftrace: Format MCOUNT_ADDR address as type unsigned long
      tracing: Introduce two additional marks for delay
      ftrace: Fix function_graph duration spacing with 7-digits
      ftrace: add tracing_thresh to function profile
      tracing: Clean up stack tracing and fix fentry updates
      ring-buffer: Reorganize function locations
      ring-buffer: Make sure event has enough room for extend and padding
      ring-buffer: Get timestamp after event is allocated
      ring-buffer: Move the adding of the extended timestamp out of line
      ring-buffer: Add event descriptor to simplify passing data
      ftrace: correct the counter increment for trace_buffer data
      tracing: Fix for non-continuous cpu ids
      tracing: Prefer kcalloc over kzalloc with multiply
    59a47fff