From 7fd421789f0b5c1432c4bb97f8b4d60a37c58ed0 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 11 Jan 2011 16:44:02 +0000
Subject: [PATCH] --- yaml --- r: 231288 b: refs/heads/master c:
 edc4d272551594729f63ca4cde1612608494091f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index edf8b6744127..2c7a93ad6e26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 211baa7016894c02fc18693e21ca479cd08ac0c0
+refs/heads/master: edc4d272551594729f63ca4cde1612608494091f
diff --git a/trunk/arch/arm/kernel/sched_clock.c b/trunk/arch/arm/kernel/sched_clock.c
index 784464a21c1c..9a46370fe9da 100644
--- a/trunk/arch/arm/kernel/sched_clock.c
+++ b/trunk/arch/arm/kernel/sched_clock.c
@@ -34,7 +34,7 @@ void __init init_sched_clock(struct clock_data *cd, void (*update)(void),
 	sched_clock_update_fn = update;
 
 	/* calculate the mult/shift to convert counter ticks to ns. */
-	clocks_calc_mult_shift(&cd->mult, &cd->shift, rate, NSEC_PER_SEC, 60);
+	clocks_calc_mult_shift(&cd->mult, &cd->shift, rate, NSEC_PER_SEC, 0);
 
 	r = rate;
 	if (r >= 4000000) {