From 645bf99fcaa8e8e28e514ee6aa1628598d196731 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Dec 2008 00:43:10 +0100
Subject: [PATCH] --- yaml --- r: 147163 b: refs/heads/master c:
 a86ed50859d65a08beec9474df97b88438a996df h: refs/heads/master i:   147161:
 321f5b012c0f17e1030f9bbf0721b10261d0d9e4   147159:
 c2956aa2d94f587d4f75df6a5d4b9bb3d8dc819a v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c6cd8d42d8fc..c79b97d84624 100644
--- 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
index 16396e9406fa..5431e790b5d6 100644
--- 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);