Skip to content
  • Linus Torvalds's avatar
    Merge branch 'tracing-core-for-linus' of... · 483e3cd6
    Linus Torvalds authored
    Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (105 commits)
      ring-buffer: only enable ring_buffer_swap_cpu when needed
      ring-buffer: check for swapped buffers in start of committing
      tracing: report error in trace if we fail to swap latency buffer
      tracing: add trace_array_printk for internal tracers to use
      tracing: pass around ring buffer instead of tracer
      tracing: make tracing_reset safe for external use
      tracing: use timestamp to determine start of latency traces
      tracing: Remove mentioning of legacy latency_trace file from documentation
      tracing/filters: Defer pred allocation, fix memory leak
      tracing: remove users of tracing_reset
      tracing: disable buffers and synchronize_sched before resetting
      tracing: disable update max tracer while reading trace
      tracing: print out start and stop in latency traces
      ring-buffer: disable all cpu buffers when one finds a problem
      ring-buffer: do not count discarded events
      ring-buffer: remove ring_buffer_event_discard
      ring-buffer: fix ring_buffer_read crossing pages
      ring-buffer: remove unnecessary cpu_relax
      ring-buffer: do not swap buffers during a commit
      ring-buffer: do not reset while in a commit
      ...
    483e3cd6