Ingo Molnar 72c26c9a26 Merge branch 'linus' into tracing/blktrace ...

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-19 09:00:35 +01:00

..

blktrace.c

Merge branch 'linus' into tracing/blktrace

2009-02-19 09:00:35 +01:00

ftrace.c

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

2009-02-18 01:08:13 +01:00

Kconfig

trace: mmiotrace to the tracer menu in Kconfig

2009-02-15 20:03:28 +01:00

kmemtrace.c

tracing: Introduce trace_buffer_{lock_reserve,unlock_commit}

2009-02-06 01:01:41 +01:00

Makefile

tracing/blktrace: move the tracing file to kernel/trace

2009-02-09 10:51:02 +01:00

ring_buffer.c

ring-buffer: add tracing_is_on to test if ring buffer is enabled

2009-02-16 22:50:01 -05:00

trace_boot.c

tracing: Introduce trace_buffer_{lock_reserve,unlock_commit}

2009-02-06 01:01:41 +01:00

trace_branch.c

tracing: remove unneeded variable

2009-02-10 12:32:18 -05:00

trace_functions_graph.c

tracing: provide correct return value after outputting the event

2009-02-10 12:32:33 -05:00

trace_functions.c

ftrace: add pretty print function for traceon and traceoff hooks

2009-02-16 23:38:13 -05:00

trace_hw_branches.c

tracing: fix section mismatch in trace_hw_branches.c

2009-02-15 20:41:08 +01:00

trace_irqsoff.c

trace: Remove unused trace_array_cpu parameter

2009-02-05 14:35:47 +01:00

trace_mmiotrace.c

mmiotrace: count events lost due to not recording

2009-02-15 20:02:42 +01:00

trace_nop.c

trace: Call tracing_reset_online_cpus before tracer->init()

2009-02-06 01:01:41 +01:00

trace_output.c

Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

2009-02-09 10:35:12 +01:00

trace_output.h

trace: make the trace_event callbacks return enum print_line_t

2009-02-04 20:48:39 +01:00

trace_power.c

tracing: convert c/p state power tracer to use tracepoints

2009-02-13 09:06:18 -05:00

trace_sched_switch.c

trace: Call tracing_reset_online_cpus before tracer->init()

2009-02-06 01:01:41 +01:00

trace_sched_wakeup.c

trace: Remove unused trace_array_cpu parameter

2009-02-05 14:35:47 +01:00

trace_selftest_dynamic.c

…

trace_selftest.c

tracing/function-graph-tracer: provide a selftest for the function graph tracer

2009-02-09 10:51:37 +01:00

trace_stack.c

trace: better use of stack_trace_enabled for boot up code

2008-12-18 12:56:56 +01:00

trace_stat.c

tracing: trace_stat.c cleanup

2009-01-15 11:31:21 +01:00

trace_stat.h

tracing/ftrace: separate events tracing and stats tracing engine

2009-01-14 12:11:37 +01:00

trace_sysprof.c

Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core

2009-02-13 10:25:18 +01:00

trace_workqueue.c

trace_workqueue: use percpu data for workqueue stat

2009-01-20 13:06:59 +01:00

trace.c

tracing: fix sparse warning: attribute function with __acquires/__releases

2009-02-11 10:15:42 +01:00

trace.h

tracing: splice support for tracing_pipe

2009-02-09 12:24:34 -05:00