Commit 000775c5 authored Jan 09, 2008 by David S. Miller

[SPARC]: Make gettimeofday() monotonic again.



When we switched away from the optimized C version
things stopped being monotonic.

The problem is that if we run this with interrupts disabled, we can
see the interrupt pending because the counter reached the limit value.
When this happens the counter has bit 31 set, and the low bits start
counting again from zero.

Reported by Martin Habets.

Signed-off-by: David S. Miller <davem@davemloft.net>

parent d0c4c9d4

arch/sparc/kernel/time.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,14 @@ void __init time_init(void)

		static inline unsigned long do_gettimeoffset(void)
		{
		return (*master_l10_counter >> 10) & 0x1fffff;
		unsigned long val = *master_l10_counter;
		unsigned long usec = (val >> 10) & 0x1fffff;

		/* Limit hit? */
		if (val & 0x80000000)
		usec += 1000000 / HZ;

		return usec;
		}

		/* Ok, my cute asm atomicity trick doesn't work anymore.

Admin message