---

yaml --- r: 334831 b: refs/heads/master c: 3581fe0 h: refs/heads/master i: 334829: 376ece5 334827: f300c7f 334823: be8927b 334815: d9e8f5d v: v3
git-mirror · Oct 18, 2012 · 7c3fdbb · 7c3fdbb
1 parent c16ef37
commit 7c3fdbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2456f44dd7a9aaffc2cd21a13f78198b3d94da08
+refs/heads/master: 3581fe0ef37ce12ac7a4f74831168352ae848edc
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
@@ -96,6 +96,10 @@ armpmu_event_set_period(struct perf_event *event,
 	s64 period = hwc->sample_period;
 	int ret = 0;
 
+	/* The period may have been changed by PERF_EVENT_IOC_PERIOD */
+	if (unlikely(period != hwc->last_period))
+		left = period - (hwc->last_period - left);
+
 	if (unlikely(left <= -period)) {
 		left = period;
 		local64_set(&hwc->period_left, left);