Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / x86 / kernel / cpu / perf_event_knc.c

diff --git a/kernel/arch/x86/kernel/cpu/perf_event_knc.c b/kernel/arch/x86/kernel/cpu/perf_event_knc.c
index 5b0c232..b931095 100644 (file)
--- a/kernel/arch/x86/kernel/cpu/perf_event_knc.c
+++ b/kernel/arch/x86/kernel/cpu/perf_event_knc.c
@@ -263,7 +263,9 @@ again:
                goto again;
 
 done:
-       knc_pmu_enable_all(0);
+       /* Only restore PMU state when it's active. See x86_pmu_disable(). */
+       if (cpuc->enabled)
+               knc_pmu_enable_all(0);
 
        return handled;
 }