From owner-p4-projects@FreeBSD.ORG  Fri Mar 24 06:45:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C282116A425; Fri, 24 Mar 2006 06:45:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A2CF516A420
	for <perforce@freebsd.org>; Fri, 24 Mar 2006 06:45:06 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C8AD43D46
	for <perforce@freebsd.org>; Fri, 24 Mar 2006 06:45:06 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2O6j6Mu058331
	for <perforce@freebsd.org>; Fri, 24 Mar 2006 06:45:06 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2O6j61I058328
	for perforce@freebsd.org; Fri, 24 Mar 2006 06:45:06 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 24 Mar 2006 06:45:06 GMT
Message-Id: <200603240645.k2O6j61I058328@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93918 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Mar 2006 06:45:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=93918

Change 93918 by imp@imp_Speedy on 2006/03/24 06:44:52

	If mnt_time is set, use it in preference to the RTC clock if
	they are more than 2 days off.  This restores 4.2 behavior that
	was lost along the way.
	
	# alas, nfs doesn't set this.

Affected files ...

.. //depot/projects/arm/src/sys/kern/subr_clock.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/kern/subr_clock.c#2 (text+ko) ====

@@ -254,7 +254,8 @@
 void
 inittodr(time_t base)
 {
-	struct timespec diff, ref, ts;
+	time_t		deltat;
+	struct timespec ref, ts;
 	int error;
 
 	if (base) {
@@ -282,17 +283,18 @@
 	ts.tv_sec += tz_minuteswest * 60 +
 	    (wall_cmos_clock ? adjkerntz : 0);
 
-	if (timespeccmp(&ref, &ts, >)) {
-		diff = ref;
-		timespecsub(&ref, &ts);
-	} else {
-		diff = ts;
-		timespecsub(&diff, &ref);
-	}
-	if (ts.tv_sec >= 2) {
-		/* badly off, adjust it */
+	deltat = ts.tv_sec - base;
+	if (deltat < 0)
+		deltat = -deltat;
+	if (deltat < 2 * SECDAY || base == 0) {
 		tc_setclock(&ts);
+		return;
 	}
+
+	printf("WARNING: clock %s %d days",
+	    ts.tv_sec < base ? "lost" : "gained", (int)(deltat / SECDAY));
+
+	printf(" -- CHECK AND RESET THE DATE!\n");
 }
 
 /*