From 6a925823d562be6ecbcfb3498942bcdb611f8e44 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <Aaro.Koskinen@nokia.com>
Date: Wed, 4 Mar 2009 10:07:41 -0800
Subject: [PATCH] --- yaml --- r: 132371 b: refs/heads/master c:
 80ea3bac3a47bc73efa334d0dd57099d0ff14216 h: refs/heads/master i:   132369:
 84d4c75150c87f5be3381b111c732f9a008e21f0   132367:
 49dd115d711b08a12689437d1b669e2dd3f615c5 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/plat-omap/common.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7d9fa0f33183..19d2fa232484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87d99d6f7ee3ec73b2b0212427b173502ec9d6cb
+refs/heads/master: 80ea3bac3a47bc73efa334d0dd57099d0ff14216
diff --git a/trunk/arch/arm/plat-omap/common.c b/trunk/arch/arm/plat-omap/common.c
index 0843b8882f93..6825fbb5a056 100644
--- a/trunk/arch/arm/plat-omap/common.c
+++ b/trunk/arch/arm/plat-omap/common.c
@@ -199,21 +199,17 @@ static struct clocksource clocksource_32k = {
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-/*
- * Rounds down to nearest nsec.
- */
-unsigned long long omap_32k_ticks_to_nsecs(unsigned long ticks_32k)
-{
-	return cyc2ns(&clocksource_32k, ticks_32k);
-}
-
 /*
  * Returns current time from boot in nsecs. It's OK for this to wrap
  * around for now, as it's just a relative time stamp.
  */
 unsigned long long sched_clock(void)
 {
-	return omap_32k_ticks_to_nsecs(omap_32k_read());
+	unsigned long long ret;
+
+	ret = (unsigned long long)omap_32k_read();
+	ret = (ret * clocksource_32k.mult_orig) >> clocksource_32k.shift;
+	return ret;
 }
 
 static int __init omap_init_clocksource_32k(void)