From 8ecd9319bce6cbe39e19147318fd1df6220cd80c Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Mon, 5 Nov 2012 15:08:38 +0000
Subject: [PATCH] --- yaml --- r: 356388 b: refs/heads/master c:
 e13e895f8430d8c8b7a51478a4abd481bf9b64fb h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/perf/core-book3s.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b00a71614d1d..2e79683f15b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc09c219b2e6f9436d06a1a3a10eff97faab371c
+refs/heads/master: e13e895f8430d8c8b7a51478a4abd481bf9b64fb
diff --git a/trunk/arch/powerpc/perf/core-book3s.c b/trunk/arch/powerpc/perf/core-book3s.c
index 53fc7b8e5d9a..89bd59365c07 100644
--- a/trunk/arch/powerpc/perf/core-book3s.c
+++ b/trunk/arch/powerpc/perf/core-book3s.c
@@ -1349,6 +1349,8 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
 	 */
 	val = 0;
 	left = local64_read(&event->hw.period_left) - delta;
+	if (delta == 0)
+		left++;
 	if (period) {
 		if (left <= 0) {
 			left += period;