lkml.org 
[lkml]   [2019]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 090/132] ntp: Allow TAI-UTC offset to be set to zero
    3.16.74-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Miroslav Lichvar <mlichvar@redhat.com>

    commit fdc6bae940ee9eb869e493990540098b8c0fd6ab upstream.

    The ADJ_TAI adjtimex mode sets the TAI-UTC offset of the system clock.
    It is typically set by NTP/PTP implementations and it is automatically
    updated by the kernel on leap seconds. The initial value is zero (which
    applications may interpret as unknown), but this value cannot be set by
    adjtimex. This limitation seems to go back to the original "nanokernel"
    implementation by David Mills.

    Change the ADJ_TAI check to accept zero as a valid TAI-UTC offset in
    order to allow setting it back to the initial value.

    Fixes: 153b5d054ac2 ("ntp: support for TAI")
    Suggested-by: Ondrej Mosnacek <omosnace@redhat.com>
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: John Stultz <john.stultz@linaro.org>
    Cc: Richard Cochran <richardcochran@gmail.com>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Link: https://lkml.kernel.org/r/20190417084833.7401-1-mlichvar@redhat.com
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    kernel/time/ntp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -588,7 +588,7 @@ static inline void process_adjtimex_mode
    time_constant = max(time_constant, 0l);
    }

    - if (txc->modes & ADJ_TAI && txc->constant > 0)
    + if (txc->modes & ADJ_TAI && txc->constant >= 0)
    *time_tai = txc->constant;

    if (txc->modes & ADJ_OFFSET)
    \
     
     \ /
      Last update: 2019-09-20 16:33    [W:3.445 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site