Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
---
 kernel/events/core.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2170,12 +2170,12 @@ perf_install_in_context(struct perf_even
                raw_spin_unlock_irq(&ctx->lock);
                return;
        }
-       update_context_time(ctx);
-       /*
-        * Update cgrp time only if current cgrp matches event->cgrp.
-        * Must be done before calling add_event_to_ctx().
-        */
-       update_cgrp_time_from_event(event);
+
+       if (ctx->is_active) {
+               update_context_time(ctx);
+               update_cgrp_time_from_event(event);
+       }
+
        add_event_to_ctx(event, ctx);
        raw_spin_unlock_irq(&ctx->lock);
 


Reply via email to