Commit-ID: 6f932e5be1503ab0783699e843db325d44c2fabb Gitweb: http://git.kernel.org/tip/6f932e5be1503ab0783699e843db325d44c2fabb Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Wed, 24 Feb 2016 18:45:43 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 25 Feb 2016 08:42:33 +0100
perf: Only update context time when active Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Arnaldo Carvalho de Melo <a...@redhat.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: dvyu...@google.com Cc: eran...@google.com Cc: o...@redhat.com Cc: pan...@redhat.com Cc: sasha.le...@oracle.com Cc: vi...@deater.net Link: http://lkml.kernel.org/r/20160224174947.860690...@infradead.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/events/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index d5299e2..64698fb 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2170,12 +2170,12 @@ perf_install_in_context(struct perf_event_context *ctx, 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);
