Merge branch 'tracing/fastboot' into tracing/ftrace

2008-11-06 07:43:47 +01:00
parent 3299b4dd11 79a9d461fd
commit 79c81d220c
6 changed files with 66 additions and 38 deletions
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -49,6 +49,7 @@ struct ftrace_entry {
 	unsigned long		parent_ip;
 };
 extern struct tracer boot_tracer;
+extern struct tracer sched_switch_trace; /* Used by the boot tracer */

 /*
 * Context switch trace entry - which task (and prio) we switched from/to: