---

yaml --- r: 147163 b: refs/heads/master c: a86ed50 h: refs/heads/master i: 147161: 321f5b0 147159: c2956aa v: v3
git-mirror · Dec 17, 2008 · 645bf99 · 645bf99
1 parent 4275945
commit 645bf99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f65cb45cba63f249458b669aa67069eabc37b2f5
+refs/heads/master: a86ed50859d65a08beec9474df97b88438a996df
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -1093,6 +1093,9 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event,
 	counter->group_leader		= group_leader;
 	counter->hw_ops			= NULL;
 
+	if (hw_event->disabled)
+		counter->state = PERF_COUNTER_STATE_OFF;
+
 	hw_ops = NULL;
 	if (!hw_event->raw && hw_event->type < 0)
 		hw_ops = sw_perf_counter_init(counter);