 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_prf.c,v 1.199 2023/04/09 09:18:09 riastradh Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.200 2023/04/12 06:35:26 riastradh Exp $	*/
 /*-
  * Copyright (c) 1986, 1988, 1991, 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.
+ *
  *	@(#)subr_prf.c	8.4 (Berkeley) 5/4/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.199 2023/04/09 09:18:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.200 2023/04/12 06:35:26 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_dump.h"
 #include "opt_rnd_printf.h"
 #endif
 #include <sys/param.h>
 #include <sys/stdint.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 @@ -632,27 +632,27 @@ tprintf_close(tpr_t sess)
  * send a message to the controlling tty for that process.
+ *
  * => also sends message to /dev/klog
  */
 void
 tprintf(tpr_t tpr, const char *fmt, ...)
+{
 	struct session *sess = (struct session *)tpr;
 	struct tty *tp = NULL;
 	int flags = TOLOG;
 	va_list ap;
 	/* mutex_enter(&proc_lock); XXXSMP */
-	if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp, 0)) {
+	if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp)) {
 		flags |= TOTTY;
 		tp = sess->s_ttyp;
+	}
 	kprintf_lock();
 	klogpri(LOG_INFO);
 	va_start(ap, fmt);
 	kprintf(fmt, flags, tp, NULL, ap);
 	va_end(ap);
 	kprintf_unlock();
 	/* mutex_exit(&proc_lock);	XXXSMP */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tty.c,v 1.309 2023/04/11 10:23:47 riastradh Exp $	*/
+/*	$NetBSD: tty.c,v 1.310 2023/04/12 06:35:26 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008, 2020 The NetBSD Foundation, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -53,27 +53,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.
+ *
  *	@(#)tty.c	8.13 (Berkeley) 1/9/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.309 2023/04/11 10:23:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.310 2023/04/12 06:35:26 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #endif
 #define TTY_ALLOW_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #define	TTYDEFCHARS
 #include <sys/tty.h>
 @@ -2183,51 +2183,49 @@ ttread(struct tty *tp, struct uio *uio,
 	return (error);
+}
 /*
  * Check the output queue on tp for space for a kernel message (from uprintf
  * or tprintf).  Allow some space over the normal hiwater mark so we don't
  * lose messages due to normal flow control, but don't let the tty run amok.
  * Sleeps here are not interruptible, but we return prematurely if new signals
  * arrive.
  * Call with tty lock held.
  */
 static int
-ttycheckoutq_wlock(struct tty *tp, int wait)
+ttycheckoutq_wlock(struct tty *tp)
+{
 	int	hiwat;
 	KASSERT(mutex_owned(&tty_lock));
 	KASSERT(wait == 0);
 	hiwat = tp->t_hiwat;
 	if (tp->t_outq.c_cc > hiwat + 200)
 		if (tp->t_outq.c_cc > hiwat) {
 			ttstart(tp);
 			return (0);
+		}
 	return (1);
+}
 int
-ttycheckoutq(struct tty *tp, int wait)
+ttycheckoutq(struct tty *tp)
+{
 	int	r;
 	mutex_spin_enter(&tty_lock);
-	r = ttycheckoutq_wlock(tp, wait);
+	r = ttycheckoutq_wlock(tp);
 	mutex_spin_exit(&tty_lock);
 	return (r);
+}
 /*
  * Process a write call on a tty device.
  */
 int
 ttwrite(struct tty *tp, struct uio *uio, int flag)
+{
 	u_char		*cp;
 	struct proc	*p;
 @@ -2791,27 +2789,27 @@ ttygetinfo(struct tty *tp, int fromsig,
 	strlcat(buf, lmsg, bufsz);
+}
 /*
  * Print report on state of foreground process group.
  * Call with tty_lock held.
  */
 void
 ttyputinfo(struct tty *tp, char *buf)
+{
 	KASSERT(mutex_owned(&tty_lock));
-	if (ttycheckoutq_wlock(tp, 0) == 0)
+	if (ttycheckoutq_wlock(tp) == 0)
 		return;
 	ttyprintf_nolock(tp, "%s\n", buf);
 	tp->t_rocount = 0;	/* so pending input will be retyped if BS */
+}
 /*
  * Returns 1 if p2 has a better chance being the active foreground process
  * in a terminal instead of p1.
  */
 static int
 proc_compare_wrapper(struct proc *p1, struct proc *p2)
+{
 	lwp_t *l1, *l2;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tty.h,v 1.103 2022/10/26 23:41:49 riastradh Exp $	*/
+/*	$NetBSD: tty.h,v 1.104 2023/04/12 06:35:26 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -275,27 +275,27 @@ int	 unputc(struct clist *);
 int	 nullmodem(struct tty *, int);
 int	 tputchar(int, int, struct tty *);
 int	 ttioctl(struct tty *, u_long, void *, int, struct lwp *);
 int	 ttread(struct tty *, struct uio *, int);
 void	 ttrstrt(void *);
 int	 ttpoll(struct tty *, int, struct lwp *);
 void	 ttsetwater(struct tty *);
 int	 ttspeedtab(int, const struct speedtab *);
 int	 ttstart(struct tty *);
 void	 ttwakeup(struct tty *);
 int	 ttwrite(struct tty *, struct uio *, int);
 void	 ttychars(struct tty *);
-int	 ttycheckoutq(struct tty *, int);
+int	 ttycheckoutq(struct tty *);
 void	 ttycancel(struct tty *);
 int	 ttyclose(struct tty *);
 void	 ttyflush(struct tty *, int);
 void	 ttygetinfo(struct tty *, int, char *, size_t);
 void	 ttyputinfo(struct tty *, char *);
 int	 ttyinput(int, struct tty *);
 int	 ttyinput_wlock(int, struct tty *); /* XXX see wsdisplay.c */
 int	 ttylclose(struct tty *, int);
 int	 ttylopen(dev_t, struct tty *);
 int	 ttykqfilter(dev_t, struct knote *);
 int	 ttymodem(struct tty *, int);
 int	 ttyopen(struct tty *, int, int);
 int	 ttyoutput(int, struct tty *);