Skip to content
  • Linus Torvalds's avatar
    Merge branch 'tracing-core-for-linus' of... · 752f114f
    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:
      tracing: Fix "integer as NULL pointer" warning.
      tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header
      tracing: Make the documentation clear on trace_event boot option
      ring-buffer: Wrap open-coded WARN_ONCE
      tracing: Convert nop macros to static inlines
      tracing: Fix sleep time function profiling
      tracing: Show sample std dev in function profiling
      tracing: Add documentation for trace commands mod, traceon/traceoff
      ring-buffer: Make benchmark handle missed events
      ring-buffer: Make non-consuming read less expensive with lots of cpus.
      tracing: Add graph output support for irqsoff tracer
      tracing: Have graph flags passed in to ouput functions
      tracing: Add ftrace events for graph tracer
      tracing: Dump either the oops's cpu source or all cpus buffers
      tracing: Fix uninitialized variable of tracing/trace output
    752f114f