path: root/arch/cris/arch-v10
diff options
authorStephen Warren <swarren@nvidia.com>2012-11-08 10:50:55 -0700
committerStephen Warren <swarren@nvidia.com>2012-12-24 09:18:32 -0700
commit547046f2f09f1837d39619afbc7a6e35673d7c98 (patch)
tree39c9df8e729e7aa59183711ccaed16928ac5808f /arch/cris/arch-v10
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
cris: move usec/nsec conversion to do_slow_gettimeoffset
Move usec to nsec conversion from arch_gettimeoffset() to do_slow_gettimeoffset(); in a future patch, do_slow_gettimeoffset() will be used directly as the implementation of arch_gettimeoffset(), so needs to perform all required calculations. Cc: Mikael Starvik <starvik@axis.com> Cc: linux-cris-kernel@axis.com Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/cris/arch-v10')
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index bcffcb6a941..162892f24a2 100644
--- a/arch/cris/arch-v10/kernel/time.c
+++ b/arch/cris/arch-v10/kernel/time.c
@@ -65,8 +65,8 @@ unsigned long do_slow_gettimeoffset(void)
count = *R_TIMER0_DATA;
- /* Convert timer value to usec */
- return (TIMER0_DIV - count) * ((NSEC_PER_SEC/1000)/HZ)/TIMER0_DIV;
+ /* Convert timer value to nsec */
+ return (TIMER0_DIV - count) * (NSEC_PER_SEC/HZ)/TIMER0_DIV;
/* Excerpt from the Etrax100 HSDD about the built-in watchdog: