1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index db02eb16c777..473ed2cafbfc 100644
--- a/kernel/perf_counter.c
+++ b/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);
 
 }