perf, x86: Avoid double disable on throttle vs ioctl(PERF_IOC_DISABLE)

[mv-sheeva.git] / arch / x86 / kernel / cpu / perf_event_intel_ds.c

diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index e7ac51770d4d7ca1d8510551a3e0f66c0d6ffec3..a7401e4167df951902ed22a8cdab494af29d104a 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -461,7 +461,6 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)
 }
 
 static int intel_pmu_save_and_restart(struct perf_event *event);
-static void intel_pmu_disable_event(struct perf_event *event);
 
 static void intel_pmu_drain_pebs_core(struct pt_regs *iregs)
 {
@@ -528,7 +527,7 @@ static void intel_pmu_drain_pebs_core(struct pt_regs *iregs)
                regs.flags &= ~PERF_EFLAGS_EXACT;
 
        if (perf_event_overflow(event, 1, &data, &regs))
-               intel_pmu_disable_event(event);
+               x86_pmu_stop(event);
 
 out:
        intel_pmu_pebs_enable_all();
@@ -603,7 +602,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)
                        regs.flags &= ~PERF_EFLAGS_EXACT;
 
                if (perf_event_overflow(event, 1, &data, &regs))
-                       intel_pmu_disable_event(event);
+                       x86_pmu_stop(event);
        }
 out:
        intel_pmu_pebs_enable_all();