From ab9ad42ec075ed992f1d61d198119dd4885512bb Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Mon, 2 Apr 2012 20:19:14 +0200
Subject: [PATCH] --- yaml --- r: 304890 b: refs/heads/master c:
 fc006cf7cc7471e1bdf34e40111971e03622af6c h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index afd3d7db1bf7..d422b426a400 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98112d2e957e0d348f06d8a40f2f720204a70b55
+refs/heads/master: fc006cf7cc7471e1bdf34e40111971e03622af6c
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c
index 29a1bffe1dfb..3e32908292a7 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c
@@ -78,16 +78,13 @@ perf_event_set_period(struct hw_perf_event *hwc, u64 min, u64 max, u64 *hw_perio
 		overflow = 1;
 	}
 
-	if (unlikely(left <= 0)) {
+	if (unlikely(left < (s64)min)) {
 		left += period;
 		local64_set(&hwc->period_left, left);
 		hwc->last_period = period;
 		overflow = 1;
 	}
 
-	if (unlikely(left < min))
-		left = min;
-
 	if (left > max)
 		left = max;