diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-09 09:42:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-09 09:42:15 +0000 |
| commit | c06b4889c340da483d35a877ef9195c0401319b9 (patch) | |
| tree | 677f2d1fd3fa336274251eda2d696a295a01e1f3 /arch/arm/plat-omap/common.c | |
| parent | 74fac66e821475f5cb0f23bb5ecc7e18aa32fdc5 (diff) | |
| parent | 8ca7fe267f58462825729443f3e3b44ef4901cf0 (diff) | |
| download | linux-rt-c06b4889c340da483d35a877ef9195c0401319b9.tar.gz | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 0843b8882f93..6825fbb5a056 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -200,20 +200,16 @@ static struct clocksource clocksource_32k = { }; /* - * 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) |