Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

2026-09-26 18:16:26 +00:00 · 2008-12-04 09:07:44 +01:00 · 2008-12-04 09:07:44 +01:00 · b29144c317
commit b29144c317
parent b8307db247 e8e1abe92f 764f3b9513
21 changed files with 884 additions and 726 deletions
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
--- a/arch/x86/kernel/dumpstack.h
+++ b/arch/x86/kernel/dumpstack.h
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
--- 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_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c