From 55140380c2968b678da2b7e6ce723ba35cdeeb5b Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed, 29 Sep 2010 23:01:38 -0400
Subject: [PATCH] --- yaml --- r: 211269 b: refs/heads/master c:
 03e22198d2379ffa746c9ea332fbb1f094f9423b h: refs/heads/master i:   211267:
 3219229c7ab8a1ac556f71818cdbdb06ec372e0f v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_p4.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d47c5d6e5f99..20ba482577af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d943b02f6f1b57787ff1aa6f34d019a407e3ee
+refs/heads/master: 03e22198d2379ffa746c9ea332fbb1f094f9423b
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p4.c b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
index b560db3305be..249015173992 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
@@ -660,8 +660,12 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
 	for (idx = 0; idx < x86_pmu.num_counters; idx++) {
 		int overflow;
 
-		if (!test_bit(idx, cpuc->active_mask))
+		if (!test_bit(idx, cpuc->active_mask)) {
+			/* catch in-flight IRQs */
+			if (__test_and_clear_bit(idx, cpuc->running))
+				handled++;
 			continue;
+		}
 
 		event = cpuc->events[idx];
 		hwc = &event->hw;