From 893f7e23aa5b750992b6bb1e5a4b0570aa3b95d5 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 31 Oct 2008 13:34:45 +0100
Subject: [PATCH] --- yaml --- r: 121062 b: refs/heads/master c:
 79a9d461fd521f133f0e66485aa9ed09c21f5191 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/kernel/trace/trace_boot.c         | 4 ++--
 trunk/kernel/trace/trace_sched_switch.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 19f156351f8f..3b5d0bc4dfd5 100644
--- 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
index 6bbc8794a6df..bd5046c9deb7 100644
--- 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
index 969953bf678f..888944d3409d 100644
--- 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);
 }