 @@ -1,14 +1,14 @@
-/*	$NetBSD: hd64465pcmcia.c,v 1.35 2021/08/07 16:18:55 thorpej Exp $	*/
+/*	$NetBSD: hd64465pcmcia.c,v 1.36 2023/04/05 21:53:56 andvar Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -20,27 +20,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>
-__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.35 2021/08/07 16:18:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.36 2023/04/05 21:53:56 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/boot_flag.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <machine/intr.h>
 @@ -796,27 +796,27 @@ __sh_hd64465_map_2page(paddr_t pa)
 	{ _PG_PCMCIA_ATTR16, _PG_PCMCIA_MEM16, _PG_PCMCIA_IO };
 	vaddr_t va, v;
 	int i;
 	/* allocate kernel virtual */
 	v = va = uvm_km_alloc(kernel_map, 0x03000000, 0, UVM_KMF_VAONLY);
 	if (va == 0) {
 		PRINTF("can't allocate virtual for paddr 0x%08x\n",
 		    (unsigned)pa);
 		return (0);
+	}
- 	/* map to physical addreess with specified memory type. */
+ 	/* map to physical address with specified memory type. */
 	for (i = 0; i < 3; i++, pa += 0x01000000, va += 0x01000000) {
 		if (__sh_hd64465_map(va, pa, 0x2000, mode[i]) != 0) {
 			pmap_kremove(v, 0x03000000);
 			uvm_km_free(kernel_map, v, 0x03000000, UVM_KMF_VAONLY);
 			return (0);
+		}
+	}
 	return (v);
+}
 int
 __sh_hd64465_map(vaddr_t va, paddr_t pa, size_t sz, uint32_t flags)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scmdreg.h,v 1.2 2022/05/21 19:07:23 andvar Exp $	*/
+/*	$NetBSD: scmdreg.h,v 1.3 2023/04/05 21:53:56 andvar Exp $	*/
 /*
  * Copyright (c) 2021 Brad Spencer <brad@anduin.eldar.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -212,25 +212,25 @@
 					      */
 /* Remote module I2C bus write / read window */
 #define SCMD_REG_REM_ADDR		0x79 /* The slave module I2C address.  This starts at 0x50 */
 #define SCMD_REG_REM_OFFSET		0x7A /* Remote module I2C register for write / read */
 #define SCMD_REG_REM_DATA_WR		0x7B /* Data staged for write to remote module */
 #define SCMD_REG_REM_DATA_RD		0x7C /* Data returned from remote module */
 #define SCMD_REG_REM_WRITE		0x7D /* Write REM_DATA_WR to REM_OFFSET on remote module */
 #define SCMD_REG_REM_READ		0x7E /* Read from REM_OFFSET into REM_DATA_RD on remote
 					      * module
 					      */
 #define SCMD_LAST_REG			SCMD_REG_REM_READ /* The last register address on a module */
 #define SCMD_REG_SIZE			0x7F /* Size of the register space including the holes */
-#define SCMD_REMOTE_ADDR_LOW		0x50 /* The first remote I2C addreess */
+#define SCMD_REMOTE_ADDR_LOW		0x50 /* The first remote I2C address */
 #define SCMD_REMOTE_ADDR_HIGH		0x5F /* The last remote I2C address */
 #define SCMD_HOLE_VALUE			0x55 /* Artificial value on read for a hole register */
 #define SCMD_IS_HOLE(r) \
 ((r >= SCMD_REG_HOLE_1_LOW && r <= SCMD_REG_HOLE_1_HIGH) || \
     (r >= SCMD_REG_HOLE_2_LOW && r <= SCMD_REG_HOLE_2_HIGH))
 #define SCMD_MASTER_LOCK_UNLOCKED	0x9B
 #define SCMD_USER_LOCK_UNLOCKED		0x5C
 #define SCMD_ANY_LOCK_LOCKED		0x00
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sctp_indata.c,v 1.12 2022/05/28 22:16:44 andvar Exp $ */
+/*	$NetBSD: sctp_indata.c,v 1.13 2023/04/05 21:53:56 andvar Exp $ */
 /*	$KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $	*/
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
  * 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
 @@ -21,27 +21,27 @@
  * 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 PROJECT 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>
-__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.12 2022/05/28 22:16:44 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.13 2023/04/05 21:53:56 andvar Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -2149,27 +2149,27 @@ sctp_process_a_data_chunk(struct sctp_tc
 			sctp_deliver_data(stcb, asoc, chk, 0);
 			sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket);
 		} else {
 			/* Special check for when streams are resetting.
 			 * We could be more smart about this and check the
 			 * actual stream to see if it is not being reset.. that
 			 * way we would not create a HOLB when amongst streams
 			 * being reset and those not being reset.
+			 *
 			 * We take complete messages that have a stream reset
 			 * intervening (aka the TSN is after where our cum-ack needs
 			 * to be) off and put them on a pending_reply_queue. The
 			 * reassembly ones we do not have to worry about since
-			 * they are all sorted and proceessed by TSN order. It
+			 * they are all sorted and processed by TSN order. It
 			 * is only the singletons I must worry about.
 			 */
 			if ((asoc->pending_reply) &&
 			   ((compare_with_wrap(tsn, ntohl(asoc->pending_reply->reset_at_tsn), MAX_TSN)) ||
 			    (tsn == ntohl(asoc->pending_reply->reset_at_tsn)))
 				) {
 				/* yep its past where we need to reset... go ahead and
 				 * queue it.
 				 */
 				TAILQ_INSERT_TAIL(&asoc->pending_reply_queue , chk, sctp_next);
 			}  else {
 				sctp_queue_data_to_stream(stcb, asoc, chk, abort_flag);
+			}

 @@ -20,27 +20,27 @@
  * 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>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2007\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: fusermount.c,v 1.3 2008/07/21 13:36:58 lukem Exp $");
+__RCSID("$NetBSD: fusermount.c,v 1.4 2023/04/05 21:53:56 andvar Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #ifndef FUSERMOUNT_VERSION
 @@ -62,27 +62,27 @@ refuse_unmount(int argc, char **argv)
+{
 	int	ret;
 	int	i;
 	for (ret = 1, i = 0 ; i < argc ; i++) {
 		if (unmount(argv[i], 0) < 0) {
 			warn("can't unmount `%s'", argv[i]);
 			ret = 0;
+		}
+	}
 	return ret;
+}
-/* print the usage meessage */
+/* print the usage message */
 static void
 usage(const char *prog)
+{
 	(void) fprintf(stderr,
 		"Usage: %s [-c] [-d name] [-h] [-p] [-u] [-x] mountpoint...\n",
 		prog);
 	(void) fprintf(stderr, "\t-c\tuse kernel cache\n");
 	(void) fprintf(stderr, "\t-d name\tuse name in mount information\n");
 	(void) fprintf(stderr, "\t-h\tprint help information\n");
 	(void) fprintf(stderr, "\t-p\tcheck file permissions\n");
 	(void) fprintf(stderr, "\t-u\tunmount mount point(s)\n");
 	(void) fprintf(stderr,
 		"\t-x\tallow access to mortal (non-root) users\n");