diff --git a/[refs] b/[refs] index 2eb8645762e0..c6dde39cb402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b34083f46c3784c6535dc9742dc13653ec1908d +refs/heads/master: 778141e3cf0bf29f91cd3cb5c314ea477b9402a7 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index b0cd86501c30..fa79c377d65d 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -5647,6 +5647,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event) event->attr.sample_period = NSEC_PER_SEC / freq; hwc->sample_period = event->attr.sample_period; local64_set(&hwc->period_left, hwc->sample_period); + hwc->last_period = hwc->sample_period; event->attr.freq = 0; } }