---

yaml --- r: 361555 b: refs/heads/master c: 778141e h: refs/heads/master i: 361553: e7f3518 361551: 16303c1 v: v3
git-mirror · Mar 18, 2013 · 1537af3 · 1537af3
1 parent 4d0d693
commit 1537af3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}
 }