tree 711b6da2a665e26940c59b9db493c59d879f6cc6
parent 461d208cfbd1f0af26027b2c35ded515e54b1ee6
parent b6345879ccbd9b92864fbd7eb8ac48acdb4d6b15
author Linus Torvalds <torvalds@linux-foundation.org> 1268520050 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1268520050 -0800

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing: Do not record user stack trace from NMI context
  tracing: Disable buffer switching when starting or stopping trace
  tracing: Use same local variable when resetting the ring buffer
  function-graph: Init curr_ret_stack with ret_stack
  ring-buffer: Move disabled check into preempt disable section
  function-graph: Add tracing_thresh support to function_graph tracer
  tracing: Update the comm field in the right variable in update_max_tr
  function-graph: Use comment notation for func names of dangling '}'
  function-graph: Fix unused reference to ftrace_set_func()
  tracing: Fix warning in s_next of trace file ops
  tracing: Include irqflags headers from trace clock