 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.341 2019/11/14 17:09:23 maxv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.342 2019/12/06 08:35:21 maxv Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Coyote Point Systems, Inc. which was written under contract to Coyote
  * Point by Jed Davis and Devon O'Dell.
 @@ -100,27 +100,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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.341 2019/11/14 17:09:23 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.342 2019/12/06 08:35:21 maxv Exp $");
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_cpureset_delay.h"
 #include "opt_mtrr.h"
 #include "opt_realmem.h"
 #include "opt_xen.h"
 #include "opt_svs.h"
 #include "opt_kaslr.h"
 #ifndef XENPV
 #include "opt_physmem.h"
 @@ -902,45 +902,45 @@ dump_seg_iter(int (*callback)(paddr_t, p
 	for (i = 0; i < mem_cluster_cnt; ++i) {
 #ifndef NO_SPARSE_DUMP
 		/*
 		 * The bitmap is scanned within each memory segment,
 		 * rather than over its entire domain, in case any
 		 * pages outside of the memory proper have been mapped
 		 * into kva; they might be devices that wouldn't
 		 * appreciate being arbitrarily read, and including
 		 * them could also break the assumption that a sparse
 		 * dump will always be smaller than a full one.
 		 */
 		if (sparse_dump && sparse_dump_physmap) {
-			paddr_t p, start, end;
+			paddr_t p, sp_start, sp_end;
 			int lastset;
-			start = mem_clusters[i].start;
+			sp_start = mem_clusters[i].start;
-			end = start + mem_clusters[i].size;
+			sp_end = sp_start + mem_clusters[i].size;
-			start = rounddown(start, PAGE_SIZE); /* unnecessary? */
+			sp_start = rounddown(sp_start, PAGE_SIZE); /* unnecessary? */
 			lastset = 0;
-			for (p = start; p < end; p += PAGE_SIZE) {
+			for (p = sp_start; p < sp_end; p += PAGE_SIZE) {
 				int thisset = isset(sparse_dump_physmap,
 				    p/PAGE_SIZE);
 				if (!lastset && thisset)
-					start = p;
+					sp_start = p;
 				if (lastset && !thisset)
-					CALLBACK(start, p - start);
+					CALLBACK(sp_start, p - sp_start);
 				lastset = thisset;
+			}
 			if (lastset)
-				CALLBACK(start, p - start);
+				CALLBACK(sp_start, p - sp_start);
 		} else
 #endif
 			CALLBACK(mem_clusters[i].start, mem_clusters[i].size);
+	}
 	return 0;
 #undef CALLBACK
+}
 /*
  * Prepare for an impending core dump: decide what's being dumped and
  * how much space it will take up.
  */
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_sysctl_09_43.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $	*/
+/*	$NetBSD: compat_sysctl_09_43.c,v 1.3 2019/12/06 08:35:21 maxv Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,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.
+ *
  *	@(#)vfs_syscalls.c	8.28 (Berkeley) 12/10/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_sysctl_09_43.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysctl_09_43.c,v 1.3 2019/12/06 08:35:21 maxv Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/module.h>
 @@ -119,40 +119,40 @@ compat_sysctl_vfs(struct sysctllog **clo
 	error = sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "conf",
 		       SYSCTL_DESCR("Filesystem configuration information"),
 		       sysctl_vfs_generic_conf, 0, NULL,
 		       sizeof(struct vfsconf),
 		       CTL_VFS, VFS_GENERIC, VFS_CONF, CTL_EOL);
 	return error;
+}
 #endif
-static struct sysctllog *clog = NULL;
+static struct sysctllog *compat_09_43_clog = NULL;
 int
 compat_sysctl_09_43_init(void)
+{
-	return compat_sysctl_vfs(&clog);
+	return compat_sysctl_vfs(&compat_09_43_clog);
+}
 int
 compat_sysctl_09_43_fini(void)
+{
-	sysctl_teardown(&clog);
+	sysctl_teardown(&compat_09_43_clog);
 	return 0;
+}
 MODULE (MODULE_CLASS_EXEC, compat_sysctl_09_43, NULL);
 static int
 compat_sysctl_09_43_modcmd(modcmd_t cmd, void *arg)
+{
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		return compat_sysctl_09_43_init();
 	case MODULE_CMD_FINI:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tty_subr.c,v 1.41 2017/06/01 02:45:13 chs Exp $	*/
+/*	$NetBSD: tty_subr.c,v 1.42 2019/12/06 08:35:21 maxv Exp $	*/
 /*
  * Copyright (c) 1993, 1994 Theo de Raadt
  * All rights reserved.
+ *
  * Per Lindqvist <pgd@compuram.bbt.se> supplied an almost fully working
  * set of true clist functions that this is very loosely based on.
+ *
  * 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.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: tty_subr.c,v 1.41 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_subr.c,v 1.42 2019/12/06 08:35:21 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/kmem.h>
 /*
  * At compile time, choose:
  * There are two ways the TTY_QUOTE bit can be stored. If QBITS is
  * defined we allocate an array of bits -- 1/8th as much memory but
  * setbit(), clrbit(), and isset() take more CPU. If QBITS is
 @@ -368,49 +368,49 @@ b_to_q(const u_char *cp, int count, stru
+		}
 		p += cc;
 		count -= cc;
 		clp->c_cc += cc;
 		clp->c_cl += cc;
 		if (clp->c_cl == clp->c_ce)
 			clp->c_cl = clp->c_cs;
+	}
 out:
 	splx(s);
 	return count;
+}
-static int cc;
+static int tty_global_cc;
 /*
  * Given a non-NULL pointer into the clist return the pointer
  * to the next character in the list or return NULL if no more chars.
+ *
  * Callers must not allow getc's to happen between firstc's and getc's
  * so that the pointer becomes invalid.  Note that interrupts are NOT
  * masked.
  */
 u_char *
 nextc(struct clist *clp, u_char *cp, int *c)
+{
 	if (clp->c_cf == cp) {
 		/*
 		 * First time initialization.
 		 */
-		cc = clp->c_cc;
+		tty_global_cc = clp->c_cc;
+	}
-	if (cc == 0 || cp == NULL)
+	if (tty_global_cc == 0 || cp == NULL)
 		return NULL;
-	if (--cc == 0)
+	if (--tty_global_cc == 0)
 		return NULL;
 	if (++cp == clp->c_ce)
 		cp = clp->c_cs;
 	*c = *cp & 0xff;
 	if (clp->c_cq) {
 #ifdef QBITS
 		if (isset(clp->c_cq, cp - clp->c_cs))
 			*c |= TTY_QUOTE;
 #else
 		if (*(clp->c_cf - clp->c_cs + clp->c_cq))
 			*c |= TTY_QUOTE;
 #endif
+	}
 @@ -422,28 +422,28 @@ nextc(struct clist *clp, u_char *cp, int
  * to the first character in the list or return NULL if no more chars.
+ *
  * Callers must not allow getc's to happen between firstc's and getc's
  * so that the pointer becomes invalid.  Note that interrupts are NOT
  * masked.
+ *
  * *c is set to the NEXT character
  */
 u_char *
 firstc(struct clist *clp, int *c)
+{
 	u_char *cp;
-	cc = clp->c_cc;
+	tty_global_cc = clp->c_cc;
-	if (cc == 0)
+	if (tty_global_cc == 0)
 		return NULL;
 	cp = clp->c_cf;
 	*c = *cp & 0xff;
 	if (clp->c_cq) {
 #ifdef QBITS
 		if (isset(clp->c_cq, cp - clp->c_cs))
 			*c |= TTY_QUOTE;
 #else
 		if (*(cp - clp->c_cs + clp->c_cq))
 			*c |= TTY_QUOTE;
 #endif
+	}
 	return clp->c_cf;