Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "A bogus warning fix, a counter width handling fix affecting certain
  machines, plus a oneliner hw-enablement patch for Knights Mill CPUs"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Remove invalid warning from list_update_cgroup_even()t
  perf/x86: Fix full width counter, counter overflow
  perf/x86/intel: Enable C-state residency events for Knights Mill

1 files changed, 8 insertions, 11 deletions

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 6ee1febdf6ff..02c8421f8c01 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -903,17 +903,14 @@ list_update_cgroup_event(struct perf_event *event,
          */
         cpuctx = __get_cpu_context(ctx);
 
-        /* Only set/clear cpuctx->cgrp if current task uses event->cgrp. */
-        if (perf_cgroup_from_task(current, ctx) != event->cgrp) {
-                /*
-                 * We are removing the last cpu event in this context.
-                 * If that event is not active in this cpu, cpuctx->cgrp
-                 * should've been cleared by perf_cgroup_switch.
-                 */
-                WARN_ON_ONCE(!add && cpuctx->cgrp);
-                return;
-        }
-        cpuctx->cgrp = add ? event->cgrp : NULL;
+        /*
+         * cpuctx->cgrp is NULL until a cgroup event is sched in or
+         * ctx->nr_cgroup == 0 .
+         */
+        if (add && perf_cgroup_from_task(current, ctx) == event->cgrp)
+                cpuctx->cgrp = event->cgrp;
+        else if (!add)
+                cpuctx->cgrp = NULL;
 }
 
 #else /* !CONFIG_CGROUP_PERF */