Ingo Molnar 1cad1252ed Merge branch 'tracing/urgent' into tracing/core ...

Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
              and pick up the current lineup of tracing/urgent fixes as well

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

2009-04-10 12:46:51 +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: use int instead of atomic for ftrace_graph_active

2009-04-07 14:43:08 +02:00

Kconfig

Merge branch 'linus' into tracing/core

2009-04-07 13:47:45 +02:00

kmemtrace.c

kmemtrace: small cleanups

2009-04-03 12:23:09 +02:00

Makefile

tracing: add per-event filtering

2009-03-22 18:38:46 +01:00

ring_buffer.c

tracing/ftrace: factorize the tracing files creation

2009-04-07 14:43:07 +02:00

trace_boot.c

tracing: use macros to denote usec and nsec per second

2009-04-07 14:43:06 +02:00

trace_branch.c

tracing: add handler to trace_stat

2009-03-24 23:22:58 -04:00

trace_clock.c

tracing: fix four sparse warnings

2009-03-22 18:16:54 +01:00

trace_event_profile.c

tracing/ftrace: factorize the tracing files creation

2009-04-07 14:43:07 +02: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: disallow integer values for string filters and vice versa

2009-03-24 08:26:52 +01:00

trace_events_stage_1.h

tracing: update comments to match event code macros

2009-03-10 13:12:58 -04:00

trace_events_stage_2.h

tracing: add run-time field descriptions for event filtering

2009-03-22 18:11:22 +01: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: filter fix for TRACE_EVENT_FORMAT events

2009-03-26 09:13:14 +01: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: add option to calculate graph time or not

2009-03-24 23:41:11 -04:00

trace_functions.c

tracing/core: use appropriate waiting on trace_pipe

2009-02-18 01:40:20 +01:00

trace_hw_branches.c

tracing/hw-branch-tracing: convert bts-tracer mutex to a spinlock

2009-02-25 09:16:01 +01:00

trace_irqsoff.c

tracing: have latency tracers set the latency format

2009-03-04 22:15:30 -05:00

trace_mmiotrace.c

tracing: use macros to denote usec and nsec per second

2009-04-07 14:43:06 +02: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

Merge branch 'tracing/urgent' into tracing/ftrace

2009-04-07 14:41:17 +02:00

trace_output.h

Merge branch 'linus' into tracing/core

2009-04-07 13:47:45 +02:00

trace_power.c

tracing: make power tracer start/stop methods lighter weight

2009-03-17 23:12:11 -04:00

trace_printk.c

tracing/ftrace: factorize the tracing files creation

2009-04-07 14:43:07 +02:00

trace_sched_switch.c

ftrace: clean up enable logic for sched_switch

2009-04-07 14:43:09 +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

tracing: keep the tracing buffer after self-test failure

2009-03-22 15:17:21 +01:00

trace_stack.c

tracing/ftrace: factorize the tracing files creation

2009-04-07 14:43:07 +02:00

trace_stat.c

Merge branch 'linus' into tracing/core

2009-04-07 13:47:45 +02:00

trace_stat.h

tracing: add handler to trace_stat

2009-03-24 23:22:58 -04:00

trace_syscalls.c

tracing/syscalls: use a dedicated file header

2009-04-09 05:43:32 +02:00

trace_sysprof.c

tracing/ftrace: factorize the tracing files creation

2009-04-07 14:43:07 +02:00

trace_workqueue.c

Merge branch 'linus' into tracing/core

2009-04-07 13:47:45 +02:00

trace.c

Merge branch 'tracing/urgent' into tracing/core

2009-04-10 12:46:51 +02:00

trace.h

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

2009-04-07 14:10:10 -07:00