From: Joe Jin Date: Tue, 28 Aug 2012 10:13:11 +0000 (+0800) Subject: Revert "3.0.x: time: Fix leapsecond triggered hrtimer/futex load spike issue" X-Git-Tag: v2.6.39-400.9.0~327 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=729a83f8f5d1ba63c48afbd7c8a53509c23e4bde;p=users%2Fjedix%2Flinux-maple.git Revert "3.0.x: time: Fix leapsecond triggered hrtimer/futex load spike issue" This reverts commit aac67aba83c32bd03f4b59bdd932a076afbee089. --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index a3d79d26f0e7..bd056f01ccf9 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -176,7 +176,6 @@ void timekeeping_leap_insert(int leapsecond) wall_to_monotonic.tv_sec -= leapsecond; update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock, timekeeper.mult); - clock_was_set(); } /**