diff options
-rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 4 | ||||
-rw-r--r-- | arch/cris/kernel/time.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index bcffcb6a9415..162892f24a20 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) | |||
65 | */ | 65 | */ |
66 | count = *R_TIMER0_DATA; | 66 | count = *R_TIMER0_DATA; |
67 | 67 | ||
68 | /* Convert timer value to usec */ | 68 | /* Convert timer value to nsec */ |
69 | return (TIMER0_DIV - count) * ((NSEC_PER_SEC/1000)/HZ)/TIMER0_DIV; | 69 | return (TIMER0_DIV - count) * (NSEC_PER_SEC/HZ)/TIMER0_DIV; |
70 | } | 70 | } |
71 | 71 | ||
72 | /* Excerpt from the Etrax100 HSDD about the built-in watchdog: | 72 | /* Excerpt from the Etrax100 HSDD about the built-in watchdog: |
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 | ||