Frederic Weisbecker 0f8f86c7bd Merge commit 'perf/core' into perf/hw-breakpoint ...

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

2009-10-18 01:12:33 +02:00

..

blktrace.c

Add a tracepoint for block request remapping

2009-10-01 21:19:34 +02:00

ftrace.c

ftrace: Copy ftrace_graph_filter boot param using strlcpy

2009-10-14 20:43:39 +02:00

Kconfig

Merge commit 'perf/core' into perf/hw-breakpoint

2009-10-18 01:12:33 +02:00

kmemtrace.c

kmemtrace: Fix up tracer registration

2009-10-01 11:53:44 +02:00

Makefile

Merge commit 'perf/core' into perf/hw-breakpoint

2009-10-18 01:12:33 +02:00

power-traces.c

tracing, perf: Convert the power tracer into an event tracer

2009-09-19 11:42:12 +02:00

ring_buffer_benchmark.c

ring-buffer: have benchmark test print to trace buffer

2009-06-17 17:01:09 -04:00

ring_buffer.c

tracing/events: Add 'signed' field to format files

2009-10-06 15:04:45 +02: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: user local buffer variable for trace branch tracer

2009-10-07 21:53:41 -04:00

trace_clock.c

tracing: optimize global_trace_clock cachelines

2009-09-15 12:24:22 -04:00

trace_entries.h

Merge commit 'perf/core' into perf/hw-breakpoint

2009-10-18 01:12:33 +02:00

trace_event_profile.c

tracing: Use free_percpu instead of kfree

2009-10-05 10:57:56 +02:00

trace_events_filter.c

tracing/events: Fix locking imbalance in the filter code

2009-10-15 12:41:56 +02:00

trace_events.c

Merge branch 'tracing/core' into perf/core

2009-10-15 11:34:00 +02:00

trace_export.c

tracing/events: Add 'signed' field to format files

2009-10-06 15:04:45 +02:00

trace_functions_graph.c

tracing: switch function prints from %pf to %ps

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

trace_functions.c

tracing: switch function prints from %pf to %ps

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

trace_hw_branches.c

tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

2009-10-07 21:52:03 -04:00

trace_irqsoff.c

tracing: do not update tracing_max_latency when tracer is stopped

2009-09-12 21:45:17 -04:00

trace_ksym.c

tracing: Fix ring-buffer and ksym tracer merge interaction

2009-09-07 08:22:10 +02:00

trace_mmiotrace.c

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

2009-09-12 23:34:04 -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 transposed numbers of lock_depth and preempt_count

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

trace_output.h

tracing: consolidate code between trace_output.c and trace_function_graph.c

2009-09-11 14:24:13 -04:00

trace_printk.c

tracing: Remove markers

2009-09-18 21:22:08 +02: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: do not update tracing_max_latency when tracer is stopped

2009-09-12 21:45:17 -04:00

trace_selftest_dynamic.c

ftrace: fix dynamic ftrace selftest

2008-05-23 21:13:23 +02:00

trace_selftest.c

Merge branch 'tracing/core' into tracing/hw-breakpoints

2009-09-07 08:19:51 +02:00

trace_stack.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07: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 branch 'tracing/core' into perf/core

2009-10-15 11:34:00 +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

trace.c

ftrace: Rename set_bootup_ftrace into set_cmdline_ftrace

2009-10-14 20:55:55 +02:00

trace.h

Merge commit 'perf/core' into perf/hw-breakpoint

2009-10-18 01:12:33 +02:00