1
linux/kernel/trace
Ingo Molnar 416dfdcdb8 Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
	arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
              dependency change from upstream so that we can remove it
	      here.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-24 10:11:23 +02:00
..
blktrace.c blktrace: pass the right pointer to kfree() 2009-04-09 05:52:40 +02:00
events.c ftrace: event profile hooks 2009-03-20 10:17:07 +01:00
ftrace.c function-graph: allow unregistering twice 2009-04-01 14:47:42 +02:00
Kconfig tracing: fix document references 2009-04-10 13:08:50 +02:00
kmemtrace.c kmemtrace: small cleanups 2009-04-03 12:23:09 +02:00
Makefile tracing: make the trace clocks available generally 2009-04-14 18:35:13 +02:00
ring_buffer.c ring-buffer: do not remove reader page from list on ring buffer free 2009-04-01 14:47:53 +02:00
trace_boot.c
trace_branch.c tracing: Fix branch tracer header 2009-04-14 02:30:36 +02:00
trace_clock.c tracing: fix four sparse warnings 2009-03-22 18:16:54 +01:00
trace_event_profile.c ftrace: event profile hooks 2009-03-20 10:17:07 +01:00
trace_event_types.h tracing: remove recording function depth from trace_printk 2009-03-19 15:58:47 -04:00
trace_events_filter.c tracing/filters: return proper error code when writing filter file 2009-04-12 11:59:29 +02:00
trace_events_stage_1.h
trace_events_stage_2.h ftrace: Output REC->var instead of __entry->var for trace format 2009-04-10 15:48:53 +02:00
trace_events_stage_3.h tracing/events: don't discard an event after commit 2009-03-23 09:22:15 +01:00
trace_events.c tracing/filters: return proper error code when writing filter file 2009-04-12 11:59:29 +02:00
trace_export.c ftrace: Correct a text align for event format output 2009-04-07 14:02:42 +02:00
trace_functions_graph.c function-graph: moved the timestamp from arch to generic code 2009-03-24 09:31:34 -04:00
trace_functions.c
trace_hw_branches.c x86, bts, hw-branch-tracer: add _noirq variants to the debug store interface 2009-04-07 13:36:20 +02:00
trace_irqsoff.c
trace_mmiotrace.c tracing: remove recording function depth from trace_printk 2009-03-19 15:58:47 -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 incorrect return type of ns2usecs() 2009-04-07 13:59:23 +02:00
trace_output.h trace: make argument 'mem' of trace_seq_putmem() const 2009-03-31 17:45:13 +02:00
trace_power.c tracing: Fix power tracer header 2009-04-13 23:39:57 +02:00
trace_printk.c tracing: remove recording function depth from trace_printk 2009-03-19 15:58:47 -04:00
trace_sched_switch.c ftrace: Add check of sched_stopped for probe_sched_wakeup 2009-04-07 14:01:11 +02:00
trace_sched_wakeup.c tracing: remove CALLER_ADDR2 from wakeup tracer 2009-04-07 13:58:54 +02:00
trace_selftest_dynamic.c
trace_selftest.c x86, hw-branch-tracer: allocate selftest iterator on heap 2009-04-07 13:36:21 +02:00
trace_stack.c tracing: left align location header in stack_trace 2009-03-13 00:00:58 -04:00
trace_stat.c trace_stat: keep original order 2009-03-25 18:32:34 +01:00
trace_stat.h
trace_syscalls.c tracing/syscalls: use a dedicated file header 2009-04-09 05:43:32 +02:00
trace_sysprof.c
trace_workqueue.c trace_workqueues: fix empty line's output 2009-03-25 18:32:35 +01:00
trace.c tracing: fix splice return too large 2009-04-10 12:44:46 +02:00
trace.h Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing 2009-04-24 10:11:23 +02:00