Ingo Molnar 063e047761 Merge branch 'linus' into perf/urgent ...

Merge back Linus's latest branch so that we pick up the uprobes changes.

( I tested this branch locally and while it's one from the middle of the
  merge window it's a good one to base further work off. )

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2012-05-30 10:59:04 +02:00

..

blktrace.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

ftrace.c

ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()

2012-05-16 20:00:27 -04:00

Kconfig

Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-24 11:39:34 -07:00

Makefile

Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-24 11:39:34 -07:00

power-traces.c

perf: Clean up power events by introducing new, more generic ones

2011-01-04 08:16:54 +01:00

ring_buffer_benchmark.c

tracing: Use NUMA allocation for per-cpu ring buffer pages

2011-06-14 22:04:39 -04:00

ring_buffer.c

ring-buffer: Check for valid buffer before changing size

2012-05-23 15:35:17 -04:00

rpm-traces.c

PM / Runtime: Introduce trace points for tracing rpm_* functions

2011-09-27 22:53:27 +02:00

trace_branch.c

tracing: Allow events to share their print functions

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

trace_clock.c

tracing: Add a counter clock for those that do not trust clocks

2011-09-19 11:35:58 -04:00

trace_entries.h

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

2012-03-24 08:19:09 +01:00

trace_event_perf.c

ftrace, perf: Add filter support for function trace event

2012-02-21 11:08:30 -05:00

trace_events_filter_test.h

tracing/filter: Add startup tests for events filter

2011-08-19 14:35:59 -04:00

trace_events_filter.c

ftrace, perf: Add filter support for function trace event

2012-02-21 11:08:30 -05:00

trace_events.c

tracing: Do not enable function event with enable

2012-05-10 15:55:43 -04:00

trace_export.c

tracing: Do not enable function event with enable

2012-05-10 15:55:43 -04:00

trace_functions_graph.c

tracing: Still trace filtered irq functions when irq trace is disabled

2011-07-07 22:26:27 -04:00

trace_functions.c

ftrace: Fix regression of :mod:module function enabling

2011-07-07 11:30:08 -04:00

trace_irqsoff.c

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

2011-11-11 08:19:37 +01:00

trace_kdb.c

kdb,ftdump: Remove reference to internal kdb include

2010-10-22 15:34:11 -05:00

trace_kprobe.c

tracing: Provide trace events interface for uprobes

2012-05-07 14:30:17 +02:00

trace_mmiotrace.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07: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 stacktrace of latency tracers (irqsoff and friends)

2012-04-19 17:00:13 -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: Add percpu buffers for trace_printk()

2012-04-23 21:15:55 -04:00

trace_probe.c

tracing: Provide trace events interface for uprobes

2012-05-07 14:30:17 +02:00

trace_probe.h

tracing: Provide trace events interface for uprobes

2012-05-07 14:30:17 +02:00

trace_sched_switch.c

tracing: Remove obsolete sched_switch tracer

2011-02-08 17:14:56 -05:00

trace_sched_wakeup.c

tracing/latency: Fix header output for latency tracers

2011-11-07 13:48:35 -05:00

trace_selftest_dynamic.c

ftrace: Add self-tests for multiple function trace users

2011-05-18 19:24:51 -04:00

trace_selftest.c

ftrace: Add self-tests for multiple function trace users

2011-05-18 19:24:51 -04:00

trace_stack.c

tracing: Have stack tracing set filtered functions at boot

2011-12-21 07:26:49 -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

ftrace, perf: Add add/del tracepoint perf registration actions

2012-02-21 11:08:25 -05:00

trace_uprobe.c

tracing: Provide trace events interface for uprobes

2012-05-07 14:30:17 +02:00

trace.c

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

2012-05-21 09:44:36 +02:00

trace.h

Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-24 11:39:34 -07:00