---

yaml --- r: 367219 b: refs/heads/master c: c43ca04 h: refs/heads/master i: 367217: 921c5f0 367215: 3aa2021 v: v3
git-mirror · Mar 15, 2013 · 7d6afd3 · 7d6afd3
1 parent a444e11
commit 7d6afd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3424dabb6508d538e9ec1a2aa889fefbd83df2d0
+refs/heads/master: c43ca04b5e7854b3996f84a495e4553941e76266
diff --git a/trunk/arch/metag/kernel/perf/perf_event.c b/trunk/arch/metag/kernel/perf/perf_event.c
@@ -211,7 +211,7 @@ void metag_pmu_event_update(struct perf_event *event,
 	/*
 	 * Calculate the delta and add it to the counter.
 	 */
-	delta = new_raw_count - prev_raw_count;
+	delta = (new_raw_count - prev_raw_count) & MAX_PERIOD;
 
 	local64_add(delta, &event->count);
 }