---

yaml --- r: 147471 b: refs/heads/master c: d2517a4 h: refs/heads/master i: 147469: 4c8aa89 147467: cb4689b 147463: b51e829 147455: cada1d8 v: v3
git-mirror · May 17, 2009 · 8a61200 · 8a61200
1 parent c2e71d8
commit 8a61200
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0203026b58b4299ba7281c0b4b417207c1f05d0e
+refs/heads/master: d2517a49d55536b38c7a87e5289550cfedaa4dcc
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -286,6 +286,9 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
 		hwc->nmi = 1;
 	}
 
+	if (!hwc->irq_period)
+		hwc->irq_period = x86_pmu.max_period;
+
 	atomic64_set(&hwc->period_left,
 			min(x86_pmu.max_period, hwc->irq_period));