]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "timekeeping: Fix leapsecond triggered load spike issue"
authorGuangyu Sun <guangyu.sun@oracle.com>
Thu, 4 Oct 2012 22:46:58 +0000 (15:46 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Thu, 4 Oct 2012 22:46:58 +0000 (15:46 -0700)
This reverts commit c87a0886e80457c30d110f517861cbc108ebbe01.

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

index 49975d598d3ef0a4b7957b46c3a3fe9b049343cc..d9efcdd37bfd6e55526dbecbc7f3ff7c9cd9d71b 100644 (file)
@@ -836,8 +836,6 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
                leap = second_overflow(xtime.tv_sec);
                xtime.tv_sec += leap;
                wall_to_monotonic.tv_sec -= leap;
-               if (leap)
-                       clock_was_set_delayed();
        }
 
        /* Accumulate raw time */
@@ -949,8 +947,6 @@ static void update_wall_time(void)
                leap = second_overflow(xtime.tv_sec);
                xtime.tv_sec += leap;
                wall_to_monotonic.tv_sec -= leap;
-               if (leap)
-                       clock_was_set_delayed();
        }
 
        timekeeping_update(false);