lkml.org 
[lkml]   [2006]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[NTP 3/9] add time_freq to tick length
    This adds the frequency part to ntp_update_frequency().

    Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
    ---
    kernel/time/ntp.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 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
    @@ -43,8 +43,7 @@ long time_tolerance = MAXFREQ; /* frequ
    long time_precision = 1; /* clock precision (us) */
    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)*/
    +long time_freq; /* frequency offset (scaled ppm)*/
    long time_reftime; /* time at last adjustment (s) */
    long time_adjust;
    long time_next_adjust;
    @@ -73,6 +72,7 @@ void ntp_update_frequency(void)
    {
    tick_length_base = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) << TICK_LENGTH_SHIFT;
    tick_length_base += (s64)CLOCK_TICK_ADJUST << TICK_LENGTH_SHIFT;
    + tick_length_base += ((s64)time_freq * NSEC_PER_USEC) << (TICK_LENGTH_SHIFT - SHIFT_USEC);

    do_div(tick_length_base, HZ);

    @@ -169,8 +169,6 @@ void second_overflow(void)
    * Compute the frequency estimate and additional phase adjustment due
    * to frequency error for the next second.
    */
    - ltemp = time_freq;
    - time_adj += shift_right(ltemp,(SHIFT_USEC + SHIFT_HZ - SHIFT_SCALE));

    #if HZ == 100
    /*
    @@ -395,7 +393,7 @@ int do_adjtimex(struct timex *txc)
    if (txc->modes & ADJ_TICK)
    tick_usec = txc->tick;

    - if (txc->modes & ADJ_TICK)
    + if (txc->modes & (ADJ_TICK|ADJ_FREQUENCY|ADJ_OFFSET))
    ntp_update_frequency();
    } /* txc->modes */
    leave: if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0)
    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-08-10 02:17    [W:0.021 / U:1.364 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site