---

yaml --- r: 147479 b: refs/heads/master c: b986d7e h: refs/heads/master i: 147477: 0b9c7ae 147475: f835224 147471: 8a61200 v: v3
git-mirror · May 20, 2009 · d73bd83 · d73bd83
1 parent ebeb5e4
commit d73bd83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26b119bc811a73bac6ecf95bdf284bf31c7955f0
+refs/heads/master: b986d7ec0f8b7ea3cc7366d80a137fbe839df227
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -2716,7 +2716,8 @@ static int cpu_clock_perf_counter_enable(struct perf_counter *counter)
 
 static void cpu_clock_perf_counter_disable(struct perf_counter *counter)
 {
-	hrtimer_cancel(&counter->hw.hrtimer);
+	if (counter->hw.irq_period)
+		hrtimer_cancel(&counter->hw.hrtimer);
 	cpu_clock_perf_counter_update(counter);
 }
 
@@ -2767,7 +2768,8 @@ static int task_clock_perf_counter_enable(struct perf_counter *counter)
 
 static void task_clock_perf_counter_disable(struct perf_counter *counter)
 {
-	hrtimer_cancel(&counter->hw.hrtimer);
+	if (counter->hw.irq_period)
+		hrtimer_cancel(&counter->hw.hrtimer);
 	task_clock_perf_counter_update(counter, counter->ctx->time);
 
 }