diff --git a/[refs] b/[refs] index 02f335b71d2b..5c59a4ae2823 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eba6cd671427df295c10b54ee69cd5de419d38fe +refs/heads/master: bb1d860551c4307b1a7ee9a21b120319075e987e diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 47195fa0ec4f..3afeaa3a73f9 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -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; } } }