From 8a2141d809f84e361a972fcfacfc7a38da5f8d21 Mon Sep 17 00:00:00 2001 From: Adam Brooks Date: Wed, 7 Sep 2005 17:24:36 +0100 Subject: [PATCH] --- yaml --- r: 7523 b: refs/heads/master c: 7691d931aa55409ae3339d541ec0b87ab0a2adae h: refs/heads/master i: 7521: 13051822817e1bb68ce0a5dea725542c7d1988b8 7519: 9f779d5c9a6f2030ccb93b08818baf2150ef20e7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-iop3xx/iop321-time.c | 2 +- trunk/arch/arm/mach-iop3xx/iop331-time.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9108c60f2153..a4de4f641423 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd6480f27e38f86ddea78eb5b46db249dfd09f17 +refs/heads/master: 7691d931aa55409ae3339d541ec0b87ab0a2adae diff --git a/trunk/arch/arm/mach-iop3xx/iop321-time.c b/trunk/arch/arm/mach-iop3xx/iop321-time.c index d53af1669502..0039793b694a 100644 --- a/trunk/arch/arm/mach-iop3xx/iop321-time.c +++ b/trunk/arch/arm/mach-iop3xx/iop321-time.c @@ -60,7 +60,7 @@ static unsigned long iop321_gettimeoffset(void) /* * Now convert them to usec. */ - usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH; + usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000)); return usec; } diff --git a/trunk/arch/arm/mach-iop3xx/iop331-time.c b/trunk/arch/arm/mach-iop3xx/iop331-time.c index 1a6d9d661e4b..8eddfac7e2b0 100644 --- a/trunk/arch/arm/mach-iop3xx/iop331-time.c +++ b/trunk/arch/arm/mach-iop3xx/iop331-time.c @@ -58,7 +58,7 @@ static unsigned long iop331_gettimeoffset(void) /* * Now convert them to usec. */ - usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH; + usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000)); return usec; }