Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

2026-10-16 22:39:48 +00:00 · 2009-02-28 10:15:58 +01:00 · 2009-02-28 10:15:58 +01:00 · acdb2c2879
commit acdb2c2879
parent e9abf4c59d f2034f1e1a
13 changed files with 776 additions and 123 deletions
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
--- a/include/trace/irq_event_types.h
+++ b/include/trace/irq_event_types.h
--- a/include/trace/sched_event_types.h
+++ b/include/trace/sched_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/trace/events.c
+++ b/kernel/trace/events.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.c
+++ b/kernel/trace/trace_events.c
--- a/kernel/trace/trace_events.h
+++ b/kernel/trace/trace_events.h
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h