---

yaml --- r: 140979 b: refs/heads/master c: 62524d5 h: refs/heads/master i: 140977: 6553988 140975: 1eb8039 v: v3
git-mirror · Mar 18, 2009 · c204475 · c204475
1 parent 335a3c1
commit c204475
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fec6ddcb43a91aa9a254c8ecf174c803de6f07e
+refs/heads/master: 62524d55e5b9ffe36e3bf3dd7a594114f150b449
diff --git a/trunk/kernel/trace/trace_power.c b/trunk/kernel/trace/trace_power.c
@@ -122,10 +122,14 @@ static int tracing_power_register(void)
 static void start_power_trace(struct trace_array *tr)
 {
 	trace_power_enabled = 1;
-	tracing_power_register();
 }
 
 static void stop_power_trace(struct trace_array *tr)
+{
+	trace_power_enabled = 0;
+}
+
+static void power_trace_reset(struct trace_array *tr)
 {
 	trace_power_enabled = 0;
 	unregister_trace_power_start(probe_power_start);
@@ -188,7 +192,7 @@ static struct tracer power_tracer __read_mostly =
 	.init		= power_trace_init,
 	.start		= start_power_trace,
 	.stop		= stop_power_trace,
-	.reset		= stop_power_trace,
+	.reset		= power_trace_reset,
 	.print_line	= power_print_line,
 };