diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 11:34:55 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 09:36:34 -0700 |
| commit | c8d5ba1891eda2aa63800f052cb5af128283d130 (patch) | |
| tree | 59a18c2262607b4067739fe4dfed3c6fa8e40f14 /arch/m68k/hp300/time.c | |
| parent | 7b1f62076bba10786d2118006ae68ac120cd6c56 (diff) | |
| download | op-kernel-dev-c8d5ba1891eda2aa63800f052cb5af128283d130.zip op-kernel-dev-c8d5ba1891eda2aa63800f052cb5af128283d130.tar.gz | |
m68k: set arch_gettimeoffset directly
remove m68k's mach_gettimeoffset function pointer, and instead directly
set the arch_gettimeoffset function pointer. This requires multiplying
all function results by 1000, since the removed m68k_gettimeoffset() did
this. Also, s/unsigned long/u32/ just to make the function prototypes
exactly match that of arch_gettimeoffset.
Cc: Joshua Thompson <funaho@jurai.org>
Cc: Sam Creasey <sammy@sammy.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/m68k/hp300/time.c')
| -rw-r--r-- | arch/m68k/hp300/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c index 29a71be..749543b 100644 --- a/arch/m68k/hp300/time.c +++ b/arch/m68k/hp300/time.c @@ -46,7 +46,7 @@ static irqreturn_t hp300_tick(int irq, void *dev_id) return vector(irq, NULL); } -unsigned long hp300_gettimeoffset(void) +u32 hp300_gettimeoffset(void) { /* Read current timer 1 value */ unsigned char lsb, msb1, msb2; @@ -59,7 +59,7 @@ unsigned long hp300_gettimeoffset(void) /* A carry happened while we were reading. Read it again */ lsb = in_8(CLOCKBASE + 7); ticks = INTVAL - ((msb2 << 8) | lsb); - return (USECS_PER_JIFFY * ticks) / INTVAL; + return ((USECS_PER_JIFFY * ticks) / INTVAL) * 1000; } void __init hp300_sched_init(irq_handler_t vector) |
