---

yaml --- r: 367222 b: refs/heads/master c: 2033dc5 h: refs/heads/master v: v3
git-mirror · Mar 15, 2013 · ec47a4c · ec47a4c
1 parent c7d9ab9
commit ec47a4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ac1e6edacc7e1fb0405d61f95a797c6a712411
+refs/heads/master: 2033dc54e6fffac01f6129c0038c2e78102cf59a
diff --git a/trunk/arch/metag/kernel/perf/perf_event.c b/trunk/arch/metag/kernel/perf/perf_event.c
@@ -214,6 +214,7 @@ void metag_pmu_event_update(struct perf_event *event,
 	delta = (new_raw_count - prev_raw_count) & MAX_PERIOD;
 
 	local64_add(delta, &event->count);
+	local64_sub(delta, &hwc->period_left);
 }
 
 int metag_pmu_event_set_period(struct perf_event *event,
@@ -223,6 +224,10 @@ int metag_pmu_event_set_period(struct perf_event *event,
 	s64 period = hwc->sample_period;
 	int ret = 0;
 
+	/* The period may have been changed */
+	if (unlikely(period != hwc->last_period))
+		left += period - hwc->last_period;
+
 	if (unlikely(left <= -period)) {
 		left = period;
 		local64_set(&hwc->period_left, left);