cris: move usec/nsec conversion to do_slow_gettimeoffset (547046f2) · Commits · 戴 / test

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>

arch/cris/arch-v10/kernel/time.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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:

arch/cris/kernel/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset;

		u32 arch_gettimeoffset(void)
		{
		return do_gettimeoffset() * 1000;
		return do_gettimeoffset();
		}
		#endif

Admin message