aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/ntp.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index f5f793d92415..e1fa3689a903 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -51,6 +51,7 @@ static long ntp_tick_adj;
51 51
52static void ntp_update_frequency(void) 52static void ntp_update_frequency(void)
53{ 53{
54 u64 old_tick_length_base = tick_length_base;
54 u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) 55 u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
55 << NTP_SCALE_SHIFT; 56 << NTP_SCALE_SHIFT;
56 second_length += (s64)ntp_tick_adj << NTP_SCALE_SHIFT; 57 second_length += (s64)ntp_tick_adj << NTP_SCALE_SHIFT;
@@ -60,6 +61,12 @@ static void ntp_update_frequency(void)
60 61
61 tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT; 62 tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT;
62 tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ); 63 tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ);
64
65 /*
66 * Don't wait for the next second_overflow, apply
67 * the change to the tick length immediately
68 */
69 tick_length += tick_length_base - old_tick_length_base;
63} 70}
64 71
65static void ntp_update_offset(long offset) 72static void ntp_update_offset(long offset)