From 0d8a73091ed92efe0a3a5af401e863b69894fd8d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 24 Nov 2010 18:55:29 +0100
Subject: [PATCH] --- yaml --- r: 223839 b: refs/heads/master c:
 963988262c3c8f4234f64a0dde59446a295e07bb h: refs/heads/master i:   223837:
 7855bf0f3cc30d4e64445e8a7beaff359a24f147   223835:
 f6337f5f959f997141ac33f05441b221ea29ed6d   223831:
 50fdf16512d38a25c477e445b859e139835e1a98   223823:
 784dced5711008fa6c3eb37192f1d83919a76d82   223807:
 90282ad0036835e026d878b6322d8520c8ce7004 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 36b25a23fd83..ae00d8ed715b 100644
--- 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
index 98c5549c8e29..af1e63f249f3 100644
--- 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 {