From f5585afccf22ec0992ad1259f0c3aa59b6f95391 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Tue, 1 Jun 2010 15:43:34 -0400
Subject: [PATCH] --- yaml --- r: 200299 b: refs/heads/master c:
 238c1a78c957f3dc7cb848b161dcf4805793ed56 h: refs/heads/master i:   200297:
 9ba1d893a1fb02e64ed8fc09604f298a1f40f799   200295:
 5e72506fc803016c15d75202c60248215bce3afc v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/oprofile/op_model_cell.c | 2 +-
 trunk/kernel/perf_event.c                   | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 72469fa29340..489d87e2fba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6ab91add6355e231e1c47897027b2a6ee4fa268
+refs/heads/master: 238c1a78c957f3dc7cb848b161dcf4805793ed56
diff --git a/trunk/arch/powerpc/oprofile/op_model_cell.c b/trunk/arch/powerpc/oprofile/op_model_cell.c
index 2c9e52267292..7fd90d02d8c6 100644
--- a/trunk/arch/powerpc/oprofile/op_model_cell.c
+++ b/trunk/arch/powerpc/oprofile/op_model_cell.c
@@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n)
 		index = ENTRIES-1;
 
 	/* make sure index is valid */
-	if ((index > ENTRIES) || (index < 0))
+	if ((index >= ENTRIES) || (index < 0))
 		index = ENTRIES-1;
 
 	return initial_lfsr[index];
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index ff86c558af4c..31d6afe92594 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -1507,9 +1507,6 @@ do {					\
 		divisor = nsec * frequency;
 	}
 
-	if (!divisor)
-		return dividend;
-
 	return div64_u64(dividend, divisor);
 }
 
@@ -1532,7 +1529,7 @@ static int perf_event_start(struct perf_event *event)
 static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
 {
 	struct hw_perf_event *hwc = &event->hw;
-	s64 period, sample_period;
+	u64 period, sample_period;
 	s64 delta;
 
 	period = perf_calculate_period(event, nsec, count);