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

Pull tracing updates from Steven Rostedt. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-10-31 05:15:34 +00:00 · 2012-11-13 19:21:32 +01:00 · 2012-11-13 19:21:32 +01:00 · 84e53ff77c
commit 84e53ff77c
parent ccf59d8da1 7bcfaf54f5
24 changed files with 365 additions and 343 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c