Commit bb1d8605 authored by Jim Houston's avatar Jim Houston Committed by Linus Torvalds

[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: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarJim Houston <jim.houston@ccur.com>
Cc: John Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eba6cd67
...@@ -161,9 +161,9 @@ void second_overflow(void) ...@@ -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;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment