Ingo Molnar 10b0256496 Merge branch 'perf/kprobes' into perf/core ...

Conflicts:
	arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

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

2014-06-05 12:26:50 +02:00

..

blktrace.c

Merge tag 'trace-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2014-04-03 10:26:31 -07:00

ftrace.c

ftrace/module: Hardcode ftrace_module_init() call into load_module()

2014-04-28 10:37:21 -04:00

Kconfig

uprobes: Kconfig dependency fix

2014-03-18 16:39:33 -04:00

Makefile

…

power-traces.c

…

ring_buffer_benchmark.c

trace: Replace hardcoding of 19 with MAX_NICE

2014-02-27 12:41:03 +01:00

ring_buffer.c

trace, ring-buffer: Fix CPU hotplug callback registration

2014-03-20 13:43:48 +01:00

rpm-traces.c

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

kprobes, ftrace: Use NOKPROBE_SYMBOL macro in ftrace

2014-04-24 10:26:39 +02:00

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_trigger.c

tracing: Use rcu_dereference_sched() for trace event triggers

2014-05-02 23:12:42 -04:00

trace_events.c

tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints

2014-04-08 20:43:28 -04:00

trace_export.c

tracing: Fix anonymous unions in struct ftrace_event_call

2014-04-09 20:02:55 -04:00

trace_functions_graph.c

…

trace_functions.c

tracing: Do not try to recreated toplevel set_ftrace_* files

2014-04-16 19:21:53 -04:00

trace_irqsoff.c

Merge tag 'trace-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2014-04-03 10:26:31 -07:00

trace_kdb.c

…

trace_kprobe.c

kprobes, ftrace: Use NOKPROBE_SYMBOL macro in ftrace

2014-04-24 10:26:39 +02:00

trace_mmiotrace.c

…

trace_nop.c

tracing: Set up infrastructure to allow tracers for instances

2014-02-20 12:13:10 -05:00

trace_output.c

tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints

2014-04-08 20:43:28 -04:00

trace_output.h

…

trace_printk.c

…

trace_probe.c

kprobes, ftrace: Use NOKPROBE_SYMBOL macro in ftrace

2014-04-24 10:26:39 +02:00

trace_probe.h

kprobes, ftrace: Use NOKPROBE_SYMBOL macro in ftrace

2014-04-24 10:26:39 +02:00

trace_sched_switch.c

…

trace_sched_wakeup.c

tracing: Pass trace_array to flag_changed callback

2014-02-20 12:13:08 -05:00

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_stack.c

tracing: Add BUG_ON when stack end location is over written

2014-03-24 10:39:11 -04:00

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_uprobe.c

Merge branch 'perf/kprobes' into perf/core

2014-06-05 12:26:50 +02:00

trace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-04-12 14:49:50 -07:00

trace.h

kernel: use macros from compiler.h instead of __attribute__((...))

2014-04-07 16:36:11 -07:00