Steven Rostedt f0218b3e99 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6 ...

Conflicts:
	include/trace/ftrace.h
	kernel/trace/trace_kprobe.c

Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2010-05-18 00:35:23 -04:00

..

blktrace.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

ftrace.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

Kconfig

x86, perf, bts, mm: Delete the never used BTS-ptrace code

2010-03-26 11:33:55 +01:00

kmemtrace.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

Makefile

x86, perf, bts, mm: Delete the never used BTS-ptrace code

2010-03-26 11:33:55 +01:00

power-traces.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ring_buffer_benchmark.c

ring-buffer: Make benchmark handle missed events

2010-04-27 13:26:58 -04:00

ring_buffer.c

ring-buffer: Wrap open-coded WARN_ONCE

2010-05-04 12:23:47 -04:00

trace_boot.c

tracing: add filter event logic to special, mmiotrace and boot tracers

2009-09-12 23:34:04 -04:00

trace_branch.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_clock.c

tracing: Fix lockdep warning in global_clock()

2010-03-29 15:16:44 -04:00

trace_entries.h

x86, perf, bts, mm: Delete the never used BTS-ptrace code

2010-03-26 11:33:55 +01:00

trace_event_perf.c

tracing: Remove duplicate id information in event structure

2010-05-14 14:33:15 -04:00

trace_events_filter.c

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

2010-05-18 00:35:23 -04:00

trace_events.c

tracing: Combine event filter_active and enable into single flags field

2010-05-14 14:33:22 -04:00

trace_export.c

tracing: Remove duplicate id information in event structure

2010-05-14 14:33:15 -04:00

trace_functions_graph.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_functions.c

tracing: switch function prints from %pf to %ps

2009-09-17 15:53:40 -04:00

trace_irqsoff.c

tracing: Add graph output support for irqsoff tracer

2010-04-27 12:36:53 -04:00

trace_kprobe.c

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

2010-05-18 00:35:23 -04:00

trace_ksym.c

hw-breakpoints: Get the number of available registers on boot dynamically

2010-05-01 04:32:14 +02:00

trace_mmiotrace.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09: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: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_output.h

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_printk.c

tracing: Remove markers

2009-09-18 21:22:08 +02:00

trace_sched_switch.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

trace_sched_wakeup.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

trace_selftest_dynamic.c

…

trace_selftest.c

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

2010-05-18 00:35:23 -04:00

trace_stack.c

tracing: Fix circular dead lock in stack trace

2010-02-02 10:20:18 -05:00

trace_stat.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

trace_stat.h

tracing/stat: Add stat_release() callback

2009-07-10 12:14:05 +02:00

trace_syscalls.c

tracing: Remove duplicate id information in event structure

2010-05-14 14:33:15 -04:00

trace_sysprof.c

perf events, x86/stacktrace: Make stack walking optional

2009-12-17 09:56:19 +01:00

trace_workqueue.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

trace.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace.h

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

2010-05-18 00:35:23 -04:00