---

yaml --- r: 232295 b: refs/heads/master c: 8c8a9b2 h: refs/heads/master i: 232293: a59e096 232291: c0f26a1 232287: f1f2655 v: v3
git-mirror · Jan 19, 2011 · 8f7a903 · 8f7a903
1 parent 30d9010
commit 8f7a903
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: 8550d7cb6ed6c89add49c3b6ad4c753ab8a3d7f9
+refs/heads/master: 8c8a9b25b5de3f1eeac721cf34f4379e56d5d694
diff --git a/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c b/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c
@@ -596,6 +596,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
 			if (left <= 0)
 				left = period;
 			record = 1;
+			event->hw.last_period = event->hw.sample_period;
 		}
 		if (left < 0x80000000LL)
 			val = 0x80000000LL - left;