Commit bb1d8605 authored Oct 28, 2006 by Jim Houston Committed by Linus Torvalds Oct 28, 2006

[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>

parent eba6cd67

kernel/time/ntp.c

+1 −1

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