From 8a612005bac63b448426f15ca5ecb9988c7e3423 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 17 May 2009 10:04:45 +0200
Subject: [PATCH] --- yaml --- r: 147471 b: refs/heads/master c:
 d2517a49d55536b38c7a87e5289550cfedaa4dcc h: refs/heads/master i:   147469:
 4c8aa896c7b5476a6c9238bac0adcd0c7a6f395c   147467:
 cb4689ba35aa5210f3a7c60caa646f29835cd036   147463:
 b51e829cfaf4feaa3c9516c23ff87d53d0274445   147455:
 cada1d8d5107b95ef6be094bd663490652adfd4e v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/cpu/perf_counter.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d793f370fbe4..11a4bf0b51ef 100644
--- 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
index 886dcf334bc3..5bfd30ab3920 100644
--- 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));