 @@ -1,14 +1,14 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.8 2019/01/16 13:54:17 fox Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.9 2021/08/13 20:19:13 andvar Exp $ */
 /*-
  * Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Santhosh N. Raju <santhosh.raju@gmail.com> and
  * by Cherry G. Mathew
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.8 2019/01/16 13:54:17 fox Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.9 2021/08/13 20:19:13 andvar Exp $");
 /*
  * If this line is commented out tests related to uvm_physseg_get_pmseg()
  * wont run.
+ *
  * Have a look at machine/uvm_physseg.h for more details.
  */
 #define __HAVE_PMAP_PHYSSEG
 /*
  * This is a dummy struct used for testing purposes
+ *
  * In reality this struct would exist in the MD part of the code residing in
 @@ -2241,27 +2241,27 @@ ATF_TC_BODY(uvm_page_physunload_force, t
 	uvm_physseg_t upm;
 	setup();
 	upm = uvm_page_physload(VALID_START_PFN_1, VALID_END_PFN_1,
 	    VALID_AVAIL_START_PFN_1, VALID_AVAIL_END_PFN_1, VM_FREELIST_DEFAULT);
 	ATF_REQUIRE_EQ(1, uvm_physseg_get_entries());
 	ATF_REQUIRE_EQ(0, uvmexp.npages);
 	/* Insert more than one segment iff VM_PHYSSEG_MAX > 1 */
 #if VM_PHYSSEG_MAX > 1
 	/*
-	 * We have couple of physloads done this is bacause of the fact that if
+	 * We have couple of physloads done this is because of the fact that if
 	 * we physunload all the PFs from a given range and we have only one
 	 * segment in total a panic() is called
 	 */
 	uvm_page_physload(VALID_START_PFN_2, VALID_END_PFN_2,
 	    VALID_AVAIL_START_PFN_2, VALID_AVAIL_END_PFN_2, VM_FREELIST_DEFAULT);
 	ATF_REQUIRE_EQ(2, uvm_physseg_get_entries());
 #endif
 #if VM_PHYSSEG_MAX == 1
 	atf_tc_expect_signal(SIGABRT,
 	    "cannot uvm_page_physunload() the last segment");
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: syslogd.c,v 1.136 2020/11/08 01:12:46 dholland Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.137 2021/08/13 20:19:14 andvar Exp $	*/
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
 	The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.136 2020/11/08 01:12:46 dholland Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.137 2021/08/13 20:19:14 andvar Exp $");
 #endif
 #endif /* not lint */
 /*
  *  syslogd -- log system messages
+ *
  * This program implements a system log. It takes a series of lines.
  * Each line may have a priority, signified as "<n>" as
  * the first characters of the line.  If this is
  * not present, a default priority is used.
+ *
  * To kill syslogd, send a signal 15 (terminate).  A signal 1 (hup) will
  * cause it to reread its configuration file.
 @@ -570,27 +570,27 @@ getgroup:
 		daemonized = 1;
 		/* tuck my process id away, if i'm not in debug mode */
 #ifdef __NetBSD_Version__
 		pidfile(NULL);
 #endif /* __NetBSD_Version__ */
+	}
 	include_pid = include_pid_buf;
 	snprintf(include_pid_buf, sizeof(include_pid_buf), "%d", getpid());
 	/*
 	 * Create the global kernel event descriptor.
+	 *
-	 * NOTE: We MUST do this after daemon(), bacause the kqueue()
+	 * NOTE: We MUST do this after daemon(), because the kqueue()
 	 * API dictates that kqueue descriptors are not inherited
 	 * across forks (lame!).
 	 */
 	(void)event_init();
 	/*
 	 * We must read the configuration file for the first time
 	 * after the kqueue descriptor is created, because we install
 	 * events during this process.
 	 */
 	init(0, 0, NULL);
 	/*