diff options
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index d3dae3419b99..10d076b2572c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -1868,8 +1868,6 @@ event_sched_in(struct perf_event *event, | |||
| 1868 | 1868 | ||
| 1869 | perf_pmu_disable(event->pmu); | 1869 | perf_pmu_disable(event->pmu); |
| 1870 | 1870 | ||
| 1871 | event->tstamp_running += tstamp - event->tstamp_stopped; | ||
| 1872 | |||
| 1873 | perf_set_shadow_time(event, ctx, tstamp); | 1871 | perf_set_shadow_time(event, ctx, tstamp); |
| 1874 | 1872 | ||
| 1875 | perf_log_itrace_start(event); | 1873 | perf_log_itrace_start(event); |
| @@ -1881,6 +1879,8 @@ event_sched_in(struct perf_event *event, | |||
| 1881 | goto out; | 1879 | goto out; |
| 1882 | } | 1880 | } |
| 1883 | 1881 | ||
| 1882 | event->tstamp_running += tstamp - event->tstamp_stopped; | ||
| 1883 | |||
| 1884 | if (!is_software_event(event)) | 1884 | if (!is_software_event(event)) |
| 1885 | cpuctx->active_oncpu++; | 1885 | cpuctx->active_oncpu++; |
| 1886 | if (!ctx->nr_active++) | 1886 | if (!ctx->nr_active++) |
