---

yaml --- r: 211269 b: refs/heads/master c: 03e2219 h: refs/heads/master i: 211267: 3219229 v: v3
git-mirror · Sep 30, 2010 · 5514038 · 5514038
1 parent 55a45ff
commit 5514038
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;