diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 12:50:55 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:18:32 -0500 |
| commit | 547046f2f09f1837d39619afbc7a6e35673d7c98 (patch) | |
| tree | 39c9df8e729e7aa59183711ccaed16928ac5808f /arch/cris/kernel | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (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/kernel')
| -rw-r--r-- | arch/cris/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 277ffc459e4b..b063c9217b5c 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
| @@ -46,7 +46,7 @@ static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset; | |||
| 46 | 46 | ||
| 47 | u32 arch_gettimeoffset(void) | 47 | u32 arch_gettimeoffset(void) |
| 48 | { | 48 | { |
| 49 | return do_gettimeoffset() * 1000; | 49 | return do_gettimeoffset(); |
| 50 | } | 50 | } |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
