From 123b5da4dd9cd2725694183952ade8619537c75b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 22 Feb 2009 12:17:36 +0100 Subject: [PATCH] --- yaml --- r: 135749 b: refs/heads/master c: bc26c31d446bc9c24cd6f7003777a05fe268ae48 h: refs/heads/master i: 135747: 992528b21a219f0395fe4271e84d364c54a0f0d3 v: v3 --- [refs] | 2 +- trunk/kernel/time/ntp.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e35d8dacfaf6..333ce9e949cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ce616aaefcb9309cb9c49a36310ebda6061b98b +refs/heads/master: bc26c31d446bc9c24cd6f7003777a05fe268ae48 diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 7d281d9fbe30..f1abad738579 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -83,10 +83,8 @@ static long ntp_tick_adj; */ static void ntp_update_frequency(void) { - u64 prev_base; u64 second_length; - - prev_base = tick_length_base; + u64 new_base; second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) << NTP_SCALE_SHIFT; @@ -94,16 +92,15 @@ static void ntp_update_frequency(void) second_length += (s64)ntp_tick_adj << NTP_SCALE_SHIFT; second_length += time_freq; - tick_length_base = second_length; - tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT; - tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ); + new_base = div_u64(second_length, NTP_INTERVAL_FREQ); /* * Don't wait for the next second_overflow, apply - * the change to the tick length immediately + * the change to the tick length immediately: */ - tick_length += tick_length_base - prev_base; + tick_length += new_base - tick_length_base; + tick_length_base = new_base; } static void ntp_update_offset(long offset)