---

yaml --- r: 200298 b: refs/heads/master c: f6ab91a h: refs/heads/master v: v3
git-mirror · Jun 8, 2010 · 35f6bf0 · 35f6bf0
1 parent 9ba1d89
commit 35f6bf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58cc1a9e3b11a84e66c4d3a4cc9073f2cb0ecabb
+refs/heads/master: f6ab91add6355e231e1c47897027b2a6ee4fa268
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1507,6 +1507,9 @@ do {					\
 		divisor = nsec * frequency;
 	}
 
+	if (!divisor)
+		return dividend;
+
 	return div64_u64(dividend, divisor);
 }
 
@@ -1529,7 +1532,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;
-	u64 period, sample_period;
+	s64 period, sample_period;
 	s64 delta;
 
 	period = perf_calculate_period(event, nsec, count);