---

yaml --- r: 121062 b: refs/heads/master c: 79a9d46 h: refs/heads/master v: v3
git-mirror · Nov 4, 2008 · 893f7e2 · 893f7e2
1 parent c1075a4
commit 893f7e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efade6e7821c4219818e9da08f9315dfa617048b
+refs/heads/master: 79a9d461fd521f133f0e66485aa9ed09c21f5191
diff --git a/trunk/kernel/trace/trace_boot.c b/trunk/kernel/trace/trace_boot.c
@@ -37,9 +37,9 @@ void disable_boot_trace(void)
 		tracing_stop_cmdline_record();
 }
 
-void reset_boot_trace(struct trace_array *tr)
+static void reset_boot_trace(struct trace_array *tr)
 {
-	disable_boot_trace();
+	sched_switch_trace.reset(tr);
 }
 
 static void boot_trace_init(struct trace_array *tr)

diff --git a/trunk/kernel/trace/trace_sched_switch.c b/trunk/kernel/trace/trace_sched_switch.c
@@ -173,7 +173,7 @@ static void sched_switch_trace_init(struct trace_array *tr)
 
 static void sched_switch_trace_reset(struct trace_array *tr)
 {
-	if (tr->ctrl)
+	if (tr->ctrl && sched_ref)
 		stop_sched_trace(tr);
 }