q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/kernel/trace
History
Frederic Weisbecker 8f8ffe2485 Merge commit 'tracing/core' into tracing/kprobes 
Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787eaf7858c6c573353a83c3e2766e674:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
 		2009-09-11 01:09:23 +02:00
..
Kconfig Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
Makefile tracing: Add kprobe-based event tracer 2009-08-27 02:31:54 +02:00
blktrace.c Merge commit 'v2.6.31-rc9' into tracing/core 2009-09-06 06:11:42 +02:00
ftrace.c Merge commit 'v2.6.31-rc9' into tracing/core 2009-09-06 06:11:42 +02:00
kmemtrace.c tracing: remove users of tracing_reset 2009-09-04 12:12:39 -04:00
ring_buffer.c ring-buffer: only enable ring_buffer_swap_cpu when needed 2009-09-04 19:42:22 -04:00
ring_buffer_benchmark.c ring-buffer: have benchmark test print to trace buffer 2009-06-17 17:01:09 -04:00
trace.c Merge commit 'v2.6.31-rc9' into tracing/core 2009-09-06 06:11:42 +02:00
trace.h Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
trace_boot.c tracing: pass around ring buffer instead of tracer 2009-09-04 18:59:39 -04:00
trace_branch.c Merge branch 'linus' into tracing/core 2009-05-07 11:17:34 +02:00
trace_clock.c tracing: fix four sparse warnings 2009-03-22 18:16:54 +01:00
trace_event_profile.c ftrace: Fix perf-tracepoint OOPS 2009-08-06 06:26:09 +02:00
trace_event_types.h tracing: Generate names for each kprobe event automatically 2009-08-27 02:32:28 +02:00
trace_events.c Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
trace_events_filter.c tracing/filters: Defer pred allocation, fix memory leak 2009-09-04 23:22:33 +02:00
trace_export.c Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
trace_functions.c Merge branch 'linus' into tracing/core 2009-07-18 12:20:01 +02:00
trace_functions_graph.c tracing: pass around ring buffer instead of tracer 2009-09-04 18:59:39 -04:00
trace_hw_branches.c Merge branch 'tracing/hw-branch-tracing' into tracing/core 2009-05-07 13:36:22 +02:00
trace_irqsoff.c tracing: use timestamp to determine start of latency traces 2009-09-04 18:44:22 -04:00
trace_kprobe.c Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
trace_mmiotrace.c tracing: pass around ring buffer instead of tracer 2009-09-04 18:59:39 -04:00
trace_nop.c tracing/ftrace: make nop-tracer use polling wait for events on pipe 2009-03-23 09:22:15 +01:00
trace_output.c tracing: Fix trace_print_seq() 2009-07-02 08:51:13 +02:00
trace_output.h tracing: add protection around module events unload 2009-06-09 17:29:07 -04:00
trace_power.c tracing: pass around ring buffer instead of tracer 2009-09-04 18:59:39 -04:00
trace_printk.c tracing: show proper address for trace-printk format 2009-07-23 10:07:17 -04:00
trace_sched_switch.c tracing: pass around ring buffer instead of tracer 2009-09-04 18:59:39 -04:00
trace_sched_wakeup.c tracing: use timestamp to determine start of latency traces 2009-09-04 18:44:22 -04:00
trace_selftest.c tracing/function-graph-tracer: Move graph event insertion helpers in the graph tracer file 2009-08-06 07:28:06 +02:00
trace_selftest_dynamic.c ftrace: fix dynamic ftrace selftest 2008-05-23 21:13:23 +02:00
trace_stack.c trace_stack: Simplify seqfile code 2009-08-17 11:25:09 +02:00
trace_stat.c trace_stat: Fix missing entry in stat file 2009-08-17 11:25:09 +02:00
trace_stat.h tracing/stat: Add stat_release() callback 2009-07-10 12:14:05 +02:00
trace_syscalls.c Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
trace_sysprof.c Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-06-15 10:06:19 -07:00
trace_workqueue.c tracing/workqueues: Add refcnt to struct cpu_workqueue_stats 2009-07-10 12:14:07 +02:00