]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond"
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 ce4e4c9464835b2476fac86b5d0beb34016d0bf2.

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

index 4e6cd20a1683d8b83c036f1ab6d3ce594f4145fc..bd056f01ccf9bbf6c2ea1f222120a35ac1fd79dd 100644 (file)
@@ -833,7 +833,6 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
                xtime.tv_sec++;
                leap = second_overflow(xtime.tv_sec);
                xtime.tv_sec += leap;
-               wall_to_monotonic.tv_sec -= leap;
        }
 
        /* Accumulate raw time */
@@ -944,7 +943,6 @@ static void update_wall_time(void)
                xtime.tv_sec++;
                leap = second_overflow(xtime.tv_sec);
                xtime.tv_sec += leap;
-               wall_to_monotonic.tv_sec -= leap;
        }
 
        /* check to see if there is a new clocksource to use */