From 870a243cf3370d89a910351d09b6f77cae5fae96 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 3 Jun 2010 23:34:09 +0200
Subject: [PATCH] --- yaml --- r: 200301 b: refs/heads/master c:
 b9b76dfaac6fa2c289ee8a005be637afd2da7e2f h: refs/heads/master i:   200299:
 f5585afccf22ec0992ad1259f0c3aa59b6f95391 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/oprofile/op_model_cell.c | 2 +-
 trunk/include/trace/events/signal.h         | 3 ++-
 trunk/kernel/perf_event.c                   | 5 +----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c69da241b0e1..3274398e45a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84bb671dc46d77d665d2b5e74539e81b2129bb3e
+refs/heads/master: b9b76dfaac6fa2c289ee8a005be637afd2da7e2f
diff --git a/trunk/arch/powerpc/oprofile/op_model_cell.c b/trunk/arch/powerpc/oprofile/op_model_cell.c
index 7fd90d02d8c6..2c9e52267292 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/include/trace/events/signal.h b/trunk/include/trace/events/signal.h
index 814566c99d29..17df43464df0 100644
--- a/trunk/include/trace/events/signal.h
+++ b/trunk/include/trace/events/signal.h
@@ -10,7 +10,8 @@
 
 #define TP_STORE_SIGINFO(__entry, info)				\
 	do {							\
-		if (info == SEND_SIG_NOINFO) {			\
+		if (info == SEND_SIG_NOINFO ||			\
+		    info == SEND_SIG_FORCED) {			\
 			__entry->errno	= 0;			\
 			__entry->code	= SI_USER;		\
 		} else if (info == SEND_SIG_PRIV) {		\
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);