---

yaml --- r: 210359 b: refs/heads/master c: de725de h: refs/heads/master i: 210357: a682c89 210355: 5e835d3 210351: 0de7f98 v: v3
git-mirror · Sep 3, 2010 · 4797887 · 4797887
1 parent c31bde2
commit 4797887
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e556b5b320838fde98480a1f6cf220a5af200fc
+refs/heads/master: de725dec9de7a7541996176d59cf8542365b8b0e
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel.c b/trunk/arch/x86/kernel/cpu/perf_event_intel.c
@@ -713,6 +713,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
 	struct cpu_hw_events *cpuc;
 	int bit, loops;
 	u64 status;
+	int handled = 0;
 
 	perf_sample_data_init(&data, 0);
 
@@ -743,12 +744,16 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
 	/*
 	 * PEBS overflow sets bit 62 in the global status register
 	 */
-	if (__test_and_clear_bit(62, (unsigned long *)&status))
+	if (__test_and_clear_bit(62, (unsigned long *)&status)) {
+		handled++;
 		x86_pmu.drain_pebs(regs);
+	}
 
 	for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
 		struct perf_event *event = cpuc->events[bit];
 
+		handled++;
+
 		if (!test_bit(bit, cpuc->active_mask))
 			continue;
 
@@ -770,7 +775,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
 
 done:
 	intel_pmu_enable_all(0);
-	return 1;
+	return handled;
 }
 
 static struct event_constraint *

diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p4.c b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
@@ -692,7 +692,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
 		inc_irq_stat(apic_perf_irqs);
 	}
 
-	return handled > 0;
+	return handled;
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -692,7 +692,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs) @@
     		inc_irq_stat(apic_perf_irqs);
     	}
-    	return handled > 0;
+    	return handled;
     }
     /*
@@ Expand Down @@