[PATCH] time_adjust cleared before use

I notice that the code which implements adjtime clears the time_adjust
value before using it.  The attached patch makes the obvious fix.

Acked-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Jim Houston <jim.houston@ccur.com>
Cc: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jim Houston 2006-10-28 10:38:56 -07:00 committed by Linus Torvalds
parent eba6cd6714
commit bb1d860551

View file

@ -161,9 +161,9 @@ void second_overflow(void)
time_adjust += MAX_TICKADJ; time_adjust += MAX_TICKADJ;
tick_length -= MAX_TICKADJ_SCALED; tick_length -= MAX_TICKADJ_SCALED;
} else { } else {
time_adjust = 0;
tick_length += (s64)(time_adjust * NSEC_PER_USEC / tick_length += (s64)(time_adjust * NSEC_PER_USEC /
HZ) << TICK_LENGTH_SHIFT; HZ) << TICK_LENGTH_SHIFT;
time_adjust = 0;
} }
} }
} }