 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_time.c,v 1.201 2019/10/05 12:57:40 kamil Exp $	*/
+/*	$NetBSD: kern_time.c,v 1.202 2020/01/01 17:28:17 thorpej Exp $	*/
 /*-
  * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christopher G. Demetriou, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_time.c	8.4 (Berkeley) 5/26/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.201 2019/10/05 12:57:40 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.202 2020/01/01 17:28:17 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/syslog.h>
 #include <sys/timetc.h>
 #include <sys/timex.h>
 #include <sys/kauth.h>
 #include <sys/mount.h>
 @@ -126,53 +126,48 @@ time_init2(void)
+ *
  * These routines provide the kernel entry points to get and set
  * the time-of-day and per-process interval timers.  Subroutines
  * here provide support for adding and subtracting timeval structures
  * and decrementing interval timers, optionally reloading the interval
  * timers when they expire.
  */
 /* This function is used by clock_settime and settimeofday */
 static int
 settime1(struct proc *p, const struct timespec *ts, bool check_kauth)
+{
 	struct timespec delta, now;
 	int s;
 	/* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */
 	s = splclock();
 	nanotime(&now);
 	timespecsub(ts, &now, &delta);
 	if (check_kauth && kauth_authorize_system(kauth_cred_get(),
 	    KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_SYSTEM, __UNCONST(ts),
 	    &delta, KAUTH_ARG(check_kauth ? false : true)) != 0) {
 		splx(s);
 		return (EPERM);
+	}
 #ifdef notyet
 	if ((delta.tv_sec < 86400) && securelevel > 0) { /* XXX elad - notyet */
 		splx(s);
 		return (EPERM);
+	}
 #endif
 	tc_setclock(ts);
 	timespecadd(&boottime, &delta, &boottime);
 	resettodr();
 	splx(s);
 	return (0);
+}
 int
 settime(struct proc *p, struct timespec *ts)
+{
 	return (settime1(p, ts, true));
+}
 /* ARGSUSED */
 int
 sys___clock_gettime50(struct lwp *l,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_todr.c,v 1.40 2019/07/07 15:12:59 maxv Exp $	*/
+/*	$NetBSD: kern_todr.c,v 1.41 2020/01/01 17:28:17 thorpej Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -31,27 +31,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah Hdr: clock.c 1.18 91/01/21
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/10/93
  */
 #include "opt_todr.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.40 2019/07/07 15:12:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.41 2020/01/01 17:28:17 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/intr.h>
 #include <sys/rndsource.h>
 #include <dev/clock_subr.h>	/* hmm.. this should probably move to sys */
 static todr_chip_handle_t todr_handle = NULL;
 @@ -71,27 +71,26 @@ todr_attach(todr_chip_handle_t todr)
 static bool timeset = false;
 /*
  * Set up the system's time, given a `reasonable' time value.
  */
 void
 inittodr(time_t base)
+{
 	bool badbase = false;
 	bool waszero = (base == 0);
 	bool goodtime = false;
 	bool badrtc = false;
 	int s;
 	struct timespec ts;
 	struct timeval tv;
 	rnd_add_data(NULL, &base, sizeof(base), 0);
 	if (base < 5 * SECS_PER_COMMON_YEAR) {
 		struct clock_ymdhms basedate;
 		/*
 		 * If base is 0, assume filesystem time is just unknown
 		 * instead of preposterous. Don't bark.
 		 */
 		if (base != 0)
 @@ -159,29 +158,27 @@ inittodr(time_t base)
 		if (badbase) {
 			printf("WARNING: using default initial time\n");
 		} else {
 			printf("WARNING: using filesystem time\n");
+		}
 		tv.tv_sec = base;
 		tv.tv_usec = 0;
+	}
 	timeset = true;
 	ts.tv_sec = tv.tv_sec;
 	ts.tv_nsec = tv.tv_usec * 1000;
 	s = splclock();
 	tc_setclock(&ts);
 	splx(s);
 	if (waszero || goodtime)
 		return;
 	printf("WARNING: CHECK AND RESET THE DATE!\n");
+}
 /*
  * Reset the TODR based on the time value; used when the TODR
  * has a preposterous value and also when the time is reset
  * by the stime system call.  Also called when the TODR goes past
  * TODRZERO + 100*(SECS_PER_COMMON_YEAR+2*SECS_PER_DAY)
  * (e.g. on Jan 2 just after midnight) to wrap the TODR around.