From a15123799286a038bf4479306f8209e552e84c78 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 15 May 2009 15:37:47 +0200
Subject: [PATCH] --- yaml --- r: 147464 b: refs/heads/master c:
 2e569d36729c8105ae066a9b105068305442cc77 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f9e1f745343..23a05b25fc4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5456a6b056b709282e87a68b4c1b81ac2e866fa
+refs/heads/master: 2e569d36729c8105ae066a9b105068305442cc77
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index 0ad1db4f3d65..728a595399b0 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -2942,7 +2942,7 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event,
 
 	hwc = &counter->hw;
 	if (hw_event->freq && hw_event->irq_freq)
-		hwc->irq_period = TICK_NSEC / hw_event->irq_freq;
+		hwc->irq_period = div64_u64(TICK_NSEC, hw_event->irq_freq);
 	else
 		hwc->irq_period = hw_event->irq_period;