diff --git a/[refs] b/[refs] index 9319c58ac7a1..7fe05c0d7573 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e2af50b1fab3c40636839a7f439c167ae559533 +refs/heads/master: 5e942bb33371254a474653123cd9e13a4c89ee44 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index fb851ec34461..8be2574b89b6 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -4983,6 +4983,7 @@ void perf_event_exit_task(struct task_struct *child) * the events from it. */ unclone_ctx(child_ctx); + update_context_time(child_ctx); spin_unlock_irqrestore(&child_ctx->lock, flags); /*