perf, x86: Avoid double disable on throttle vs ioctl(PERF_IOC_DISABLE)
[linux-2.6.git] / arch / x86 / kernel / cpu / perf_event_intel.c
index a840948..84bfde6 100644 (file)
@@ -765,7 +765,6 @@ again:
        for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
                struct perf_event *event = cpuc->events[bit];
 
-               clear_bit(bit, (unsigned long *) &status);
                if (!test_bit(bit, cpuc->active_mask))
                        continue;
 
@@ -775,7 +774,7 @@ again:
                data.period = event->hw.last_period;
 
                if (perf_event_overflow(event, 1, &data, regs))
-                       intel_pmu_disable_event(event);
+                       x86_pmu_stop(event);
        }
 
        intel_pmu_ack_status(ack);