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 {