lkml.org 
[lkml]   [2012]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 14/23] ntp: Correct TAI offset during leap second
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.0-stable review patch. If anyone has any objections, please let me know.

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


    From: Richard Cochran <richardcochran@gmail.com>

    This is a backport of dd48d708ff3e917f6d6b6c2b696c3f18c019feed

    When repeating a UTC time value during a leap second (when the UTC
    time should be 23:59:60), the TAI timescale should not stop. The kernel
    NTP code increments the TAI offset one second too late. This patch fixes
    the issue by incrementing the offset during the leap second itself.

    Signed-off-by: Richard Cochran <richardcochran@gmail.com>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/time/ntp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -378,6 +378,7 @@ int second_overflow(unsigned long secs)
    if (secs % 86400 == 0) {
    leap = -1;
    time_state = TIME_OOP;
    + time_tai++;
    printk(KERN_NOTICE
    "Clock: inserting leap second 23:59:60 UTC\n");
    }
    @@ -392,7 +393,6 @@ int second_overflow(unsigned long secs)
    }
    break;
    case TIME_OOP:
    - time_tai++;
    time_state = TIME_WAIT;
    break;




    \
     
     \ /
      Last update: 2012-07-18 03:01    [W:0.038 / U:2.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site