Merge branch 'tracing/ftrace' into tracing/core

2026-10-14 05:55:17 +00:00 · 2009-03-05 10:20:47 +01:00 · 2009-03-05 10:20:47 +01:00 · c4ef144a9d
commit c4ef144a9d
parent a1be621dfa efed792d67
31 changed files with 1155 additions and 432 deletions
--- a/Documentation/lockdep-design.txt
+++ b/Documentation/lockdep-design.txt
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
--- a/include/trace/lockdep.h
+++ b/include/trace/lockdep.h
--- a/include/trace/lockdep_event_types.h
+++ b/include/trace/lockdep_event_types.h
--- a/include/trace/trace_event_types.h
+++ b/include/trace/trace_event_types.h
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
--- a/kernel/lockdep_internals.h
+++ b/kernel/lockdep_internals.h
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
--- a/kernel/lockdep_states.h
+++ b/kernel/lockdep_states.h
--- a/kernel/mutex-debug.c
+++ b/kernel/mutex-debug.c
--- a/kernel/mutex-debug.h
+++ b/kernel/mutex-debug.h
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
--- a/kernel/mutex.h
+++ b/kernel/mutex.h
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
--- a/kernel/timer.c
+++ b/kernel/timer.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_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
--- a/mm/slab.c
+++ b/mm/slab.c
--- a/mm/slob.c
+++ b/mm/slob.c
--- a/mm/slub.c
+++ b/mm/slub.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c