This makes time_adj local to second_overflow() and integrates it into
the tick length instead of adding it everytime.
Signed-off-by: Roman Zippel <[email protected]>
---
kernel/time/ntp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: linux-2.6-mm/kernel/time/ntp.c
===================================================================
--- linux-2.6-mm.orig/kernel/time/ntp.c
+++ linux-2.6-mm/kernel/time/ntp.c
@@ -45,7 +45,6 @@ long time_maxerror = NTP_PHASE_LIMIT; /*
long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */
long time_freq = (((NSEC_PER_SEC + HZ/2) % HZ - HZ/2) << SHIFT_USEC) / NSEC_PER_USEC;
/* frequency offset (scaled ppm)*/
-static long time_adj; /* tick adjust (scaled 1 / HZ) */
long time_reftime; /* time at last adjustment (s) */
long time_adjust;
long time_next_adjust;
@@ -90,7 +89,7 @@ void ntp_update_frequency(void)
*/
void second_overflow(void)
{
- long ltemp;
+ long ltemp, time_adj;
/* Bump the maxerror field */
time_maxerror += time_tolerance >> SHIFT_USEC;
@@ -195,6 +194,7 @@ void second_overflow(void)
time_adj += shift_right(time_adj, 6) + shift_right(time_adj, 7);
#endif
tick_length = tick_length_base;
+ tick_length += (s64)time_adj << (TICK_LENGTH_SHIFT - (SHIFT_SCALE - 10));
}
/*
@@ -251,11 +251,9 @@ u64 current_tick_length(void)
u64 ret;
/* calculate the finest interval NTP will allow.
- * ie: nanosecond value shifted by (SHIFT_SCALE - 10)
*/
ret = tick_length;
ret += (u64)(adjtime_adjustment() * 1000) << TICK_LENGTH_SHIFT;
- ret += (s64)time_adj << (TICK_LENGTH_SHIFT - (SHIFT_SCALE - 10));
return ret;
}
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
