From: Guangyu Sun Date: Thu, 4 Oct 2012 22:46:59 +0000 (-0700) Subject: Revert "timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond" X-Git-Tag: v2.6.39-400.9.0~303^2~17 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2ecf45d380028edfbf9c418c3189f61781fa63be;p=users%2Fjedix%2Flinux-maple.git Revert "timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond" This reverts commit ce4e4c9464835b2476fac86b5d0beb34016d0bf2. Signed-off-by: Guangyu Sun --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4e6cd20a1683..bd056f01ccf9 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -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 */