From 8f7a903fbdb9326217219c9c69347055bab9e2b9 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 18 Jan 2011 21:44:04 +1100
Subject: [PATCH] --- yaml --- r: 232295 b: refs/heads/master c:
 8c8a9b25b5de3f1eeac721cf34f4379e56d5d694 h: refs/heads/master i:   232293:
 a59e096c1c26ebec5cf9bf08a936cae7e9b0f28f   232291:
 c0f26a148cb7ea4718631e45474a7a57038ce656   232287:
 f1f2655ad5174000419784d6760214a724a71563 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/powerpc/kernel/perf_event_fsl_emb.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38b25b3452c2..a25db9a385e5 100644
--- 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
index 4dcf5f831e9d..b0dc8f7069cd 100644
--- 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;