---

yaml --- r: 223839 b: refs/heads/master c: 9639882 h: refs/heads/master i: 223837: 7855bf0 223835: f6337f5 223831: 50fdf16 223823: 784dced 223807: 90282ad v: v3
git-mirror · Nov 26, 2010 · 0d8a730 · 0d8a730
1 parent 69be9ad
commit 0d8a730
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d508e820a23d9b6e8a149dfaa8ba5cbedf3d95c
+refs/heads/master: 963988262c3c8f4234f64a0dde59446a295e07bb
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -4240,6 +4240,13 @@ static int __perf_event_overflow(struct perf_event *event, int nmi,
 	struct hw_perf_event *hwc = &event->hw;
 	int ret = 0;
 
+	/*
+	 * Non-sampling counters might still use the PMI to fold short
+	 * hardware counters, ignore those.
+	 */
+	if (unlikely(!is_sampling_event(event)))
+		return 0;
+
 	if (!throttle) {
 		hwc->interrupts++;
 	} else {