mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: john stultz <johnstul@us.ibm.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, johnstul@us.ibm.com,
	john stultz <johnstul@us.ibm.com>
Subject: [-mm PATCH 6/11] Time: generic timekeeping infrastructure - fix ntp_synced
Date: Mon, 20 Feb 2006 23:21:40 -0700	[thread overview]
Message-ID: <20060221062139.13304.33142.sendpatchset@cog.beaverton.ibm.com> (raw)
In-Reply-To: <20060221062102.13304.81613.sendpatchset@cog.beaverton.ibm.com>

Call ntp_synced() is frequently enough. This fixes a potential bug where 
when ntp_synced is called, it isn't close enough to the second boundery 
(which is tested inside ntp_synced()). Without this its possible that since 
we only called it once a second, it would never sync the persistent clock.

Signed-off-by: John Stultz <johnstul@us.ibm.com>

 kernel/time/timeofday.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: mm-merge/kernel/time/timeofday.c
===================================================================
--- mm-merge.orig/kernel/time/timeofday.c
+++ mm-merge/kernel/time/timeofday.c
@@ -534,7 +534,7 @@ static void timeofday_periodic_hook(unsi
 	/* advance the ntp state machine by ns interval: */
 	ntp_advance(delta_nsec);
 
-	/* only call ntp_leapsecond and ntp_sync once a sec:  */
+	/* only call ntp_leapsecond once a sec:  */
 	second_check += delta_nsec;
 	if (second_check >= NSEC_PER_SEC) {
 		/* do ntp leap second processing: */
@@ -545,11 +545,11 @@ static void timeofday_periodic_hook(unsi
 			wall_time_ts.tv_sec += leapsecond;
 			monotonic_time_offset_ts.tv_sec += leapsecond;
 		}
-		/* sync the persistent clock: */
-		if (ntp_synced())
-			sync_persistent_clock(wall_time_ts);
 		second_check -= NSEC_PER_SEC;
 	}
+	/* sync the persistent clock: */
+	if (ntp_synced())
+		sync_persistent_clock(wall_time_ts);
 
 	/* if necessary, switch clocksources: */
 	next = get_next_clocksource();

  parent reply	other threads:[~2006-02-21  6:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-21  6:21 [-mm PATCHSET 0/11] Sync -mm w/ B19 timekeeping patches john stultz
2006-02-21  6:21 ` [-mm PATCH 1/11] Time: reduced ntp rework part 1 - fix adjtimeadj john stultz
2006-02-21  6:21 ` [-mm PATCH 2/11] Time: reduced ntp rework part 2 (updated) john stultz
2006-02-21  6:21 ` [-mm PATCH 3/11] Time: reduced ntp rework part 2 - fix adjtimeadj john stultz
2006-02-21  6:21 ` [-mm PATCH 4/11] Time: clocksource infrastructure - remove nsec_t john stultz
2006-02-21  6:21 ` [-mm PATCH 5/11] Time: generic timekeeping " john stultz
2006-02-21  6:21 ` john stultz [this message]
2006-02-21  6:21 ` [-mm PATCH 7/11] Time: generic timekeeping infrastructure - wall_offset helper cleanup john stultz
2006-02-21  6:21 ` [-mm PATCH 8/11] Time: i386 conversion part 3 - remove nsec_t john stultz
2006-02-21  6:21 ` [-mm PATCH 9/11] Time: i386 conversion part 3 - backout pmtmr changes john stultz
2006-02-21  6:22 ` [-mm PATCH 10/11] Time: i386 conversion part 4 - del timer_tsc.c john stultz
2006-02-21  6:22 ` [-mm PATCH 11/11]Time: i386 clocksource drivers - backout pmtmr changes john stultz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060221062139.13304.33142.sendpatchset@cog.beaverton.ibm.com \
    --to=johnstul@us.ibm.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®