1
0
Fork 0
alistair23-linux/samples
Linus Torvalds b0b7065b64 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: (24 commits)
  tracing/urgent: warn in case of ftrace_start_up inbalance
  tracing/urgent: fix unbalanced ftrace_start_up
  function-graph: add stack frame test
  function-graph: disable when both x86_32 and optimize for size are configured
  ring-buffer: have benchmark test print to trace buffer
  ring-buffer: do not grab locks in nmi
  ring-buffer: add locks around rb_per_cpu_empty
  ring-buffer: check for less than two in size allocation
  ring-buffer: remove useless compile check for buffer_page size
  ring-buffer: remove useless warn on check
  ring-buffer: use BUF_PAGE_HDR_SIZE in calculating index
  tracing: update sample event documentation
  tracing/filters: fix race between filter setting and module unload
  tracing/filters: free filter_string in destroy_preds()
  ring-buffer: use commit counters for commit pointer accounting
  ring-buffer: remove unused variable
  ring-buffer: have benchmark test handle discarded events
  ring-buffer: prevent adding write in discarded area
  tracing/filters: strloc should be unsigned short
  tracing/filters: operand can be negative
  ...

Fix up kmemcheck-induced conflict in kernel/trace/ring_buffer.c manually
2009-06-20 10:56:46 -07:00
..
kobject samples: mark {static|__init|__exit} for {init|exit} functions 2009-01-06 15:59:12 -08:00
kprobes Kprobes: move kprobe examples to samples/ 2008-03-04 16:35:11 -08:00
markers samples: mark {static|__init|__exit} for {init|exit} functions 2009-01-06 15:59:12 -08:00
trace_events tracing: update sample event documentation 2009-06-16 19:53:07 -04:00
tracepoints tracing: Documentation / sample code fixes for tracepoints 2009-03-24 22:32:12 +01:00
Kconfig kobject: samples: make SAMPLE_KOBJECT module-only 2009-06-15 21:30:24 -07:00
Makefile tracing/events: add trace-events-sample 2009-04-14 22:09:18 -04:00