Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes

[firefly-linux-kernel-4.4.55.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index ce21143c0d9efe93cd75ebaf86979a4507464464..a9796c8ff7e055d0fee3f4c9d24a711ff3807ca4 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1869,8 +1869,6 @@ event_sched_in(struct perf_event *event,
 
        perf_pmu_disable(event->pmu);
 
-       event->tstamp_running += tstamp - event->tstamp_stopped;
-
        perf_set_shadow_time(event, ctx, tstamp);
 
        perf_log_itrace_start(event);
@@ -1882,6 +1880,8 @@ event_sched_in(struct perf_event *event,
                goto out;
        }
 
+       event->tstamp_running += tstamp - event->tstamp_stopped;
+
        if (!is_software_event(event))
                cpuctx->active_oncpu++;
        if (!ctx->nr_active++)