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

Browse source

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, ds, bts: cleanup/fix DS configuration
  ring-buffer: reset timestamps when ring buffer is reset
  trace: set max latency variable to zero on default
  trace: stop all recording to ring buffer on ftrace_dump
  trace: print ftrace_dump at KERN_EMERG log level
  ring_buffer: reset write when reserve buffer fail
  tracing/function-graph-tracer: fix a regression while suspend to disk
  ring-buffer: fix alignment problem

...

This commit is contained in:

Linus Torvalds 2009-01-31 15:53:30 -08:00

parent e81cfd214f ba2607fe9c

commit f6490438fc

6 changed files with 58 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

27

kernel/trace/ftrace.c

View file

15

kernel/trace/ring_buffer.c

View file

5

kernel/trace/trace.c

View file

1

kernel/trace/trace_irqsoff.c

View file

1

kernel/trace/trace_sched_wakeup.c

View file