aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/ntp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index a4492f3d64db..dbd6f8905614 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -234,7 +234,7 @@ static inline void notify_cmos_timer(void) { }
234 */ 234 */
235int do_adjtimex(struct timex *txc) 235int do_adjtimex(struct timex *txc)
236{ 236{
237 long mtemp, save_adjust, rem; 237 long mtemp, save_adjust;
238 s64 freq_adj; 238 s64 freq_adj;
239 int result; 239 int result;
240 240
@@ -345,9 +345,7 @@ int do_adjtimex(struct timex *txc)
345 freq_adj += time_freq; 345 freq_adj += time_freq;
346 freq_adj = min(freq_adj, (s64)MAXFREQ_NSEC); 346 freq_adj = min(freq_adj, (s64)MAXFREQ_NSEC);
347 time_freq = max(freq_adj, (s64)-MAXFREQ_NSEC); 347 time_freq = max(freq_adj, (s64)-MAXFREQ_NSEC);
348 time_offset = div_long_long_rem_signed(time_offset, 348 time_offset = div_s64(time_offset, NTP_INTERVAL_FREQ);
349 NTP_INTERVAL_FREQ,
350 &rem);
351 time_offset <<= SHIFT_UPDATE; 349 time_offset <<= SHIFT_UPDATE;
352 } /* STA_PLL */ 350 } /* STA_PLL */
353 } /* txc->modes & ADJ_OFFSET */ 351 } /* txc->modes & ADJ_OFFSET */