diff options
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 9a18ff28ea5b..65f4dab0ce60 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -1120,6 +1120,8 @@ static void perf_event_sync_stat(struct perf_event_context *ctx, | |||
1120 | if (!ctx->nr_stat) | 1120 | if (!ctx->nr_stat) |
1121 | return; | 1121 | return; |
1122 | 1122 | ||
1123 | update_context_time(ctx); | ||
1124 | |||
1123 | event = list_first_entry(&ctx->event_list, | 1125 | event = list_first_entry(&ctx->event_list, |
1124 | struct perf_event, event_entry); | 1126 | struct perf_event, event_entry); |
1125 | 1127 | ||
@@ -1163,8 +1165,6 @@ void perf_event_task_sched_out(struct task_struct *task, | |||
1163 | if (likely(!ctx || !cpuctx->task_ctx)) | 1165 | if (likely(!ctx || !cpuctx->task_ctx)) |
1164 | return; | 1166 | return; |
1165 | 1167 | ||
1166 | update_context_time(ctx); | ||
1167 | |||
1168 | rcu_read_lock(); | 1168 | rcu_read_lock(); |
1169 | parent = rcu_dereference(ctx->parent_ctx); | 1169 | parent = rcu_dereference(ctx->parent_ctx); |
1170 | next_ctx = next->perf_event_ctxp; | 1170 | next_ctx = next->perf_event_ctxp; |