]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "ntp: Correct TAI offset during leap second"
authorGuangyu Sun <guangyu.sun@oracle.com>
Thu, 4 Oct 2012 22:46:59 +0000 (15:46 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Thu, 4 Oct 2012 22:46:59 +0000 (15:46 -0700)
This reverts commit c5f7406e214a073701f9d4aa44d5f920b2622f3b.

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
kernel/time/ntp.c

index 17accdaec0613c4c7c9369b0dee8a71104157d64..3d17ebd47fa252044b69a2b339e340148dcf9f44 100644 (file)
@@ -412,7 +412,6 @@ 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");
                }
@@ -427,6 +426,7 @@ int second_overflow(unsigned long secs)
                }
                break;
        case TIME_OOP:
+               time_tai++;
                time_state = TIME_WAIT;
                break;