CVS commit: src/sys/netipsec

2022-05-24 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Wed May 25 04:15:44 UTC 2022

Modified Files:
src/sys/netipsec: xform_esp.c

Log Message:
ipsec: don't assert for the format of incoming packets


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/netipsec/xform_esp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.105 src/sys/netipsec/xform_esp.c:1.106
--- src/sys/netipsec/xform_esp.c:1.105	Sun May 22 11:40:29 2022
+++ src/sys/netipsec/xform_esp.c	Wed May 25 04:15:44 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_esp.c,v 1.105 2022/05/22 11:40:29 riastradh Exp $	*/
+/*	$NetBSD: xform_esp.c,v 1.106 2022/05/25 04:15:44 ozaki-r Exp $	*/
 /*	$FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.105 2022/05/22 11:40:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.106 2022/05/25 04:15:44 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -310,9 +310,13 @@ esp_input(struct mbuf *m, struct secasva
 
 	KASSERT(sav != NULL);
 	KASSERT(sav->tdb_encalgxform != NULL);
-	KASSERTMSG((skip & 3) == 0 && (m->m_pkthdr.len & 3) == 0,
-	"misaligned packet, skip %u pkt len %u",
-	skip, m->m_pkthdr.len);
+	if (__predict_false((skip & 3) != 0 || (m->m_pkthdr.len & 3) != 0)) {
+		DPRINTF("%s: misaligned packet, skip %u pkt len %u", __func__,
+		skip, m->m_pkthdr.len);
+		stat = ESP_STAT_BADILEN; /* Same as FreeBSD */
+		error = EINVAL;
+		goto out;
+	}
 
 	/* XXX don't pullup, just copy header */
 	M_REGION_GET(esp, struct newesp *, m, skip, sizeof(struct newesp));



CVS commit: src/sys/netipsec

2022-05-24 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Wed May 25 04:15:44 UTC 2022

Modified Files:
src/sys/netipsec: xform_esp.c

Log Message:
ipsec: don't assert for the format of incoming packets


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/netipsec/xform_esp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/xdm/dist/greeter

2022-05-24 Thread Michael van Elst
Module Name:xsrc
Committed By:   mlelstv
Date:   Tue May 24 22:47:53 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/greeter: Login.c

Log Message:
Position input fields without overlap.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xdm/dist/greeter/Login.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/greeter/Login.c
diff -u xsrc/external/mit/xdm/dist/greeter/Login.c:1.6 xsrc/external/mit/xdm/dist/greeter/Login.c:1.7
--- xsrc/external/mit/xdm/dist/greeter/Login.c:1.6	Fri Jun  7 05:49:37 2019
+++ xsrc/external/mit/xdm/dist/greeter/Login.c	Tue May 24 22:47:52 2022
@@ -328,7 +328,7 @@ XmuXftTextWidth(Display *dpy, XftFont *f
 #define SEP_H(w)	((w)->login.inframeswidth * 2)
 
 #define PROMPT_X(w)	(2 * PROMPT_X_INC(w))
-#define PROMPT_Y(w,n) 	((SEP_Y(w) + ((n)+1) * GREET_Y_INC(w) + 2 * (w)->login.inframeswidth))
+#define PROMPT_Y(w,n) 	(SEP_Y(w) + GREET_Y_INC(w) + (n) * Y_INC(w) + (2*(n)+1) * ((w)->login.inframeswidth + VALUE_VPAD(w,n)))
 #define PROMPT_W(w)	(w->core.width - PROMPT_X(w) - 2 * TEXT_X_INC(w) - LOGO_W(w))
 #define PROMPT_H(w)	Y_INC(w)
 



CVS commit: xsrc/external/mit/xdm/dist/greeter

2022-05-24 Thread Michael van Elst
Module Name:xsrc
Committed By:   mlelstv
Date:   Tue May 24 22:47:53 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/greeter: Login.c

Log Message:
Position input fields without overlap.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xdm/dist/greeter/Login.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/bin/dd

2022-05-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue May 24 21:42:38 UTC 2022

Modified Files:
src/tests/bin/dd: t_dd.sh

Log Message:
tests/dd: add more test cases for swapping bytes

To demonstrate that the fix from PR 56433 works as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/dd/t_dd.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/dd/t_dd.sh
diff -u src/tests/bin/dd/t_dd.sh:1.2 src/tests/bin/dd/t_dd.sh:1.3
--- src/tests/bin/dd/t_dd.sh:1.2	Fri Oct  8 14:45:07 2021
+++ src/tests/bin/dd/t_dd.sh	Tue May 24 21:42:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: t_dd.sh,v 1.2 2021/10/08 14:45:07 christos Exp $
+# $NetBSD: t_dd.sh,v 1.3 2022/05/24 21:42:37 rillig Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -129,15 +129,26 @@ swab_head() {
 
 swab_body() {
 	echo -n abcdefgh > testfile
-	atf_check -s exit:0 -e ignore -o inline:badcfehg \
-	 dd if=testfile conv=swab msgfmt=quiet
-	atf_check -s exit:0 -e ignore -o inline:abcdefgh \
-	 dd if=testfile conv=swab msgfmt=quiet bs=1
-	for i in 2 4 8; do
-	atf_check -s exit:0 -e ignore -o inline:badcfehg \
-		 dd if=testfile conv=swab msgfmt=quiet bs=$i
-	done
+
+	test_swab() {
+		atf_check -o inline:"$1" \
+		dd if=testfile conv=swab msgfmt=quiet $2
+	}
+
+	atf_check -o inline:badcfehg \
+	dd if=testfile conv=swab msgfmt=quiet
+
+	test_swap badcfehg # default block size
+	test_swab abcdefgh bs=1
+	test_swab badcfehg bs=2
+	test_swab bacedfhg bs=3
+	test_swab badcfehg bs=4
+	test_swab badcegfh bs=5
+	test_swab badcfehg bs=6
+	test_swab badcfegh bs=7
+	test_swab badcfehg bs=8
 }
+
 atf_init_test_cases()
 {
 	atf_add_test_case length



CVS commit: src/tests/bin/dd

2022-05-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue May 24 21:42:38 UTC 2022

Modified Files:
src/tests/bin/dd: t_dd.sh

Log Message:
tests/dd: add more test cases for swapping bytes

To demonstrate that the fix from PR 56433 works as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/dd/t_dd.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:50:21 UTC 2022

Modified Files:
src/common/lib/libc/gen: ptree.c radixtree.c
src/lib/libc/stdlib: div.3
src/lib/libp2k: p2k.c
src/sbin/iscsid: iscsid_targets.c
src/sbin/mount_nilfs: mount_nilfs.8
src/share/man/man4: lagg.4
src/sys/altq: altq_rmclass.h
src/sys/arch/amiga/dev: grf.c if_es.c
src/sys/arch/arc/dev: pccons.c
src/sys/arch/evbarm/conf: GUMSTIX
src/sys/arch/evbarm/ixm1200: ixm1200_start.S
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/powerpc/include/booke: e500reg.h
src/sys/arch/sparc/dev: kbd_pckbport.c
src/sys/arch/sparc64/dev: ebus_mainbus.c
src/sys/dev/fdt: fdt_port.h
src/sys/dev/ic: mfi.c rtl8169.c smc91cxx.c wdc.c z8530reg.h
src/sys/dev/ir: irframe_tty.c
src/sys/dev/microcode/aic7xxx: aicasm.c aicasm_symbol.c aicasm_symbol.h
src/sys/dev/pci: if_sip.c
src/sys/dev/usb: xhci.c
src/sys/kern: kern_event.c
src/sys/net: if_llatbl.c
src/sys/net/lagg: if_laggproto.h
src/sys/netinet: ip_icmp.h sctp_indata.c sctp_pcb.c sctp_pcb.h
tcp_input.c
src/sys/netipsec: ipsec_input.c key.c
src/tests/kernel: t_umount.sh
src/tests/lib/libc/locale: t_digittoint.c t_wctype.c
src/tests/usr.bin/printf: printf.sh
src/usr.bin/finger: util.c
src/usr.bin/m4: eval.c
src/usr.sbin/acpitools/acpidump: acpi.c
src/usr.sbin/altq/libaltq: qop_hfsc.c

Log Message:
fix various typos in comment, documentation and log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/gen/ptree.c
cvs rdiff -u -r1.27 -r1.28 src/common/lib/libc/gen/radixtree.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdlib/div.3
cvs rdiff -u -r1.74 -r1.75 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/iscsid/iscsid_targets.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/mount_nilfs/mount_nilfs.8
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/lagg.4
cvs rdiff -u -r1.12 -r1.13 src/sys/altq/altq_rmclass.h
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arc/dev/pccons.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/ixm1200/ixm1200_start.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/ralink/ralink_eth.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/booke/e500reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/dev/kbd_pckbport.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/fdt_port.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/z8530reg.h
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/microcode/aic7xxx/aicasm.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm_symbol.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/aic7xxx/aicasm_symbol.h
cvs rdiff -u -r1.185 -r1.186 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.140 -r1.141 src/sys/kern/kern_event.c
cvs rdiff -u -r1.33 -r1.34 src/sys/net/if_llatbl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net/lagg/if_laggproto.h
cvs rdiff -u -r1.43 -r1.44 src/sys/netinet/ip_icmp.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/sctp_indata.c
cvs rdiff -u -r1.23 -r1.24 src/sys/netinet/sctp_pcb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_pcb.h
cvs rdiff -u -r1.432 -r1.433 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.76 -r1.77 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.274 -r1.275 src/sys/netipsec/key.c
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_umount.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/locale/t_digittoint.c \
src/tests/lib/libc/locale/t_wctype.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/printf/printf.sh
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/finger/util.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/m4/eval.c
cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/acpitools/acpidump/acpi.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/libaltq/qop_hfsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.10 src/common/lib/libc/gen/ptree.c:1.11
--- src/common/lib/libc/gen/ptree.c:1.10	Sat Oct  6 22:15:09 2012
+++ src/common/lib/libc/gen/ptree.c	Tue May 24 20:50:17 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptree.c,v 1.10 2012/10/06 22:15:09 matt Exp $	*/
+/*	$NetBSD: ptree.c,v 1.11 2022/05/24 20:50:17 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ 

CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:50:21 UTC 2022

Modified Files:
src/common/lib/libc/gen: ptree.c radixtree.c
src/lib/libc/stdlib: div.3
src/lib/libp2k: p2k.c
src/sbin/iscsid: iscsid_targets.c
src/sbin/mount_nilfs: mount_nilfs.8
src/share/man/man4: lagg.4
src/sys/altq: altq_rmclass.h
src/sys/arch/amiga/dev: grf.c if_es.c
src/sys/arch/arc/dev: pccons.c
src/sys/arch/evbarm/conf: GUMSTIX
src/sys/arch/evbarm/ixm1200: ixm1200_start.S
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/powerpc/include/booke: e500reg.h
src/sys/arch/sparc/dev: kbd_pckbport.c
src/sys/arch/sparc64/dev: ebus_mainbus.c
src/sys/dev/fdt: fdt_port.h
src/sys/dev/ic: mfi.c rtl8169.c smc91cxx.c wdc.c z8530reg.h
src/sys/dev/ir: irframe_tty.c
src/sys/dev/microcode/aic7xxx: aicasm.c aicasm_symbol.c aicasm_symbol.h
src/sys/dev/pci: if_sip.c
src/sys/dev/usb: xhci.c
src/sys/kern: kern_event.c
src/sys/net: if_llatbl.c
src/sys/net/lagg: if_laggproto.h
src/sys/netinet: ip_icmp.h sctp_indata.c sctp_pcb.c sctp_pcb.h
tcp_input.c
src/sys/netipsec: ipsec_input.c key.c
src/tests/kernel: t_umount.sh
src/tests/lib/libc/locale: t_digittoint.c t_wctype.c
src/tests/usr.bin/printf: printf.sh
src/usr.bin/finger: util.c
src/usr.bin/m4: eval.c
src/usr.sbin/acpitools/acpidump: acpi.c
src/usr.sbin/altq/libaltq: qop_hfsc.c

Log Message:
fix various typos in comment, documentation and log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/gen/ptree.c
cvs rdiff -u -r1.27 -r1.28 src/common/lib/libc/gen/radixtree.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdlib/div.3
cvs rdiff -u -r1.74 -r1.75 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/iscsid/iscsid_targets.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/mount_nilfs/mount_nilfs.8
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/lagg.4
cvs rdiff -u -r1.12 -r1.13 src/sys/altq/altq_rmclass.h
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arc/dev/pccons.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/ixm1200/ixm1200_start.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/ralink/ralink_eth.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/booke/e500reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/dev/kbd_pckbport.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/fdt_port.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/z8530reg.h
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/microcode/aic7xxx/aicasm.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm_symbol.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/aic7xxx/aicasm_symbol.h
cvs rdiff -u -r1.185 -r1.186 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.140 -r1.141 src/sys/kern/kern_event.c
cvs rdiff -u -r1.33 -r1.34 src/sys/net/if_llatbl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net/lagg/if_laggproto.h
cvs rdiff -u -r1.43 -r1.44 src/sys/netinet/ip_icmp.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/sctp_indata.c
cvs rdiff -u -r1.23 -r1.24 src/sys/netinet/sctp_pcb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_pcb.h
cvs rdiff -u -r1.432 -r1.433 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.76 -r1.77 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.274 -r1.275 src/sys/netipsec/key.c
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_umount.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/locale/t_digittoint.c \
src/tests/lib/libc/locale/t_wctype.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/printf/printf.sh
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/finger/util.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/m4/eval.c
cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/acpitools/acpidump/acpi.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/libaltq/qop_hfsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:08:38 UTC 2022

Modified Files:
src/tests/kernel: t_zombie.c
src/tests/lib/libc/sys: t_fork.c t_ptrace.c t_ptrace_wait.h

Log Message:
s/estabilishing/establishing/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_zombie.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_fork.c \
src/tests/lib/libc/sys/t_ptrace.c
cvs rdiff -u -r1.33 -r1.34 src/tests/lib/libc/sys/t_ptrace_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/kernel/t_zombie.c
diff -u src/tests/kernel/t_zombie.c:1.2 src/tests/kernel/t_zombie.c:1.3
--- src/tests/kernel/t_zombie.c:1.2	Fri May 18 00:25:30 2018
+++ src/tests/kernel/t_zombie.c	Tue May 24 20:08:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_zombie.c,v 1.2 2018/05/18 00:25:30 kamil Exp $	*/
+/*	$NetBSD: t_zombie.c,v 1.3 2022/05/24 20:08:38 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2018\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_zombie.c,v 1.2 2018/05/18 00:25:30 kamil Exp $");
+__RCSID("$NetBSD: t_zombie.c,v 1.3 2022/05/24 20:08:38 andvar Exp $");
 
 #include 
 #include 
@@ -57,7 +57,7 @@ do {	\
  * A child process cannot call atf functions and expect them to magically
  * work like in the parent.
  * The printf(3) messaging from a child will not work out of the box as well
- * without estabilishing a communication protocol with its parent. To not
+ * without establishing a communication protocol with its parent. To not
  * overcomplicate the tests - do not log from a child and use err(3)/errx(3)
  * wrapped with ASSERT_EQ()/ASSERT_NEQ() as that is guaranteed to work.
  */

Index: src/tests/lib/libc/sys/t_fork.c
diff -u src/tests/lib/libc/sys/t_fork.c:1.4 src/tests/lib/libc/sys/t_fork.c:1.5
--- src/tests/lib/libc/sys/t_fork.c:1.4	Sat Apr  6 15:41:54 2019
+++ src/tests/lib/libc/sys/t_fork.c	Tue May 24 20:08:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fork.c,v 1.4 2019/04/06 15:41:54 kamil Exp $	*/
+/*	$NetBSD: t_fork.c,v 1.5 2022/05/24 20:08:38 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2018, 2019\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_fork.c,v 1.4 2019/04/06 15:41:54 kamil Exp $");
+__RCSID("$NetBSD: t_fork.c,v 1.5 2022/05/24 20:08:38 andvar Exp $");
 
 #include 
 #include 
@@ -55,7 +55,7 @@ __RCSID("$NetBSD: t_fork.c,v 1.4 2019/04
  * A child process cannot call atf functions and expect them to magically
  * work like in the parent.
  * The printf(3) messaging from a child will not work out of the box as well
- * without estabilishing a communication protocol with its parent. To not
+ * without establishing a communication protocol with its parent. To not
  * overcomplicate the tests - do not log from a child and use err(3)/errx(3)
  * wrapped with ASSERT_EQ()/ASSERT_NEQ() as that is guaranteed to work.
  */
Index: src/tests/lib/libc/sys/t_ptrace.c
diff -u src/tests/lib/libc/sys/t_ptrace.c:1.4 src/tests/lib/libc/sys/t_ptrace.c:1.5
--- src/tests/lib/libc/sys/t_ptrace.c:1.4	Mon May 14 12:44:40 2018
+++ src/tests/lib/libc/sys/t_ptrace.c	Tue May 24 20:08:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace.c,v 1.4 2018/05/14 12:44:40 kamil Exp $	*/
+/*	$NetBSD: t_ptrace.c,v 1.5 2022/05/24 20:08:38 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace.c,v 1.4 2018/05/14 12:44:40 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace.c,v 1.5 2022/05/24 20:08:38 andvar Exp $");
 
 #include 
 #include 
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_ptrace.c,v 1.4 2018/
  * A child process cannot call atf functions and expect them to magically
  * work like in the parent.
  * The printf(3) messaging from a child will not work out of the box as well
- * without estabilishing a communication protocol with its parent. To not
+ * without establishing a communication protocol with its parent. To not
  * overcomplicate the tests - do not log from a child and use err(3)/errx(3)
  * wrapped with FORKEE_ASSERT()/FORKEE_ASSERTX() as that is guaranteed to work.
  */

Index: src/tests/lib/libc/sys/t_ptrace_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_wait.h:1.33 src/tests/lib/libc/sys/t_ptrace_wait.h:1.34
--- src/tests/lib/libc/sys/t_ptrace_wait.h:1.33	Mon May 24 10:44:06 2021
+++ src/tests/lib/libc/sys/t_ptrace_wait.h	Tue May 24 20:08:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.h,v 1.33 2021/05/24 10:44:06 gson Exp $	*/
+/*	$NetBSD: t_ptrace_wait.h,v 1.34 2022/05/24 20:08:38 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@ do {	\
  * A child process cannot call atf 

CVS commit: src/tests

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:08:38 UTC 2022

Modified Files:
src/tests/kernel: t_zombie.c
src/tests/lib/libc/sys: t_fork.c t_ptrace.c t_ptrace_wait.h

Log Message:
s/estabilishing/establishing/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_zombie.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_fork.c \
src/tests/lib/libc/sys/t_ptrace.c
cvs rdiff -u -r1.33 -r1.34 src/tests/lib/libc/sys/t_ptrace_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:00:49 UTC 2022

Modified Files:
src/sys/arch/m68k/fpe: fpu_sqrt.c
src/sys/arch/powerpc/fpu: fpu_sqrt.c
src/sys/arch/sparc/fpu: fpu_sqrt.c

Log Message:
s/equivalant/equivalent/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/fpe/fpu_sqrt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/fpu/fpu_sqrt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/fpu/fpu_sqrt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/m68k/fpe/fpu_sqrt.c
diff -u src/sys/arch/m68k/fpe/fpu_sqrt.c:1.8 src/sys/arch/m68k/fpe/fpu_sqrt.c:1.9
--- src/sys/arch/m68k/fpe/fpu_sqrt.c:1.8	Tue Mar 26 11:30:21 2013
+++ src/sys/arch/m68k/fpe/fpu_sqrt.c	Tue May 24 20:00:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_sqrt.c,v 1.8 2013/03/26 11:30:21 isaki Exp $ */
+/*	$NetBSD: fpu_sqrt.c,v 1.9 2022/05/24 20:00:49 andvar Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.8 2013/03/26 11:30:21 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.9 2022/05/24 20:00:49 andvar Exp $");
 
 #include 
 
@@ -126,7 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v
  * zero bit at the top of x.  Doing so means that q is not going to acquire
  * a 1 bit in the first trip around the loop (since x0 < 2^NBITS).  If the
  * final value in x is not needed, or can be off by a factor of 2, this is
- * equivalant to moving the `x *= 2' step to the bottom of the loop:
+ * equivalent to moving the `x *= 2' step to the bottom of the loop:
  *
  *	for k = NBITS-1 to 0 step -1 do if ... fi; x *= 2; done
  *

Index: src/sys/arch/powerpc/fpu/fpu_sqrt.c
diff -u src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.9 src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.10
--- src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.9	Sat Jun 27 04:29:27 2020
+++ src/sys/arch/powerpc/fpu/fpu_sqrt.c	Tue May 24 20:00:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_sqrt.c,v 1.9 2020/06/27 04:29:27 rin Exp $ */
+/*	$NetBSD: fpu_sqrt.c,v 1.10 2022/05/24 20:00:49 andvar Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.9 2020/06/27 04:29:27 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.10 2022/05/24 20:00:49 andvar Exp $");
 
 #include 
 #if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -130,7 +130,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v
  * zero bit at the top of x.  Doing so means that q is not going to acquire
  * a 1 bit in the first trip around the loop (since x0 < 2^NBITS).  If the
  * final value in x is not needed, or can be off by a factor of 2, this is
- * equivalant to moving the `x *= 2' step to the bottom of the loop:
+ * equivalent to moving the `x *= 2' step to the bottom of the loop:
  *
  *	for k = NBITS-1 to 0 step -1 do if ... fi; x *= 2; done
  *

Index: src/sys/arch/sparc/fpu/fpu_sqrt.c
diff -u src/sys/arch/sparc/fpu/fpu_sqrt.c:1.5 src/sys/arch/sparc/fpu/fpu_sqrt.c:1.6
--- src/sys/arch/sparc/fpu/fpu_sqrt.c:1.5	Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_sqrt.c	Tue May 24 20:00:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_sqrt.c,v 1.5 2005/11/16 23:24:44 uwe Exp $ */
+/*	$NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.5 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $");
 
 #include 
 
@@ -126,7 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v
  * zero bit at the top of x.  Doing so means that q is not going to acquire
  * a 1 bit in the first trip around the loop (since x0 < 2^NBITS).  If the
  * final value in x is not needed, or can be off by a factor of 2, this is
- * equivalant to moving the `x *= 2' step to the bottom of the loop:
+ * equivalent to moving the `x *= 2' step to the bottom of the loop:
  *
  *	for k = NBITS-1 to 0 step -1 do if ... fi; x *= 2; done
  *



CVS commit: src/sys/arch

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 20:00:49 UTC 2022

Modified Files:
src/sys/arch/m68k/fpe: fpu_sqrt.c
src/sys/arch/powerpc/fpu: fpu_sqrt.c
src/sys/arch/sparc/fpu: fpu_sqrt.c

Log Message:
s/equivalant/equivalent/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/fpe/fpu_sqrt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/fpu/fpu_sqrt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/fpu/fpu_sqrt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 19:55:10 UTC 2022

Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
src/sys/arch/atari/atari: bus.c
src/sys/arch/vax/vax: bus_dma.c
src/sys/arch/x68k/x68k: bus.c

Log Message:
s/entrace/entrance/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/bus_dma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x68k/x68k/bus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.135 src/sys/arch/arm/arm32/bus_dma.c:1.136
--- src/sys/arch/arm/arm32/bus_dma.c:1.135	Sun Feb  6 22:21:25 2022
+++ src/sys/arch/arm/arm32/bus_dma.c	Tue May 24 19:55:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.135 2022/02/06 22:21:25 mrg Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.136 2022/05/24 19:55:10 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.135 2022/02/06 22:21:25 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.136 2022/05/24 19:55:10 andvar Exp $");
 
 #include 
 
@@ -1626,7 +1626,7 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dm
 /*
  * Utility function to load a linear buffer.  lastaddrp holds state
  * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, and the ending segment on exit.
+ * the starting segment on entrance, and the ending segment on exit.
  * first indicates if this is the first invocation of this function.
  */
 int

Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.61 src/sys/arch/atari/atari/bus.c:1.62
--- src/sys/arch/atari/atari/bus.c:1.61	Sun Jan  3 17:42:10 2021
+++ src/sys/arch/atari/atari/bus.c	Tue May 24 19:55:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.61 2021/01/03 17:42:10 thorpej Exp $	*/
+/*	$NetBSD: bus.c,v 1.62 2022/05/24 19:55:10 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include "opt_m68k_arch.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.61 2021/01/03 17:42:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.62 2022/05/24 19:55:10 andvar Exp $");
 
 #include 
 #include 
@@ -897,7 +897,7 @@ bus_dmamem_mmap(bus_dma_tag_t t, bus_dma
 /*
  * Utility function to load a linear buffer.  lastaddrp holds state
  * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, and the ending segment on exit.
+ * the starting segment on entrance, and the ending segment on exit.
  * first indicates if this is the first invocation of this function.
  */
 static int

Index: src/sys/arch/vax/vax/bus_dma.c
diff -u src/sys/arch/vax/vax/bus_dma.c:1.36 src/sys/arch/vax/vax/bus_dma.c:1.37
--- src/sys/arch/vax/vax/bus_dma.c:1.36	Sat Nov 21 22:37:11 2020
+++ src/sys/arch/vax/vax/bus_dma.c	Tue May 24 19:55:09 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.37 2022/05/24 19:55:09 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2022/05/24 19:55:09 andvar Exp $");
 
 #include 
 #include 
@@ -541,7 +541,7 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dm
 /*
  * Utility function to load a linear buffer.  lastaddrp holds state
  * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, and the ending segment on exit.
+ * the starting segment on entrance, and the ending segment on exit.
  * first indicates if this is the first invocation of this function.
  */
 int

Index: src/sys/arch/x68k/x68k/bus.c
diff -u src/sys/arch/x68k/x68k/bus.c:1.36 src/sys/arch/x68k/x68k/bus.c:1.37
--- src/sys/arch/x68k/x68k/bus.c:1.36	Tue Oct  2 23:54:54 2012
+++ src/sys/arch/x68k/x68k/bus.c	Tue May 24 19:55:09 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.36 2012/10/02 23:54:54 christos Exp $	*/
+/*	$NetBSD: bus.c,v 1.37 2022/05/24 19:55:09 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include "opt_m68k_arch.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.36 2012/10/02 23:54:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.37 2022/05/24 19:55:09 andvar Exp $");
 
 #include 
 #include 
@@ -473,7 +473,7 @@ x68k_bus_dmamem_mmap(bus_dma_tag_t t, bu
 /*
  * Utility function to load a linear buffer.  lastaddrp holds state
  * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, 

CVS commit: src/sys/arch

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 19:55:10 UTC 2022

Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
src/sys/arch/atari/atari: bus.c
src/sys/arch/vax/vax: bus_dma.c
src/sys/arch/x68k/x68k: bus.c

Log Message:
s/entrace/entrance/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/bus_dma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x68k/x68k/bus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 19:37:39 UTC 2022

Modified Files:
src/sys/arch/arm/include: disklabel.h
src/sys/arch/or1k/include: disklabel.h
src/sys/arch/riscv/include: disklabel.h
src/sys/sys: disklabel_acorn.h

Log Message:
s/dosen't/doesn't/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/disklabel_acorn.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 19:37:39 UTC 2022

Modified Files:
src/sys/arch/arm/include: disklabel.h
src/sys/arch/or1k/include: disklabel.h
src/sys/arch/riscv/include: disklabel.h
src/sys/sys: disklabel_acorn.h

Log Message:
s/dosen't/doesn't/ in copy pasted comment.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/disklabel_acorn.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/include/disklabel.h
diff -u src/sys/arch/arm/include/disklabel.h:1.13 src/sys/arch/arm/include/disklabel.h:1.14
--- src/sys/arch/arm/include/disklabel.h:1.13	Sun Apr  1 04:35:04 2018
+++ src/sys/arch/arm/include/disklabel.h	Tue May 24 19:37:39 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.13 2018/04/01 04:35:04 ryo Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.14 2022/05/24 19:37:39 andvar Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -97,7 +97,7 @@ struct disklabel;
 int	mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
 	struct cpu_disklabel *, const char **, int *, int *);
 
-/* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
+/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
 int	mbr_label_locate(dev_t, void (*)(struct buf *),
 	struct disklabel *, struct cpu_disklabel *, int *, int *);
 #endif /* _KERNEL */

Index: src/sys/arch/or1k/include/disklabel.h
diff -u src/sys/arch/or1k/include/disklabel.h:1.1 src/sys/arch/or1k/include/disklabel.h:1.2
--- src/sys/arch/or1k/include/disklabel.h:1.1	Wed Sep  3 19:34:26 2014
+++ src/sys/arch/or1k/include/disklabel.h	Tue May 24 19:37:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2022/05/24 19:37:39 andvar Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ struct disklabel;
 int	mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
 	struct cpu_disklabel *, const char **, int *, int *);
 
-/* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
+/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
 int	mbr_label_locate(dev_t, void (*)(struct buf *),
 	struct disklabel *, struct cpu_disklabel *, int *, int *);
 #endif /* _KERNEL */

Index: src/sys/arch/riscv/include/disklabel.h
diff -u src/sys/arch/riscv/include/disklabel.h:1.1 src/sys/arch/riscv/include/disklabel.h:1.2
--- src/sys/arch/riscv/include/disklabel.h:1.1	Fri Sep 19 17:36:26 2014
+++ src/sys/arch/riscv/include/disklabel.h	Tue May 24 19:37:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2022/05/24 19:37:39 andvar Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ struct disklabel;
 int	mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
 	struct cpu_disklabel *, const char **, int *, int *);
 
-/* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
+/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
 int	mbr_label_locate(dev_t, void (*)(struct buf *),
 	struct disklabel *, struct cpu_disklabel *, int *, int *);
 #endif /* _KERNEL */

Index: src/sys/sys/disklabel_acorn.h
diff -u src/sys/sys/disklabel_acorn.h:1.6 src/sys/sys/disklabel_acorn.h:1.7
--- src/sys/sys/disklabel_acorn.h:1.6	Sun Dec 11 12:25:20 2005
+++ src/sys/sys/disklabel_acorn.h	Tue May 24 19:37:39 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel_acorn.h,v 1.6 2005/12/11 12:25:20 christos Exp $	*/
+/*	$NetBSD: disklabel_acorn.h,v 1.7 2022/05/24 19:37:39 andvar Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -102,7 +102,7 @@ int filecore_label_read(dev_t, void (*)(
 	struct disklabel *, struct cpu_disklabel *, const char **, int *,
 	int *);
 
-/* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
+/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
 int filecore_label_locate(dev_t, void (*)(struct buf *),
 	struct disklabel *, struct cpu_disklabel *, int *, int *);
 #endif



CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 17:06:08 UTC 2022

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/xen/xen: xen_acpi_machdep.c

Log Message:
PR kern/56853: add a dummy acpi_md_vbios_reset variable so that we
can again enable vga at pci for Xen.
Note that this only works in BIOS mode, not UEFI mode.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/xen_acpi_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.195 src/sys/arch/amd64/conf/XEN3_DOM0:1.196
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.195	Tue May 24 16:01:25 2022
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Tue May 24 17:06:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.195 2022/05/24 16:01:25 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.196 2022/05/24 17:06:08 bouyer Exp $
 
 # XEN3_DOM0 machine description file
 #
@@ -14,7 +14,7 @@ include 	"arch/amd64/conf/std.xen"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"XEN3_DOM0-$Revision: 1.195 $"
+#ident		"XEN3_DOM0-$Revision: 1.196 $"
 
 maxusers	32		# estimated number of users
 
@@ -438,8 +438,7 @@ pms*		at pckbc?		# PS/2 mouse for wsmous
 options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
 options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
 options 	PMS_ALPS_TOUCHPAD	# Enable support for Alps Touchpads
-#vga*		at pci? dev ? function ?# Needs acpi_md_vbios_reset 
-	# in acpi_wakeup.c (!xenpv)
+vga*		at pci? dev ? function ?
 #genfb*		at pci? dev ? function ?# Needs acpi_md_vesa_modenum
 	# in acpi_wakeup.c (!xenpv)
 #options 	VCONS_DRAW_INTR

Index: src/sys/arch/xen/xen/xen_acpi_machdep.c
diff -u src/sys/arch/xen/xen/xen_acpi_machdep.c:1.5 src/sys/arch/xen/xen/xen_acpi_machdep.c:1.6
--- src/sys/arch/xen/xen/xen_acpi_machdep.c:1.5	Tue Aug 18 16:41:03 2009
+++ src/sys/arch/xen/xen/xen_acpi_machdep.c	Tue May 24 17:06:08 2022
@@ -1,15 +1,17 @@
-/*	$NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $	*/
+/*	$NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $	*/
 
 #include "acpica.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $");
 
 #include 
 #include 
 #define ACPI_MACHDEP_PRIVATE
 #include 
 
+int acpi_md_vbios_reset = 0;
+
 int
 acpi_md_sleep(int state)
 {



CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 17:06:08 UTC 2022

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/xen/xen: xen_acpi_machdep.c

Log Message:
PR kern/56853: add a dummy acpi_md_vbios_reset variable so that we
can again enable vga at pci for Xen.
Note that this only works in BIOS mode, not UEFI mode.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/xen_acpi_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/amd64/conf

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 16:01:25 UTC 2022

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0

Log Message:
Looks like we finally can enable MSI/MSI-X on Xen
Should fix PR kern/56793 and PR kern/55667


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/amd64/conf/XEN3_DOM0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.194 src/sys/arch/amd64/conf/XEN3_DOM0:1.195
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.194	Fri Sep 24 00:29:46 2021
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Tue May 24 16:01:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.194 2021/09/24 00:29:46 manu Exp $
+# $NetBSD: XEN3_DOM0,v 1.195 2022/05/24 16:01:25 bouyer Exp $
 
 # XEN3_DOM0 machine description file
 #
@@ -14,7 +14,7 @@ include 	"arch/amd64/conf/std.xen"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"XEN3_DOM0-$Revision: 1.194 $"
+#ident		"XEN3_DOM0-$Revision: 1.195 $"
 
 maxusers	32		# estimated number of users
 
@@ -384,9 +384,6 @@ pci*	at hypervisor? bus ?
 pci*	at pchb? bus ?
 pci*	at ppb? bus ?
 
-# MSIX bugs with XEN3_DOM0: kern/55667, kern/56291
-options NO_PCI_MSI_MSIX
-
 # PCI bridges
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
 #options 	AGP_X86			# INTENTIONAL OMISSION - crashes reported with agp



CVS commit: src/sys/arch/amd64/conf

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 16:01:25 UTC 2022

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0

Log Message:
Looks like we finally can enable MSI/MSI-X on Xen
Should fix PR kern/56793 and PR kern/55667


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/amd64/conf/XEN3_DOM0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 15:55:19 UTC 2022

Modified Files:
src/sys/arch/amd64/amd64: genassym.cf vector.S
src/sys/arch/i386/i386: genassym.cf vector.S
src/sys/arch/x86/include: intr.h
src/sys/arch/xen/xen: evtchn.c

Log Message:
Some devices (e.g. ixg in MSI-X mode) don't to have their handlers called
when no interrupt are pending. So add an extra ih_pending field
to struct intrhand, which is incremeted when the handler is not called because
of IPL level and reset to 0 when called. Check this in Xen's resume
assembly to call only handlers that are really pending.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/xen/xen/evtchn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 15:55:19 UTC 2022

Modified Files:
src/sys/arch/amd64/amd64: genassym.cf vector.S
src/sys/arch/i386/i386: genassym.cf vector.S
src/sys/arch/x86/include: intr.h
src/sys/arch/xen/xen: evtchn.c

Log Message:
Some devices (e.g. ixg in MSI-X mode) don't to have their handlers called
when no interrupt are pending. So add an extra ih_pending field
to struct intrhand, which is incremeted when the handler is not called because
of IPL level and reset to 0 when called. Check this in Xen's resume
assembly to call only handlers that are really pending.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/xen/xen/evtchn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.85 src/sys/arch/amd64/amd64/genassym.cf:1.86
--- src/sys/arch/amd64/amd64/genassym.cf:1.85	Sat May 16 18:31:47 2020
+++ src/sys/arch/amd64/amd64/genassym.cf	Tue May 24 15:55:19 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.85 2020/05/16 18:31:47 christos Exp $
+#	$NetBSD: genassym.cf,v 1.86 2022/05/24 15:55:19 bouyer Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -367,6 +367,7 @@ define	VM_GUEST_XENPVH		VM_GUEST_XENPVH
 
 ifdef XEN
 define CPU_INFO_VCPU		offsetof(struct cpu_info, ci_vcpu)
+define IH_PENDING		offsetof(struct intrhand, ih_pending)
 define SIR_XENIPL_VM		SIR_XENIPL_VM
 define SIR_XENIPL_SCHED		SIR_XENIPL_SCHED
 define SIR_XENIPL_HIGH		SIR_XENIPL_HIGH

Index: src/sys/arch/amd64/amd64/vector.S
diff -u src/sys/arch/amd64/amd64/vector.S:1.77 src/sys/arch/amd64/amd64/vector.S:1.78
--- src/sys/arch/amd64/amd64/vector.S:1.77	Sun May 17 14:15:55 2020
+++ src/sys/arch/amd64/amd64/vector.S	Tue May 24 15:55:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: vector.S,v 1.77 2020/05/17 14:15:55 ad Exp $	*/
+/*	$NetBSD: vector.S,v 1.78 2022/05/24 15:55:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -712,9 +712,13 @@ IDTVEC(resume_ ## name ## sir)		\
 	incl	CPUVAR(IDEPTH)		;\
 	movq	IS_HANDLERS(%r14),%rbx	;\
 6:	\
+	cmpl	$0, IH_PENDING(%rbx)	/* is handler pending ? */	;\
+	je	7f			/* no */			;\
+	movl	$0, IH_PENDING(%rbx)	;\
 	movq	IH_ARG(%rbx),%rdi	;\
 	movq	%rsp,%rsi		;\
 	call	*IH_FUN(%rbx)		/* call it */			;\
+7:	\
 	movq	IH_NEXT(%rbx),%rbx	/* next handler in chain */	;\
 	testq	%rbx,%rbx		;\
 	jnz	6b			;\

Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.122 src/sys/arch/i386/i386/genassym.cf:1.123
--- src/sys/arch/i386/i386/genassym.cf:1.122	Sat May  2 16:44:35 2020
+++ src/sys/arch/i386/i386/genassym.cf	Tue May 24 15:55:19 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.122 2020/05/02 16:44:35 bouyer Exp $
+#	$NetBSD: genassym.cf,v 1.123 2022/05/24 15:55:19 bouyer Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -377,6 +377,7 @@ define	VM_GUEST_XENPVH		VM_GUEST_XENPVH
 
 ifdef XEN
 define CPU_INFO_VCPU		offsetof(struct cpu_info, ci_vcpu)
+define IH_PENDING		offsetof(struct intrhand, ih_pending)
 define SIR_XENIPL_VM		SIR_XENIPL_VM
 define SIR_XENIPL_SCHED		SIR_XENIPL_SCHED
 define SIR_XENIPL_HIGH		SIR_XENIPL_HIGH

Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.87 src/sys/arch/i386/i386/vector.S:1.88
--- src/sys/arch/i386/i386/vector.S:1.87	Sun May 17 14:15:55 2020
+++ src/sys/arch/i386/i386/vector.S	Tue May 24 15:55:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: vector.S,v 1.87 2020/05/17 14:15:55 ad Exp $	*/
+/*	$NetBSD: vector.S,v 1.88 2022/05/24 15:55:19 bouyer Exp $	*/
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.87 2020/05/17 14:15:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.88 2022/05/24 15:55:19 bouyer Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -955,9 +955,13 @@ IDTVEC(resume_ ## name ## sir)		\
 	STI(%eax)			;\
 	movl	IS_HANDLERS(%ebp),%ebx	;\
 6:	\
+	cmpl	$0, IH_PENDING(%ebx)	/* is handler pending ? */	;\
+	je	7f			/* no */			;\
+	movl	$0, IH_PENDING(%ebx)	;\
 	pushl	IH_ARG(%ebx)		;\
 	call	*IH_FUN(%ebx)		/* call it */			;\
 	addl	$4,%esp			/* toss the arg */		;\
+7:	\
 	movl	IH_NEXT(%ebx),%ebx	/* next handler in chain */	;\
 	testl	%ebx,%ebx		;\
 	jnz	6b			;\

Index: src/sys/arch/x86/include/intr.h
diff -u src/sys/arch/x86/include/intr.h:1.64 

CVS commit: src/sys/arch/xen/x86

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 15:51:10 UTC 2022

Modified Files:
src/sys/arch/xen/x86: pintr.c

Log Message:
Remove useless info from debug printf, fix format warning on i386


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/pintr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/xen/x86/pintr.c
diff -u src/sys/arch/xen/x86/pintr.c:1.22 src/sys/arch/xen/x86/pintr.c:1.23
--- src/sys/arch/xen/x86/pintr.c:1.22	Tue May 24 14:00:23 2022
+++ src/sys/arch/xen/x86/pintr.c	Tue May 24 15:51:10 2022
@@ -103,7 +103,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.22 2022/05/24 14:00:23 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.23 2022/05/24 15:51:10 bouyer Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -236,9 +236,9 @@ xen_map_msix_pirq(struct pic *pic, int c
  	map_irq.devfn = (msi_i->mp_dev << 3) | msi_i->mp_fun;
  	map_irq.table_base = msi_i->mp_table_base;
 
-	aprint_debug("xen_map_msix_pirq bus %d devfn 0x%x (%d %d) count %d base 0x%lx",
+	aprint_debug("xen_map_msix_pirq bus %d devfn 0x%x (%d %d) count %d",
 	map_irq.bus, map_irq.devfn, msi_i->mp_dev, msi_i->mp_fun,
-	count, map_irq.table_base);
+	count);
 
 	for (i = 0; i < count; i++) {
 		map_irq.entry_nr = i;



CVS commit: src/sys/arch/xen/x86

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 15:51:10 UTC 2022

Modified Files:
src/sys/arch/xen/x86: pintr.c

Log Message:
Remove useless info from debug printf, fix format warning on i386


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/pintr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/bin/xdm/config

2022-05-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Tue May 24 14:53:15 UTC 2022

Modified Files:
src/external/mit/xorg/bin/xdm/config: Xresources.in

Log Message:
xdm: Revert font changes. Requested by martin.

In addition, we must lower innerFramesWidth to prevent the new-old
fonts from causing the two text input boxes to overlap. xdm really
could be more clever about text layout...

PR xsrc/56855


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/config/Xresources.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/bin/xdm/config/Xresources.in
diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.7 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.8
--- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.7	Sat May  7 06:31:39 2022
+++ src/external/mit/xorg/bin/xdm/config/Xresources.in	Tue May 24 14:53:15 2022
@@ -1,4 +1,4 @@
-! $NetBSD: Xresources.in,v 1.7 2022/05/07 06:31:39 nia Exp $
+! $NetBSD: Xresources.in,v 1.8 2022/05/24 14:53:15 nia Exp $
 
 xlogin*login.translations: #override BS
 	CtrlR: abort-display()NLBS
@@ -22,25 +22,24 @@ xlogin*greetFont:	-*-spleen-*-*-*-*-32-*
 xlogin*font:		-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
 xlogin*promptFont:	-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
 xlogin*failFont:	-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
-xlogin*greetFace:	Liberation Sans:pixelsize=32:hintstyle=hintslight
-xlogin*face: 		Liberation Mono:pixelsize=16:hintstyle=hintslight
-xlogin*promptFace:	Liberation Mono:pixelsize=16:hintstyle=hintslight
-xlogin*failFace:	Liberation Mono:pixelsize=16:hintstyle=hintslight
+xlogin*greetFace:	Sans-24:hintstyle=hintslight
+xlogin*face:		Sans-14:hintstyle=hintslight
+xlogin*promptFace:	Sans-14:bold:hintstyle=hintslight
+xlogin*failFace:	Sans-14:bold:hintstyle=hintslight
 XHASHelse
 xlogin*greetFont:	-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
 xlogin*font:		-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
 xlogin*promptFont:	-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
 xlogin*failFont:	-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*
-xlogin*greetFace:	Liberation Sans:pixelsize=16:hintstyle=hintslight
-xlogin*face: 		Libreation Mono:pixelsize=16:hintstyle=hintslight
-xlogin*face: 		Libreation Mono:pixelsize=16:hintstyle=hintslight
-xlogin*promptFace:	Libreation Mono:pixelsize=16:hintstyle=hintslight
-xlogin*failFace:	Libreation Mono:pixelsize=16:hintstyle=hintslight
+xlogin*greetFace:	Sans-18:hintstyle=hintslight
+xlogin*face:		Sans-12:hintstyle=hintslight
+xlogin*promptFace:	Sans-12:bold:hintstyle=hintslight
+xlogin*failFace:	Sans-14:bold:hintstyle=hintslight
 XHASHendif
 
 xlogin*borderWidth: 2
 xlogin*frameWidth: 2
-xlogin*innerFramesWidth: 2
+xlogin*innerFramesWidth: 1
 xlogin*sepWidth: 0
 
 XHASHifdef COLOR



CVS commit: src/external/mit/xorg/bin/xdm/config

2022-05-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Tue May 24 14:53:15 UTC 2022

Modified Files:
src/external/mit/xorg/bin/xdm/config: Xresources.in

Log Message:
xdm: Revert font changes. Requested by martin.

In addition, we must lower innerFramesWidth to prevent the new-old
fonts from causing the two text input boxes to overlap. xdm really
could be more clever about text layout...

PR xsrc/56855


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/config/Xresources.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-05-24 Thread Frederic Cambus
Module Name:src
Committed By:   fcambus
Date:   Tue May 24 14:11:15 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
Add information for Spleen fonts.


To generate a diff of this commit:
cvs rdiff -u -r1.1858 -r1.1859 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1858 src/doc/3RDPARTY:1.1859
--- src/doc/3RDPARTY:1.1858	Tue May 24 13:52:52 2022
+++ src/doc/3RDPARTY	Tue May 24 14:11:15 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1858 2022/05/24 13:52:52 fcambus Exp $
+#	$NetBSD: 3RDPARTY,v 1.1859 2022/05/24 14:11:15 fcambus Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -2292,3 +2292,16 @@ Suitably encoded BDF files are prepared 
 masters using upstream build scripts.  BDF files are converted to the
 WSF files with xsrc/local/programs/bdfload.  File names for the
 re-encoded subsets follow the convention used by the upstream.
+
+Package:	Spleen
+Version:	1.9.1
+Current Vers:	1.9.1
+Maintainer:	Frederic Cambus
+Archive Site:	https://github.com/fcambus/spleen
+Home Page:	https://github.com/fcambus/spleen
+Date:		2021-06-13
+Mailing List:
+Responsible:	fcambus
+License:	BSD (2-clause)
+Location:	share/wscons/fonts
+Notes:



CVS commit: src/doc

2022-05-24 Thread Frederic Cambus
Module Name:src
Committed By:   fcambus
Date:   Tue May 24 14:11:15 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
Add information for Spleen fonts.


To generate a diff of this commit:
cvs rdiff -u -r1.1858 -r1.1859 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 14:00:24 UTC 2022

Modified Files:
src/sys/arch/x86/pci: msipic.c pci_machdep.c
src/sys/arch/xen/x86: pintr.c xen_intr.c

Log Message:
- msipic_construct_msix_pic(): set mp_table_base to memaddr (without
  table_offset), this is what Xen wants
while there use pci_conf_write16() in msi_set_msictl_enablebit() too,
for consistency (it seems that Xen accepts the 32bit write at this point,
but this may change).

- xen_map_msix_pirq(): don't forget to set map_irq.table_base in the
  MSI-X case, otherwise Xen maps it as MSI
- call pic_hwunmask() after pirq_establish() in msi/msix case, to make sure
  the msi-x vector is unmasked.

Now MSI-X works with Xen so stop disabling it in pci_attach_hook().


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/pci/msipic.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/pci/pci_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/xen/x86/pintr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/x86/xen_intr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/pci/msipic.c
diff -u src/sys/arch/x86/pci/msipic.c:1.26 src/sys/arch/x86/pci/msipic.c:1.27
--- src/sys/arch/x86/pci/msipic.c:1.26	Mon May 23 15:03:05 2022
+++ src/sys/arch/x86/pci/msipic.c	Tue May 24 14:00:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: msipic.c,v 1.26 2022/05/23 15:03:05 bouyer Exp $	*/
+/*	$NetBSD: msipic.c,v 1.27 2022/05/24 14:00:23 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.26 2022/05/23 15:03:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.27 2022/05/24 14:00:23 bouyer Exp $");
 
 #include "opt_intrdebug.h"
 
@@ -356,7 +356,11 @@ msi_set_msictl_enablebit(struct pic *pic
 	else
 		ctl &= ~PCI_MSI_CTL_MSI_ENABLE;
 
+#ifdef XENPV
+	pci_conf_write16(pc, tag, off + PCI_MSI_CTL + 2, ctl >> 16);
+#else
 	pci_conf_write(pc, tag, off, ctl);
+#endif
 }
 
 static void
@@ -771,7 +775,7 @@ msipic_construct_msix_pic(const struct p
 	msix_pic->pic_msipic->mp_bstag = bstag;
 	msix_pic->pic_msipic->mp_bshandle = bshandle;
 	msix_pic->pic_msipic->mp_bssize = bssize;
-	msix_pic->pic_msipic->mp_i.mp_table_base = memaddr + table_offset;
+	msix_pic->pic_msipic->mp_i.mp_table_base = memaddr;
 
 	return msix_pic;
 }

Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.90 src/sys/arch/x86/pci/pci_machdep.c:1.91
--- src/sys/arch/x86/pci/pci_machdep.c:1.90	Mon May 23 15:03:05 2022
+++ src/sys/arch/x86/pci/pci_machdep.c	Tue May 24 14:00:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.90 2022/05/23 15:03:05 bouyer Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.91 2022/05/24 14:00:23 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.90 2022/05/23 15:03:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.91 2022/05/24 14:00:23 bouyer Exp $");
 
 #include 
 #include 
@@ -565,14 +565,6 @@ pci_attach_hook(device_t parent, device_
 		}
 	}
 
-#ifdef XENPV
-	/*
-	 * XXX MSI-X doesn't work for XenPV yet - setup seems to be correct,
-	 * XXX but no interrupts are actually delivered.
-	 */
-	pba->pba_flags &= ~PCI_FLAGS_MSIX_OKAY;
-#endif
-
 #endif /* __HAVE_PCI_MSI_MSIX */
 }
 

Index: src/sys/arch/xen/x86/pintr.c
diff -u src/sys/arch/xen/x86/pintr.c:1.21 src/sys/arch/xen/x86/pintr.c:1.22
--- src/sys/arch/xen/x86/pintr.c:1.21	Mon May 23 15:03:05 2022
+++ src/sys/arch/xen/x86/pintr.c	Tue May 24 14:00:23 2022
@@ -103,7 +103,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.21 2022/05/23 15:03:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.22 2022/05/24 14:00:23 bouyer Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -234,9 +234,11 @@ xen_map_msix_pirq(struct pic *pic, int c
 	map_irq.pirq = -1;
 	map_irq.bus = msi_i->mp_bus;
  	map_irq.devfn = (msi_i->mp_dev << 3) | msi_i->mp_fun;
-	aprint_debug("xen_map_msix_pirq bus %d devfn 0x%x (%d %d) count %d",
+ 	map_irq.table_base = msi_i->mp_table_base;
+
+	aprint_debug("xen_map_msix_pirq bus %d devfn 0x%x (%d %d) count %d base 0x%lx",
 	map_irq.bus, map_irq.devfn, msi_i->mp_dev, msi_i->mp_fun,
-	count);
+	count, map_irq.table_base);
 
 	for (i = 0; i < count; i++) {
 		map_irq.entry_nr = i;

Index: src/sys/arch/xen/x86/xen_intr.c
diff -u src/sys/arch/xen/x86/xen_intr.c:1.29 src/sys/arch/xen/x86/xen_intr.c:1.30
--- src/sys/arch/xen/x86/xen_intr.c:1.29	Mon Aug  9 21:20:50 2021
+++ src/sys/arch/xen/x86/xen_intr.c	Tue May 24 14:00:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: xen_intr.c,v 1.29 2021/08/09 21:20:50 andvar Exp $	*/
+/*	$NetBSD: xen_intr.c,v 1.30 2022/05/24 14:00:23 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  

CVS commit: src/sys/arch

2022-05-24 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue May 24 14:00:24 UTC 2022

Modified Files:
src/sys/arch/x86/pci: msipic.c pci_machdep.c
src/sys/arch/xen/x86: pintr.c xen_intr.c

Log Message:
- msipic_construct_msix_pic(): set mp_table_base to memaddr (without
  table_offset), this is what Xen wants
while there use pci_conf_write16() in msi_set_msictl_enablebit() too,
for consistency (it seems that Xen accepts the 32bit write at this point,
but this may change).

- xen_map_msix_pirq(): don't forget to set map_irq.table_base in the
  MSI-X case, otherwise Xen maps it as MSI
- call pic_hwunmask() after pirq_establish() in msi/msix case, to make sure
  the msi-x vector is unmasked.

Now MSI-X works with Xen so stop disabling it in pci_attach_hook().


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/pci/msipic.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/pci/pci_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/xen/x86/pintr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/x86/xen_intr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2022-05-24 Thread Frederic Cambus
Module Name:src
Committed By:   fcambus
Date:   Tue May 24 13:52:52 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
Note that GCC 12.1 has been released on May 6th.

While there, switch home page to HTTPS.


To generate a diff of this commit:
cvs rdiff -u -r1.1857 -r1.1858 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1857 src/doc/3RDPARTY:1.1858
--- src/doc/3RDPARTY:1.1857	Sun May 22 09:57:58 2022
+++ src/doc/3RDPARTY	Tue May 24 13:52:52 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1857 2022/05/22 09:57:58 fcambus Exp $
+#	$NetBSD: 3RDPARTY,v 1.1858 2022/05/24 13:52:52 fcambus Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -451,11 +451,11 @@ There is a flex2netbsd script to help ne
 
 Package:	gcc
 Version:	9.3.0/10.3.0
-Current Vers:	9.3.0/10.3.0/11.3.0
+Current Vers:	9.3.0/10.3.0/11.3.0/12.1.0
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
-Home Page:	http://www.gnu.org/software/gcc/
-Date:		2021-04-10
+Home Page:	https://www.gnu.org/software/gcc/
+Date:		2022-05-06
 Mailing List:	gcc-b...@gnu.org
 Responsible:	mrg, christos, skrll
 License:	GPLv3, LGPLv3.1



CVS commit: src/doc

2022-05-24 Thread Frederic Cambus
Module Name:src
Committed By:   fcambus
Date:   Tue May 24 13:52:52 UTC 2022

Modified Files:
src/doc: 3RDPARTY

Log Message:
Note that GCC 12.1 has been released on May 6th.

While there, switch home page to HTTPS.


To generate a diff of this commit:
cvs rdiff -u -r1.1857 -r1.1858 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci/qat

2022-05-24 Thread Kengo NAKAHARA
Module Name:src
Committed By:   knakahara
Date:   Tue May 24 08:35:47 UTC 2022

Modified Files:
src/sys/dev/pci/qat: qat_c2xxx.c

Log Message:
Workaround for Atom C2000 series (Rangeley) qat, ok'ed by hikaru@n.o.

C2000 qat has two engines, however it doesn't have arbiter.
If we enable both engines, qat interrupts twice wrongly (and second
interrupt notice invalid data).  So, we enable only one engine.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/qat/qat_c2xxx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/qat/qat_c2xxx.c
diff -u src/sys/dev/pci/qat/qat_c2xxx.c:1.1 src/sys/dev/pci/qat/qat_c2xxx.c:1.2
--- src/sys/dev/pci/qat/qat_c2xxx.c:1.1	Wed Nov 20 09:37:46 2019
+++ src/sys/dev/pci/qat/qat_c2xxx.c	Tue May 24 08:35:47 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: qat_c2xxx.c,v 1.1 2019/11/20 09:37:46 hikaru Exp $	*/
+/*	$NetBSD: qat_c2xxx.c,v 1.2 2022/05/24 08:35:47 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2019 Internet Initiative Japan, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: qat_c2xxx.c,v 1.1 2019/11/20 09:37:46 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qat_c2xxx.c,v 1.2 2022/05/24 08:35:47 knakahara Exp $");
 
 #include 
 #include 
@@ -171,7 +171,16 @@ const struct qat_hw qat_hw_c2xxx = {
 	.qhw_num_ap_banks = ETR_MAX_AP_BANKS_C2XXX,
 	.qhw_num_rings_per_bank = ETR_MAX_RINGS_PER_BANK,
 	.qhw_num_accel = MAX_ACCEL_C2XXX,
+#if 0
 	.qhw_num_engines = MAX_AE_C2XXX,
+#else
+	/*
+	 * Workaround:
+	 * C2xxx qat has two engines, however it doesn't have arbiter which
+	 * C3xxx qat has.  So, we don't use secondary engine for C2xxx qat.
+	 */
+	.qhw_num_engines = 1,
+#endif
 	.qhw_tx_rx_gap = ETR_TX_RX_GAP_C2XXX,
 	.qhw_tx_rings_mask = ETR_TX_RINGS_MASK_C2XXX,
 	.qhw_msix_ae_vec_gap = MSIX_AE_VEC_GAP_C2XXX,



CVS commit: src/sys/dev/pci/qat

2022-05-24 Thread Kengo NAKAHARA
Module Name:src
Committed By:   knakahara
Date:   Tue May 24 08:35:47 UTC 2022

Modified Files:
src/sys/dev/pci/qat: qat_c2xxx.c

Log Message:
Workaround for Atom C2000 series (Rangeley) qat, ok'ed by hikaru@n.o.

C2000 qat has two engines, however it doesn't have arbiter.
If we enable both engines, qat interrupts twice wrongly (and second
interrupt notice invalid data).  So, we enable only one engine.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/qat/qat_c2xxx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:28:02 UTC 2022

Modified Files:
src/distrib/notes/hp300: upgrade
src/games/phantasia: misc.c
src/games/trek: dcrept.c setwarp.c
src/lib/libc/stdio: vfscanf.c
src/lib/libresolv: dst_api.c
src/sbin/atactl: atactl.8
src/sbin/nvmectl: bignum.c
src/sys/arch/acorn32/stand/boot32: boot32.c
src/sys/arch/arc/arc: platform.c
src/sys/arch/arm/iomd: vidc20config.c
src/sys/arch/atari/atari: atari_init.c disksubr.c
src/sys/arch/hpcsh/dev/hd64461: hd64461video.c
src/sys/arch/mipsco/mipsco: disksubr.c
src/sys/arch/ofppc/ofppc: disksubr.c
src/sys/arch/sh3/sh3: vm_machdep.c
src/sys/arch/x86/x86: fpu.c
src/sys/dev/hdaudio: hdafg.c
src/sys/dev/hpc: files.hpcapm
src/sys/dev/i2c: sgp40.c sht4xreg.h
src/sys/dev/isa: gusreg.h
src/sys/dev/isapnp: files.isapnp
src/sys/dev/microcode/tools: array2bin.c
src/sys/dev/pci: if_ntwoc_pci.c
src/sys/fs/v7fs: v7fs.h
src/sys/kern: subr_pool.c
src/sys/nfs: nfs_vnops.c
src/sys/ufs/ffs: ffs_subr.c
src/tests/rump/rumpkern: t_modlinkset.c
src/usr.sbin/ac: ac.c
src/usr.sbin/mopd/mopcopy: mopcopy.c

Log Message:
fix various typos in comments, docs and log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/notes/hp300/upgrade
cvs rdiff -u -r1.23 -r1.24 src/games/phantasia/misc.c
cvs rdiff -u -r1.10 -r1.11 src/games/trek/dcrept.c
cvs rdiff -u -r1.8 -r1.9 src/games/trek/setwarp.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/stdio/vfscanf.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.31 -r1.32 src/sbin/atactl/atactl.8
cvs rdiff -u -r1.4 -r1.5 src/sbin/nvmectl/bignum.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/acorn32/stand/boot32/boot32.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arc/arc/platform.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/iomd/vidc20config.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/atari/atari/disksubr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mipsco/mipsco/disksubr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/ofppc/ofppc/disksubr.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sh3/sh3/vm_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/hdaudio/hdafg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hpc/files.hpcapm
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/sgp40.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/sht4xreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/isa/gusreg.h
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/isapnp/files.isapnp
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/tools/array2bin.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_ntwoc_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/v7fs/v7fs.h
cvs rdiff -u -r1.282 -r1.283 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.323 -r1.324 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.52 -r1.53 src/sys/ufs/ffs/ffs_subr.c
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpkern/t_modlinkset.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/ac/ac.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/mopcopy/mopcopy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/hp300/upgrade
diff -u src/distrib/notes/hp300/upgrade:1.20 src/distrib/notes/hp300/upgrade:1.21
--- src/distrib/notes/hp300/upgrade:1.20	Thu Nov 21 19:23:18 2019
+++ src/distrib/notes/hp300/upgrade	Tue May 24 06:27:59 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: upgrade,v 1.20 2019/11/21 19:23:18 martin Exp $
+.\"	$NetBSD: upgrade,v 1.21 2022/05/24 06:27:59 andvar Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -59,7 +59,7 @@ Boot your \*M into
 .Sq "single-user mode" :
 .Pp
 Follow the instructions in the section above on
-.Sx Chosing a kernel location
+.Sx Choosing a kernel location
 and type
 .Li -s
 at the prompt.
@@ -96,7 +96,7 @@ might overwrite another partition or the
 Boot the miniroot:
 .Pp
 Follow the instructions in the section above on
-.Sx Chosing a kernel location
+.Sx Choosing a kernel location
 and type
 .Li rd0b:netbsd
 at the prompt.

Index: src/games/phantasia/misc.c
diff -u src/games/phantasia/misc.c:1.23 src/games/phantasia/misc.c:1.24
--- src/games/phantasia/misc.c:1.23	Sun May  2 12:50:46 2021
+++ src/games/phantasia/misc.c	Tue May 24 06:27:59 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.23 2021/05/02 12:50:46 rillig Exp $	*/
+/*	$NetBSD: misc.c,v 1.24 2022/05/24 06:27:59 andvar Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
@@ -463,7 +463,7 @@ allstatslist(void)
 const char   *
 descrtype(struct player *playerp, phbool shortflag)
 {
-	int type;		/* for caluculating result subscript */
+	int type;		

CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:28:02 UTC 2022

Modified Files:
src/distrib/notes/hp300: upgrade
src/games/phantasia: misc.c
src/games/trek: dcrept.c setwarp.c
src/lib/libc/stdio: vfscanf.c
src/lib/libresolv: dst_api.c
src/sbin/atactl: atactl.8
src/sbin/nvmectl: bignum.c
src/sys/arch/acorn32/stand/boot32: boot32.c
src/sys/arch/arc/arc: platform.c
src/sys/arch/arm/iomd: vidc20config.c
src/sys/arch/atari/atari: atari_init.c disksubr.c
src/sys/arch/hpcsh/dev/hd64461: hd64461video.c
src/sys/arch/mipsco/mipsco: disksubr.c
src/sys/arch/ofppc/ofppc: disksubr.c
src/sys/arch/sh3/sh3: vm_machdep.c
src/sys/arch/x86/x86: fpu.c
src/sys/dev/hdaudio: hdafg.c
src/sys/dev/hpc: files.hpcapm
src/sys/dev/i2c: sgp40.c sht4xreg.h
src/sys/dev/isa: gusreg.h
src/sys/dev/isapnp: files.isapnp
src/sys/dev/microcode/tools: array2bin.c
src/sys/dev/pci: if_ntwoc_pci.c
src/sys/fs/v7fs: v7fs.h
src/sys/kern: subr_pool.c
src/sys/nfs: nfs_vnops.c
src/sys/ufs/ffs: ffs_subr.c
src/tests/rump/rumpkern: t_modlinkset.c
src/usr.sbin/ac: ac.c
src/usr.sbin/mopd/mopcopy: mopcopy.c

Log Message:
fix various typos in comments, docs and log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/notes/hp300/upgrade
cvs rdiff -u -r1.23 -r1.24 src/games/phantasia/misc.c
cvs rdiff -u -r1.10 -r1.11 src/games/trek/dcrept.c
cvs rdiff -u -r1.8 -r1.9 src/games/trek/setwarp.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/stdio/vfscanf.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.31 -r1.32 src/sbin/atactl/atactl.8
cvs rdiff -u -r1.4 -r1.5 src/sbin/nvmectl/bignum.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/acorn32/stand/boot32/boot32.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arc/arc/platform.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/iomd/vidc20config.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/atari/atari/disksubr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mipsco/mipsco/disksubr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/ofppc/ofppc/disksubr.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sh3/sh3/vm_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/hdaudio/hdafg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hpc/files.hpcapm
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/sgp40.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/sht4xreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/isa/gusreg.h
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/isapnp/files.isapnp
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/tools/array2bin.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_ntwoc_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/v7fs/v7fs.h
cvs rdiff -u -r1.282 -r1.283 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.323 -r1.324 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.52 -r1.53 src/sys/ufs/ffs/ffs_subr.c
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpkern/t_modlinkset.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/ac/ac.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/mopcopy/mopcopy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:20:05 UTC 2022

Modified Files:
src/sys/compat/netbsd32: netbsd32_module.c
src/sys/kern: sys_module.c

Log Message:
s/build-in/built-in/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/sys_module.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.10 src/sys/compat/netbsd32/netbsd32_module.c:1.11
--- src/sys/compat/netbsd32/netbsd32_module.c:1.10	Fri Mar  1 11:06:56 2019
+++ src/sys/compat/netbsd32/netbsd32_module.c	Tue May 24 06:20:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_module.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_module.c,v 1.11 2022/05/24 06:20:04 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.11 2022/05/24 06:20:04 andvar Exp $");
 
 #include 
 #include 
@@ -101,7 +101,7 @@ modctl32_handle_stat(struct netbsd32_iov
 
 	/*
 	 * Load data into our internal buffers for both active and
-	 * build-in module lists
+	 * built-in module lists
 	 */
 	TAILQ_FOREACH(mod, _list, mod_chain) {
 		mi = mod->mod_info;

Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.29 src/sys/kern/sys_module.c:1.30
--- src/sys/kern/sys_module.c:1.29	Fri Mar  1 11:06:57 2019
+++ src/sys/kern/sys_module.c	Tue May 24 06:20:05 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_module.c,v 1.29 2019/03/01 11:06:57 pgoyette Exp $	*/
+/*	$NetBSD: sys_module.c,v 1.30 2022/05/24 06:20:05 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.29 2019/03/01 11:06:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.30 2022/05/24 06:20:05 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -170,7 +170,7 @@ handle_modctl_stat(struct iovec *iov, vo
 
 	/*
 	 * Load data into our internal buffers for both active and
-	 * build-in module lists
+	 * built-in module lists
 	 */
 	TAILQ_FOREACH(mod, _list, mod_chain) {
 		mi = mod->mod_info;



CVS commit: src/sys

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:20:05 UTC 2022

Modified Files:
src/sys/compat/netbsd32: netbsd32_module.c
src/sys/kern: sys_module.c

Log Message:
s/build-in/built-in/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/sys_module.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:18:34 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grfioctl.h
src/sys/arch/atari/dev: grfioctl.h
src/tests/dev/audio: audiotest.c
src/usr.sbin/sysinst: partitions.h

Log Message:
s/changable/changeable/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amiga/dev/grfioctl.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/atari/dev/grfioctl.h
cvs rdiff -u -r1.20 -r1.21 src/tests/dev/audio/audiotest.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/sysinst/partitions.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-05-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue May 24 06:18:34 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grfioctl.h
src/sys/arch/atari/dev: grfioctl.h
src/tests/dev/audio: audiotest.c
src/usr.sbin/sysinst: partitions.h

Log Message:
s/changable/changeable/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amiga/dev/grfioctl.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/atari/dev/grfioctl.h
cvs rdiff -u -r1.20 -r1.21 src/tests/dev/audio/audiotest.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/sysinst/partitions.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grfioctl.h
diff -u src/sys/arch/amiga/dev/grfioctl.h:1.22 src/sys/arch/amiga/dev/grfioctl.h:1.23
--- src/sys/arch/amiga/dev/grfioctl.h:1.22	Mon Nov  1 21:28:02 2021
+++ src/sys/arch/amiga/dev/grfioctl.h	Tue May 24 06:18:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.22 2021/11/01 21:28:02 andvar Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.23 2022/05/24 06:18:34 andvar Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -62,7 +62,7 @@ struct	grfinfo {
 	int	gd_fbwidth;		/* frame buffer width */
 	int	gd_fbheight;		/* frame buffer height */
 
-	struct grfdyninfo gd_dyn;	/* everything changable by GRFIOCSINFO */
+	struct grfdyninfo gd_dyn;	/* everything changeable by GRFIOCSINFO */
 /* compatibility... */
 #define gd_fbx		gd_dyn.gdi_fbx
 #define gd_fby		gd_dyn.gdi_fby

Index: src/sys/arch/atari/dev/grfioctl.h
diff -u src/sys/arch/atari/dev/grfioctl.h:1.11 src/sys/arch/atari/dev/grfioctl.h:1.12
--- src/sys/arch/atari/dev/grfioctl.h:1.11	Mon Nov  1 21:28:02 2021
+++ src/sys/arch/atari/dev/grfioctl.h	Tue May 24 06:18:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.11 2021/11/01 21:28:02 andvar Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.12 2022/05/24 06:18:34 andvar Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -69,7 +69,7 @@ struct	grfinfo {
 	int	gd_fbwidth;	/* frame buffer width		*/
 	int	gd_fbheight;	/* frame buffer height		*/
 
-	struct grfdyninfo gd_dyn; /* everything changable by GRFIOCSINFO */
+	struct grfdyninfo gd_dyn; /* everything changeable by GRFIOCSINFO */
 /* compatibility... */
 #define gd_fbx		gd_dyn.gdi_fbx
 #define gd_fby		gd_dyn.gdi_fby

Index: src/tests/dev/audio/audiotest.c
diff -u src/tests/dev/audio/audiotest.c:1.20 src/tests/dev/audio/audiotest.c:1.21
--- src/tests/dev/audio/audiotest.c:1.20	Tue May 17 05:05:20 2022
+++ src/tests/dev/audio/audiotest.c	Tue May 24 06:18:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: audiotest.c,v 1.20 2022/05/17 05:05:20 andvar Exp $	*/
+/*	$NetBSD: audiotest.c,v 1.21 2022/05/24 06:18:34 andvar Exp $	*/
 
 /*
  * Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: audiotest.c,v 1.20 2022/05/17 05:05:20 andvar Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.21 2022/05/24 06:18:34 andvar Exp $");
 
 #include 
 #include 
@@ -5083,7 +5083,7 @@ test_AUDIO_SETINFO_params_set(int openmo
 #define f(a,b,c) test_AUDIO_SETINFO_params_set(a, b, c)
 DEF(AUDIO_SETINFO_params_set_RDONLY_0)	{ f(O_RDONLY, 0, 0); }
 DEF(AUDIO_SETINFO_params_set_RDONLY_1)	{ f(O_RDONLY, 0, 1); }
-/* On RDONLY, ai.mode is not changable
+/* On RDONLY, ai.mode is not changeable
  *  AUDIO_SETINFO_params_set_RDONLY_2)	{ f(O_RDONLY, 1, 0); }
  *  AUDIO_SETINFO_params_set_RDONLY_3)	{ f(O_RDONLY, 1, 1); }
  */
@@ -5479,7 +5479,7 @@ test_AUDIO_SETINFO_pause(int openmode, i
 }
 DEF(AUDIO_SETINFO_pause_RDONLY_0) { test_AUDIO_SETINFO_pause(O_RDONLY, 0, 0); }
 DEF(AUDIO_SETINFO_pause_RDONLY_1) { test_AUDIO_SETINFO_pause(O_RDONLY, 0, 1); }
-/* On RDONLY, ai.mode is not changable
+/* On RDONLY, ai.mode is not changeable
  *  AUDIO_SETINFO_pause_RDONLY_2) { test_AUDIO_SETINFO_pause(O_RDONLY, 1, 0); }
  *  AUDIO_SETINFO_pause_RDONLY_3) { test_AUDIO_SETINFO_pause(O_RDONLY, 1, 1); }
  */

Index: src/usr.sbin/sysinst/partitions.h
diff -u src/usr.sbin/sysinst/partitions.h:1.26 src/usr.sbin/sysinst/partitions.h:1.27
--- src/usr.sbin/sysinst/partitions.h:1.26	Sun May 22 11:27:37 2022
+++ src/usr.sbin/sysinst/partitions.h	Tue May 24 06:18:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: partitions.h,v 1.26 2022/05/22 11:27:37 andvar Exp $	*/
+/*	$NetBSD: partitions.h,v 1.27 2022/05/24 06:18:34 andvar Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -303,14 +303,14 @@ struct disk_partitioning_scheme {
 	bool (*format_partition_table_str)(const struct disk_partitions*,
 	part_id, size_t col, char *outstr, size_t outspace);
 
-	/* is the type of this partition changable? */
+	/* is the type of this partition changeable? */
 	bool (*part_type_can_change)(const struct disk_partitions*,
 	part_id);
 
 	/* can we add further partitions? */
 	bool (*can_add_partition)(const struct disk_partitions*);
 
-	/* is the custom attribut changable? */
+	/* is the custom attribute changeable? */
 	bool