From: john stultz Remove a bit of code that was unnecessarily duplicated in time-reduced-ntp-rework-part-2.patch that bumps the time_maxerror variable each second (which is already done at the top of the function). The code must of slipped in while moving the code in an earlier version of the patch and didn't get removed as it should have been. Signed-off-by: Andrew Morton --- kernel/timer.c | 7 ------- 1 files changed, 7 deletions(-) diff -puN kernel/timer.c~time-reduced-ntp-rework-part-2-fix kernel/timer.c --- 25/kernel/timer.c~time-reduced-ntp-rework-part-2-fix Thu Jan 12 17:22:26 2006 +++ 25-akpm/kernel/timer.c Thu Jan 12 17:22:26 2006 @@ -746,13 +746,6 @@ static void second_overflow(void) time_state = TIME_OK; } - /* Bump the maxerror field */ - time_maxerror += time_tolerance >> SHIFT_USEC; - if ( time_maxerror > NTP_PHASE_LIMIT ) { - time_maxerror = NTP_PHASE_LIMIT; - time_status |= STA_UNSYNC; - } - /* * Compute the phase adjustment for the next second. In PLL mode, the * offset is reduced by a fixed factor times the time constant. In FLL _