[PATCH] ntp: add time_adj to tick length

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 <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 77137bec2aeacd171cee83c85ae5ec8e9c0559f1..c09628d6b848c41cae67e060909e9ee8ac8fc6f6 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -39,7 +39,6 @@ long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us)           */
 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;
@@ -84,7 +83,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;
@@ -189,6 +188,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));
 }
 
 /*
@@ -245,11 +245,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;
 }