CVS commit: src/sys/arch/hp300/stand/uboot

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 07:41:37 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/uboot: Makefile

Log Message:
Enable UFS2 support.

Tested on 425t with HPDisk emulating 7958B using NetBSD 9.3 UFS2 image.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/uboot/Makefile

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/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.9 src/sys/arch/hp300/stand/uboot/Makefile:1.10
--- src/sys/arch/hp300/stand/uboot/Makefile:1.9	Mon Sep 23 13:42:36 2019
+++ src/sys/arch/hp300/stand/uboot/Makefile	Sun Dec 11 07:41:37 2022
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 2019/09/23 13:42:36 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2022/12/11 07:41:37 tsutsui Exp $
 
 PROGAOUT=	uboot
 PROGSOURCE=	uboot.c tgets.c
 NEWVERSWHAT=	"Primary Boot"
 
 CPPFLAGS+=	-DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+CPPFLAGS+=	-DSUPPORT_UFS2
 
 .include "../Makefile.buildboot"
 



CVS commit: src/sys/arch/hp300/stand/uboot

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 07:41:37 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/uboot: Makefile

Log Message:
Enable UFS2 support.

Tested on 425t with HPDisk emulating 7958B using NetBSD 9.3 UFS2 image.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/uboot/Makefile

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



CVS commit: src/sys/arch/hp300/stand/common

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 07:39:30 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: conf.c conf.h devopen.c samachdep.h

Log Message:
Make hp300 bootloaders UFS2 ready.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/conf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/stand/common/conf.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/devopen.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/stand/common/samachdep.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/hp300/stand/common/conf.c
diff -u src/sys/arch/hp300/stand/common/conf.c:1.13 src/sys/arch/hp300/stand/common/conf.c:1.14
--- src/sys/arch/hp300/stand/common/conf.c:1.13	Sun Dec 11 06:27:35 2022
+++ src/sys/arch/hp300/stand/common/conf.c	Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.13 2022/12/11 06:27:35 tsutsui Exp $	*/
+/*	$NetBSD: conf.c,v 1.14 2022/12/11 07:39:30 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -137,9 +137,14 @@ int	npunit = __arraycount(punitsw);
 /*
  * Filesystem configuration
  */
-struct fs_ops file_system_rawfs[] = { FS_OPS(rawfs) };
-struct fs_ops file_system_ufs[] = { FS_OPS(ufs) };
-struct fs_ops file_system_nfs[] = { FS_OPS(nfs) };
+struct fs_ops file_system_rawfs[1] = { FS_OPS(rawfs) };
+struct fs_ops file_system_ufs[NFSYS_UFS] = {
+	FS_OPS(ffsv1),
+#ifdef SUPPORT_UFS2
+	FS_OPS(ffsv2),
+#endif
+};
+struct fs_ops file_system_nfs[1] = { FS_OPS(nfs) };
 
-struct fs_ops file_system[1];
-int	nfsys = 1;		/* we always know which one we want */
+struct fs_ops file_system[NFSYS_UFS];
+int	nfsys = 1;		/* default value; should be overrieded */

Index: src/sys/arch/hp300/stand/common/conf.h
diff -u src/sys/arch/hp300/stand/common/conf.h:1.2 src/sys/arch/hp300/stand/common/conf.h:1.3
--- src/sys/arch/hp300/stand/common/conf.h:1.2	Sun Dec 11 12:17:19 2005
+++ src/sys/arch/hp300/stand/common/conf.h	Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.h,v 1.2 2005/12/11 12:17:19 christos Exp $	*/
+/*	$NetBSD: conf.h,v 1.3 2022/12/11 07:39:30 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -52,7 +52,25 @@ int sdstrategy(void *, int, daddr_t, siz
 int sdopen(struct open_file *, ...);
 int sdclose(struct open_file *);
 #endif
+#ifdef SUPPORT_UFS2
+#define NFSYS_UFS	2
+#else
+#define NFSYS_UFS	1
+#endif
 
 #ifdef SUPPORT_ETHERNET
 extern struct netif_driver le_driver;
 #endif
+
+/*
+ * Switch we use to set punit in devopen.
+ */
+struct punitsw {
+	int	(*p_punit)(int, int, int *);
+};
+extern	struct punitsw punitsw[];
+extern	int npunit;
+
+extern	struct fs_ops file_system_rawfs[1];
+extern	struct fs_ops file_system_ufs[NFSYS_UFS];
+extern	struct fs_ops file_system_nfs[1];

Index: src/sys/arch/hp300/stand/common/devopen.c
diff -u src/sys/arch/hp300/stand/common/devopen.c:1.12 src/sys/arch/hp300/stand/common/devopen.c:1.13
--- src/sys/arch/hp300/stand/common/devopen.c:1.12	Thu Mar  8 03:12:01 2018
+++ src/sys/arch/hp300/stand/common/devopen.c	Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.12 2018/03/08 03:12:01 mrg Exp $	*/
+/*	$NetBSD: devopen.c,v 1.13 2022/12/11 07:39:30 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -63,6 +63,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 u_int opendev;
@@ -96,18 +97,21 @@ devlookup(const char *d, int len)
 			switch (i) {
 			case 0:	/* ct */
 memcpy(file_system, file_system_rawfs,
-sizeof(struct fs_ops));
+sizeof(file_system_rawfs));
+nfsys = 1;
 break;
 
 			case 2:	/* rd */
 			case 4:	/* sd */
 memcpy(file_system, file_system_ufs,
-sizeof(struct fs_ops));
+sizeof(file_system_ufs));
+nfsys = NFSYS_UFS;
 break;
 
 			case 6:	/* le */
 memcpy(file_system, file_system_nfs,
-sizeof(struct fs_ops));
+sizeof(file_system_nfs));
+nfsys = 1;
 break;
 
 			default:
@@ -250,16 +254,22 @@ devopen(struct open_file *f, const char 
 	 */
 	switch (dev) {
 	case 0:		/* ct */
-		memcpy(file_system, file_system_rawfs, sizeof(struct fs_ops));
+		memcpy(file_system, file_system_rawfs,
+		sizeof(file_system_rawfs));
+		nfsys = 1;
 		break;
 
 	case 2:		/* rd */
 	case 4:		/* sd */
-		memcpy(file_system, file_system_ufs, sizeof(struct fs_ops));
+		memcpy(file_system, file_system_ufs,
+		sizeof(file_system_ufs));
+		nfsys = NFSYS_UFS;
 		break; 
 
 	case 6:		/* le */
-		memcpy(file_system, file_system_nfs, sizeof(struct fs_ops));
+		memcpy(file_system, file_system_nfs,
+		sizeof(file_system_nfs));
+		nfsys = 1;
 		break;
 
 	default:

Index: src/sys/arch/hp300/stand/common/samachdep.h
diff -u src/sys/arch/hp300/stand/common/samachdep.h:1.21 src/sys/arch/hp300/stand/common/samachdep.h:1.22
--- src/sys/arch/hp300/stand/common/samachdep.h:1.21	Sun Dec 11 06:20:07 2022
+++ 

CVS commit: src/sys/arch/hp300/stand/common

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 07:39:30 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: conf.c conf.h devopen.c samachdep.h

Log Message:
Make hp300 bootloaders UFS2 ready.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/conf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/stand/common/conf.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/devopen.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/stand/common/samachdep.h

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



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:14:05 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: backward

Log Message:
Revert last.   remains in northamerica as a zone, does not need a link here
(this one came from the gtz fork, rather than some local botch...)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/tz/dist/backward

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



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:14:05 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: backward

Log Message:
Revert last.   remains in northamerica as a zone, does not need a link here
(this one came from the gtz fork, rather than some local botch...)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/tz/dist/backward

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

Modified files:

Index: src/external/public-domain/tz/dist/backward
diff -u src/external/public-domain/tz/dist/backward:1.8 src/external/public-domain/tz/dist/backward:1.9
--- src/external/public-domain/tz/dist/backward:1.8	Sun Dec 11 07:08:36 2022
+++ src/external/public-domain/tz/dist/backward	Sun Dec 11 07:14:05 2022
@@ -160,7 +160,6 @@ Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
 Link	America/Toronto		America/Montreal
 Link	America/Toronto		America/Nipigon
-Link	America/Iqaluit		America/Pangnirtung
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Winnipeg	America/Rainy_River
 Link	America/Argentina/Cordoba	America/Rosario



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:08:37 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: asia backward version

Log Message:
Merge more changes that should have been made, but weren't.   One day
I will work out why this doesn't happen automatically.Ugh.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/tz/dist/backward

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

Modified files:

Index: src/external/public-domain/tz/dist/asia
diff -u src/external/public-domain/tz/dist/asia:1.6 src/external/public-domain/tz/dist/asia:1.7
--- src/external/public-domain/tz/dist/asia:1.6	Sun Dec 11 06:18:00 2022
+++ src/external/public-domain/tz/dist/asia	Sun Dec 11 07:08:36 2022
@@ -2770,7 +2770,7 @@ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	190
 			7:20	-	+0720	1941 Sep  1
 			7:30	-	+0730	1942 Feb 16
 			9:00	-	+09	1945 Sep 12
-			7:30	-	+0730	1982 Jan  1
+			7:30	-	+0730	1981 Dec 31 16:00u
 			8:00	-	+08
 
 #
@@ -3632,7 +3632,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 J
 			7:20	-	+0720	1941 Sep  1
 			7:30	-	+0730	1942 Feb 16
 			9:00	-	+09	1945 Sep 12
-			7:30	-	+0730	1982 Jan  1
+			7:30	-	+0730	1981 Dec 31 16:00u
 			8:00	-	+08
 
 # Spratly Is
Index: src/external/public-domain/tz/dist/version
diff -u src/external/public-domain/tz/dist/version:1.6 src/external/public-domain/tz/dist/version:1.7
--- src/external/public-domain/tz/dist/version:1.6	Sun Dec 11 06:18:00 2022
+++ src/external/public-domain/tz/dist/version	Sun Dec 11 07:08:36 2022
@@ -1 +1 @@
-2022fgtz
+2022ggtz

Index: src/external/public-domain/tz/dist/backward
diff -u src/external/public-domain/tz/dist/backward:1.7 src/external/public-domain/tz/dist/backward:1.8
--- src/external/public-domain/tz/dist/backward:1.7	Sun Dec 11 06:18:00 2022
+++ src/external/public-domain/tz/dist/backward	Sun Dec 11 07:08:36 2022
@@ -160,6 +160,7 @@ Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
 Link	America/Toronto		America/Montreal
 Link	America/Toronto		America/Nipigon
+Link	America/Iqaluit		America/Pangnirtung
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Winnipeg	America/Rainy_River
 Link	America/Argentina/Cordoba	America/Rosario



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:08:37 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: asia backward version

Log Message:
Merge more changes that should have been made, but weren't.   One day
I will work out why this doesn't happen automatically.Ugh.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/tz/dist/backward

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



CVS commit: src/doc

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:01:56 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note tzdata2022g


To generate a diff of this commit:
cvs rdiff -u -r1.1903 -r1.1904 src/doc/3RDPARTY
cvs rdiff -u -r1.2937 -r1.2938 src/doc/CHANGES

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



CVS commit: src/doc

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 07:01:56 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note tzdata2022g


To generate a diff of this commit:
cvs rdiff -u -r1.1903 -r1.1904 src/doc/3RDPARTY
cvs rdiff -u -r1.2937 -r1.2938 src/doc/CHANGES

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.1903 src/doc/3RDPARTY:1.1904
--- src/doc/3RDPARTY:1.1903	Sat Dec 10 17:42:36 2022
+++ src/doc/3RDPARTY	Sun Dec 11 07:01:55 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1903 2022/12/10 17:42:36 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1904 2022/12/11 07:01:55 kre Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1424,8 +1424,8 @@ Location:	external/bsd/tradcpp
 Notes:
 
 Package:	tz
-Version:	tzcode2022f / tzdata2022fgtz
-Current Vers:	tzcode2022f / tzdata2022f
+Version:	tzcode2022f / tzdata2022ggtz
+Current Vers:	tzcode2022g / tzdata2022g
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2937 src/doc/CHANGES:1.2938
--- src/doc/CHANGES:1.2937	Sat Dec 10 17:42:36 2022
+++ src/doc/CHANGES	Sun Dec 11 07:01:56 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2937 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2938 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -755,3 +755,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	tprof: Add AMD family 19h (zen3 and zen4) support to tprof(4) and
 		tprof(8). [msaitoh 20221208]
 	acpi(4): Updated ACPICA to 20221020. [christos 20221210]
+	tzdata: updated to 2022g (using the 2022ggtz fork) [kre 20221211]



CVS commit: src/distrib/sets/lists/base

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:59:36 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
tzdata update to 2022g
Added zoneinfo files:
America/Ciudad_Juarez


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/base/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1313 src/distrib/sets/lists/base/mi:1.1314
--- src/distrib/sets/lists/base/mi:1.1313	Sun Dec 11 06:50:31 2022
+++ src/distrib/sets/lists/base/mi	Sun Dec 11 06:59:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1313 2022/12/11 06:50:31 kre Exp $
+# $NetBSD: mi,v 1.1314 2022/12/11 06:59:36 kre Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -5211,6 +5211,7 @@
 ./usr/share/zoneinfo/America/Chicago		base-sys-share		share
 ./usr/share/zoneinfo/America/Chihuahua		base-sys-share		share
 ./usr/share/zoneinfo/America/Chile		base-obsolete		obsolete
+./usr/share/zoneinfo/America/Ciudad_Juarez	base-sys-share		share
 ./usr/share/zoneinfo/America/Coral_Harbour	base-sys-share		share
 ./usr/share/zoneinfo/America/Cordoba		base-sys-share		share
 ./usr/share/zoneinfo/America/Costa_Rica		base-sys-share		share



CVS commit: src/distrib/sets/lists/base

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:59:36 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
tzdata update to 2022g
Added zoneinfo files:
America/Ciudad_Juarez


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/base/mi

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



CVS commit: src/distrib/sets/lists/base

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:50:31 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
Sort (NFCI)


To generate a diff of this commit:
cvs rdiff -u -r1.1312 -r1.1313 src/distrib/sets/lists/base/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1312 src/distrib/sets/lists/base/mi:1.1313
--- src/distrib/sets/lists/base/mi:1.1312	Sat Aug 27 21:53:38 2022
+++ src/distrib/sets/lists/base/mi	Sun Dec 11 06:50:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1312 2022/08/27 21:53:38 dholland Exp $
+# $NetBSD: mi,v 1.1313 2022/12/11 06:50:31 kre Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -348,9 +348,9 @@
 ./sbin/atactl	base-sysutil-root
 ./sbin/badsect	base-sysutil-root
 ./sbin/bioctl	base-sysutil-root
-./sbin/blkdiscardbase-sysutil-root
 ./sbin/blacklistctlbase-obsolete		obsolete
 ./sbin/blacklistdbase-obsolete		obsolete
+./sbin/blkdiscardbase-sysutil-root
 ./sbin/blocklistctlbase-sysutil-root
 ./sbin/blocklistdbase-sysutil-root
 ./sbin/brconfig	base-netutil-root
@@ -792,8 +792,8 @@
 ./usr/bin/realpathbase-util-bin
 ./usr/bin/renicebase-util-bin
 ./usr/bin/reset	base-util-bin
-./usr/bin/rev	base-util-bin
 ./usr/bin/resizebase-util-bin
+./usr/bin/rev	base-util-bin
 ./usr/bin/revokebase-util-bin
 ./usr/bin/rfcomm_sppdbase-util-bin
 ./usr/bin/rlog	base-rcs-bin
@@ -962,13 +962,14 @@
 ./usr/include/altqbase-c-usr
 ./usr/include/arpabase-c-usr
 ./usr/include/c++base-cxx-usr
-./usr/include/c++/experimental			base-cxx-usr
-./usr/include/c++/extbase-cxx-usr
 ./usr/include/c++/__iterator			base-cxx-usr
 ./usr/include/c++/__memory			base-cxx-usr
 ./usr/include/c++/__ranges			base-cxx-usr
 ./usr/include/c++/__utility			base-cxx-usr
+./usr/include/c++/experimental			base-cxx-usr
+./usr/include/c++/extbase-cxx-usr
 ./usr/include/cdkbase-obsolete		obsolete
+./usr/include/clang-13.0			base-c-usr
 ./usr/include/clang-3.4base-obsolete		obsolete
 ./usr/include/clang-3.5base-obsolete		obsolete
 ./usr/include/clang-3.6base-obsolete		obsolete
@@ -977,7 +978,6 @@
 ./usr/include/clang-5.0base-obsolete		obsolete
 ./usr/include/clang-7.0base-obsolete		obsolete
 ./usr/include/clang-9.0base-obsolete		obsolete
-./usr/include/clang-13.0			base-c-usr
 ./usr/include/compatbase-obsolete		obsolete
 ./usr/include/cryptobase-c-usr
 ./usr/include/devbase-c-usr
@@ -1082,6 +1082,8 @@
 ./usr/include/g++/tr1base-cxx-usr
 ./usr/include/g++/tr1_impl			base-cxx-usr
 ./usr/include/g++/tr2base-cxx-usr
+./usr/include/gcc-10base-c-usr
+./usr/include/gcc-10/sanitizer			base-c-usr
 ./usr/include/gcc-4.1base-obsolete		obsolete
 ./usr/include/gcc-4.5base-obsolete		obsolete
 ./usr/include/gcc-4.8base-obsolete		obsolete
@@ -1095,8 +1097,6 @@
 ./usr/include/gcc-8/sanitizer			base-obsolete		obsolete
 ./usr/include/gcc-9base-c-usr
 ./usr/include/gcc-9/sanitizer			base-c-usr
-./usr/include/gcc-10base-c-usr
-./usr/include/gcc-10/sanitizer			base-c-usr
 ./usr/include/gssapibase-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
 ./usr/include/isofsbase-c-usr
@@ -1173,6 +1173,13 @@
 ./usr/include/vmbase-obsolete		obsolete
 ./usr/lib	base-sys-usr		compatdir
 ./usr/lib/clang	base-sys-usr
+./usr/lib/clang/13.0.0base-sys-usr
+./usr/lib/clang/13.0.0/include			base-sys-usr
+./usr/lib/clang/13.0.0/include/sanitizer	base-sys-usr
+./usr/lib/clang/13.0.0/include/xray		base-sys-usr
+./usr/lib/clang/13.0.0/lib			base-sys-usr
+./usr/lib/clang/13.0.0/lib/netbsd		base-sys-usr
+./usr/lib/clang/13.0.0/share			base-sys-usr
 ./usr/lib/clang/7.0.0base-obsolete	obsolete
 ./usr/lib/clang/7.0.0/include			base-obsolete	obsolete
 ./usr/lib/clang/7.0.0/include/sanitizer		base-obsolete	obsolete
@@ -1187,13 +1194,6 @@
 ./usr/lib/clang/9.0.0/lib			base-obsolete	obsolete
 ./usr/lib/clang/9.0.0/lib/netbsd		base-obsolete	obsolete
 ./usr/lib/clang/9.0.0/share			base-obsolete	obsolete
-./usr/lib/clang/13.0.0base-sys-usr
-./usr/lib/clang/13.0.0/include			base-sys-usr
-./usr/lib/clang/13.0.0/include/sanitizer	base-sys-usr
-./usr/lib/clang/13.0.0/include/xray		base-sys-usr
-./usr/lib/clang/13.0.0/lib			base-sys-usr
-./usr/lib/clang/13.0.0/lib/netbsd		base-sys-usr
-./usr/lib/clang/13.0.0/share			base-sys-usr
 ./usr/lib/dtracebase-sys-usr		dtrace
 ./usr/lib/dtrace/errno.d			base-sys-usr		dtrace
 ./usr/lib/dtrace/psinfo.d			base-sys-usr		dtrace
@@ -5062,14 +5062,6 @@
 ./usr/share/wscons/fonts/spleen-5x8.fnt		base-util-share		share
 ./usr/share/wscons/fonts/spleen-6x12.fnt	base-util-share		share
 ./usr/share/wscons/fonts/spleen-8x16.fnt	base-util-share		share
-./usr/share/wscons/fonts/ter-i12n.wsf		

CVS commit: src/distrib/sets/lists/base

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:50:31 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
Sort (NFCI)


To generate a diff of this commit:
cvs rdiff -u -r1.1312 -r1.1313 src/distrib/sets/lists/base/mi

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



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:47:36 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: TZDATA_VERSION

Log Message:
Merge tzdata2022g


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/public-domain/tz/dist/TZDATA_VERSION

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

Modified files:

Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.31 src/external/public-domain/tz/dist/TZDATA_VERSION:1.32
--- src/external/public-domain/tz/dist/TZDATA_VERSION:1.31	Sun Oct 30 01:03:46 2022
+++ src/external/public-domain/tz/dist/TZDATA_VERSION	Sun Dec 11 06:47:36 2022
@@ -1 +1 @@
-tzdata-2022f
+tzdata-2022ggtz



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:47:36 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: TZDATA_VERSION

Log Message:
Merge tzdata2022g


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/public-domain/tz/dist/TZDATA_VERSION

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



CVS import: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:47:02 UTC 2022

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23160

Log Message:
Import tzdata2022g from 
https://github.com/JodaOrg/global-tz/releases/download/2022ggtz/tzdata2022ggtz.tar.gz

Summary of changes in tzdata2022g (2022-11-29 08:58:31 -0800):
  * In the Mexican state of Chihuahua, the border strip near the US
will change to agree with nearby US locations on 2022-11-30.
  * Much of Greenland, represented by America/Nuuk, stops observing
winter time after March 2023, so its daylight saving time becomes
standard time.
  * Changes for pre-1996 northern Canada (thanks to Chris Walton):
  * Merge America/Iqaluit and America/Pangnirtung into the former,
with a backward compatibility link for the latter name.
  * Cambridge Bay, Inuvik, Iqaluit, Rankin Inlet, Resolute and
Yellowknife did not observe DST in 1965, and did observe DST
from 1972 through 1979.
  * Whitehorse moved from -09 to -08 on 1966-02-27, not 1967-05-28.
  * Colombia's 1993 fallback was 02-06 24:00, not 04-04 00:00.
  * Singapore's 1981-12-31 change was at 16:00 UTC (23:30 local time),
not 24:00 local time.

Zones added by this update:
America/Ciudad_Juarez

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2022GGTZ

U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/SECURITY
U src/external/public-domain/tz/dist/theory.html
C src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
C src/external/public-domain/tz/dist/asia
U src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/factory
C src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
U src/external/public-domain/tz/dist/leap-seconds.list
U src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jTZDATA:yesterday -jTZDATA 
src/external/public-domain/tz/dist



CVS import: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:47:02 UTC 2022

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23160

Log Message:
Import tzdata2022g from 
https://github.com/JodaOrg/global-tz/releases/download/2022ggtz/tzdata2022ggtz.tar.gz

Summary of changes in tzdata2022g (2022-11-29 08:58:31 -0800):
  * In the Mexican state of Chihuahua, the border strip near the US
will change to agree with nearby US locations on 2022-11-30.
  * Much of Greenland, represented by America/Nuuk, stops observing
winter time after March 2023, so its daylight saving time becomes
standard time.
  * Changes for pre-1996 northern Canada (thanks to Chris Walton):
  * Merge America/Iqaluit and America/Pangnirtung into the former,
with a backward compatibility link for the latter name.
  * Cambridge Bay, Inuvik, Iqaluit, Rankin Inlet, Resolute and
Yellowknife did not observe DST in 1965, and did observe DST
from 1972 through 1979.
  * Whitehorse moved from -09 to -08 on 1966-02-27, not 1967-05-28.
  * Colombia's 1993 fallback was 02-06 24:00, not 04-04 00:00.
  * Singapore's 1981-12-31 change was at 16:00 UTC (23:30 local time),
not 24:00 local time.

Zones added by this update:
America/Ciudad_Juarez

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2022GGTZ

U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/SECURITY
U src/external/public-domain/tz/dist/theory.html
C src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
C src/external/public-domain/tz/dist/asia
U src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/factory
C src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
U src/external/public-domain/tz/dist/leap-seconds.list
U src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jTZDATA:yesterday -jTZDATA 
src/external/public-domain/tz/dist



CVS commit: src/sys/arch/hp300/stand/common

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 06:27:35 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: conf.c

Log Message:
Remove a #if 0'ed out unused function.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/conf.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/hp300/stand/common/conf.c
diff -u src/sys/arch/hp300/stand/common/conf.c:1.12 src/sys/arch/hp300/stand/common/conf.c:1.13
--- src/sys/arch/hp300/stand/common/conf.c:1.12	Sun Dec 23 03:11:32 2007
+++ src/sys/arch/hp300/stand/common/conf.c	Sun Dec 11 06:27:35 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.12 2007/12/23 03:11:32 tsutsui Exp $	*/
+/*	$NetBSD: conf.c,v 1.13 2022/12/11 06:27:35 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -143,21 +143,3 @@ struct fs_ops file_system_nfs[] = { FS_O
 
 struct fs_ops file_system[1];
 int	nfsys = 1;		/* we always know which one we want */
-
-#if 0
-/*
- * Inititalize controllers
- *
- * XXX this should be a table
- */
-void ctlrinit(void)
-{
-#ifdef SUPPORT_ETHERNET
-	leinit();
-#endif
-#if defined(SUPPORT_DISK) || defined(SUPPORT_TAPE)
-	hpibinit();
-	scsiinit();
-#endif
-}
-#endif



CVS commit: src/sys/arch/hp300/stand/common

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 06:27:35 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: conf.c

Log Message:
Remove a #if 0'ed out unused function.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/conf.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/hp300/stand

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 06:20:08 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: samachdep.h
src/sys/arch/hp300/stand/inst: inst.c
src/sys/arch/hp300/stand/uboot: uboot.c

Log Message:
Cleanup extern declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp300/stand/common/samachdep.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hp300/stand/inst/inst.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp300/stand/uboot/uboot.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/hp300/stand

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 06:20:08 UTC 2022

Modified Files:
src/sys/arch/hp300/stand/common: samachdep.h
src/sys/arch/hp300/stand/inst: inst.c
src/sys/arch/hp300/stand/uboot: uboot.c

Log Message:
Cleanup extern declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp300/stand/common/samachdep.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hp300/stand/inst/inst.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp300/stand/uboot/uboot.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/hp300/stand/common/samachdep.h
diff -u src/sys/arch/hp300/stand/common/samachdep.h:1.20 src/sys/arch/hp300/stand/common/samachdep.h:1.21
--- src/sys/arch/hp300/stand/common/samachdep.h:1.20	Sat Jun 11 06:22:11 2016
+++ src/sys/arch/hp300/stand/common/samachdep.h	Sun Dec 11 06:20:07 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: samachdep.h,v 1.20 2016/06/11 06:22:11 dholland Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.21 2022/12/11 06:20:07 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -68,6 +68,7 @@ int sctoaddr(int);
 
 /* cons.c */
 extern	int cons_scode;
+extern	int noconsole;
 void cninit(void);
 int cngetc(void);
 int cnputc(int);
@@ -85,6 +86,9 @@ void romputchar(int);
 void transfer(char *, int, int, int, char *, char *);
 int trap(struct trapframe *);
 
+/* netio.c */
+extern	int netio_ask;
+
 /* prf.c */
 int tgetchar(void);
 
@@ -92,6 +96,7 @@ int tgetchar(void);
 extern	u_int bootdev;
 extern	int machineid, mmuid;
 extern	int howto;
+extern	char *lowram;
 int badaddr(void *);
 void call_req_reboot(void);
 void romout(int, char *);

Index: src/sys/arch/hp300/stand/inst/inst.c
diff -u src/sys/arch/hp300/stand/inst/inst.c:1.23 src/sys/arch/hp300/stand/inst/inst.c:1.24
--- src/sys/arch/hp300/stand/inst/inst.c:1.23	Tue Sep  4 15:08:30 2018
+++ src/sys/arch/hp300/stand/inst/inst.c	Sun Dec 11 06:20:07 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: inst.c,v 1.23 2018/09/04 15:08:30 riastradh Exp $	*/
+/*	$NetBSD: inst.c,v 1.24 2022/12/11 06:20:07 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,11 +78,6 @@
 
 char line[100];
 
-extern	u_int opendev;
-extern	char *lowram;
-extern	int noconsole;
-extern	int netio_ask;
-
 char	*kernel_name = "/netbsd";
 
 void	main(void);

Index: src/sys/arch/hp300/stand/uboot/uboot.c
diff -u src/sys/arch/hp300/stand/uboot/uboot.c:1.17 src/sys/arch/hp300/stand/uboot/uboot.c:1.18
--- src/sys/arch/hp300/stand/uboot/uboot.c:1.17	Sat Jun 11 06:22:11 2016
+++ src/sys/arch/hp300/stand/uboot/uboot.c	Sun Dec 11 06:20:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: uboot.c,v 1.17 2016/06/11 06:22:11 dholland Exp $	*/
+/*	$NetBSD: uboot.c,v 1.18 2022/12/11 06:20:08 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -47,10 +47,6 @@
 
 char line[100];
 
-extern	u_int opendev;
-extern	char *lowram;
-extern	int noconsole;
-
 /*
  * XXX UFS accepts a /, NFS doesn't.
  */



CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:18:00 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: asia australasia backward version

Log Message:
Merge changes that should have been merged in earlier updates, but
got missed.   This is in preparation for an updata to tzdata2022g
which is coming soon (still from the gtz fork).

There is a (small) chance this update might break the build, that will
be fixed (if it happens) when 2022g is merged (which should not be
very far into the future).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/australasia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/backward

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

Modified files:

Index: src/external/public-domain/tz/dist/asia
diff -u src/external/public-domain/tz/dist/asia:1.5 src/external/public-domain/tz/dist/asia:1.6
--- src/external/public-domain/tz/dist/asia:1.5	Wed Aug 17 12:19:41 2022
+++ src/external/public-domain/tz/dist/asia	Sun Dec 11 06:18:00 2022
@@ -264,7 +264,7 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar 
 			7:30	-	+0730	1933
 			8:00	-	+08
 
-# Burma / Myanmar
+# Myanmar (Burma)
 
 # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
 
@@ -290,7 +290,6 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 
 			9:00	-	+09	1945 Sep  2
 			7:00	-	+07
 
-
 # China
 
 # From Phake Nick (2020-04-15):
@@ -677,10 +676,10 @@ Zone	Asia/Shanghai	8:05:43	-	LMT	1901
 			8:00	PRC	C%sT
 # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
 # / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
+# Vostok base in Antarctica matches this since 1970.
 Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 			6:00	-	+06
 
-
 # Hong Kong
 
 # Milne gives 7:36:41.7.
@@ -1183,10 +1182,6 @@ Zone	Asia/Famagusta	2:15:48	-	LMT	1921 N
 			3:00	-	+03	2017 Oct 29 1:00u
 			2:00	EUAsia	EE%sT
 
-# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
-# However, for various reasons many users expect to find it under Europe.
-Link	Asia/Nicosia	Europe/Nicosia
-
 # Georgia
 # From Paul Eggert (1994-11-19):
 # Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
@@ -1516,8 +1511,8 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 No
 # onwards (which was during the Islamic Republic).
 
 # From Francis Santoni (2022-06-01):
-# for Iran and 1977 the effective change is only 20 october
-# (UIT No. 143 17.XI.1977) and not 23 september (UIT No. 141 13.IX.1977).
+# for Iran and 1977 the effective change is only 20 October
+# (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977).
 # UIT is the Operational Bulletin of International Telecommunication Union.
 
 # From Roozbeh Pournader (2003-03-15):
@@ -2242,6 +2237,17 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 3
 # From the Arabic version, it seems to say it would be at midnight
 # (assume 24:00) on the last Thursday in February, starting from 2022.
 
+# From Issam Al-Zuwairi (2022-10-05):
+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
+# that daylight saving time (DST) will be throughout the year
+#
+# From Brian Inglis (2022-10-06):
+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567=en=en_news
+#
+# From Paul Eggert (2022-10-05):
+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
+# (non-DST) at the point where DST would otherwise have ended.
+
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
 Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
@@ -2273,11 +2279,12 @@ Rule	Jordan	2005	only	-	Sep	lastFri	0:00
 Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
 Rule	Jordan	2013	only	-	Dec	20	0:00	0	-
 Rule	Jordan	2014	2021	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2014	max	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2022	max	-	Feb	lastThu	24:00	1:00	S
+Rule	Jordan	2014	2022	-	Oct	lastFri	0:00s	0	-
+Rule	Jordan	2022	only	-	Feb	lastThu	24:00	1:00	S
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
+			2:00	Jordan	EE%sT	2022 Oct 28 0:00s
+			3:00	-	+03
 
 
 # Kazakhstan
@@ -2703,8 +2710,6 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 A
 			8:30	-	KST	2018 May  4 23:30
 			9:00	-	KST
 
-###
-
 # Kuwait
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kuwait	3:11:56 -	LMT	1950
@@ -2721,7 +2726,6 @@ Zone	Asia/Vientiane	6:50:24 -	LMT	1906 J
 			8:00	-	+08	1955 Apr 15
 			7:00	-	+07
 
-
 # Lebanon
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	S
@@ -2752,7 +2756,7 @@ Rule	Lebanon	1999	max	-	Oct	lastSun	0:00
 Zone	Asia/Beirut	2:22:00 -	LMT	1880
 			2:00	Lebanon	EE%sT
 
-# Malaysia
+# Malaysia (eastern)
 # Rule	NAME	FROM	

CVS commit: src/external/public-domain/tz/dist

2022-12-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 11 06:18:00 UTC 2022

Modified Files:
src/external/public-domain/tz/dist: asia australasia backward version

Log Message:
Merge changes that should have been merged in earlier updates, but
got missed.   This is in preparation for an updata to tzdata2022g
which is coming soon (still from the gtz fork).

There is a (small) chance this update might break the build, that will
be fixed (if it happens) when 2022g is merged (which should not be
very far into the future).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/australasia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/backward

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



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

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 04:20:52 UTC 2022

Modified Files:
src/sys/arch/i386/conf: GENERIC

Log Message:
Enable options DISKLABEL_EI by default as amd64.

No particular comment no port-i386@:
 https://mail-index.netbsd.org/port-i386/2022/12/02/msg004063.html


To generate a diff of this commit:
cvs rdiff -u -r1.1242 -r1.1243 src/sys/arch/i386/conf/GENERIC

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



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

2022-12-10 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Dec 11 04:20:52 UTC 2022

Modified Files:
src/sys/arch/i386/conf: GENERIC

Log Message:
Enable options DISKLABEL_EI by default as amd64.

No particular comment no port-i386@:
 https://mail-index.netbsd.org/port-i386/2022/12/02/msg004063.html


To generate a diff of this commit:
cvs rdiff -u -r1.1242 -r1.1243 src/sys/arch/i386/conf/GENERIC

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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1242 src/sys/arch/i386/conf/GENERIC:1.1243
--- src/sys/arch/i386/conf/GENERIC:1.1242	Thu Sep 29 10:10:07 2022
+++ src/sys/arch/i386/conf/GENERIC	Sun Dec 11 04:20:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1242 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1243 2022/12/11 04:20:52 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1242 $"
+#ident		"GENERIC-$Revision: 1.1243 $"
 
 maxusers	64		# estimated number of users
 
@@ -166,7 +166,7 @@ options 	WAPBL		# File system journaling
 options 	LFS_DIRHASH	# LFS version of UFS_DIRHASH - experimental
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
 # immutable) behave as system flags.
-#options 	DISKLABEL_EI	# disklabel Endian Independent support
+options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Network File System server
 #options 	V7FS_EI		# V7FS Endian Independent support
 



CVS commit: src/sys/dev/tprof

2022-12-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Dec 11 01:36:49 UTC 2022

Modified Files:
src/sys/dev/tprof: tprof.c

Log Message:
make sure error is initialized before we return it.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/tprof/tprof.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/tprof/tprof.c
diff -u src/sys/dev/tprof/tprof.c:1.19 src/sys/dev/tprof/tprof.c:1.20
--- src/sys/dev/tprof/tprof.c:1.19	Thu Dec  1 00:32:52 2022
+++ src/sys/dev/tprof/tprof.c	Sun Dec 11 01:36:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: tprof.c,v 1.19 2022/12/01 00:32:52 ryo Exp $	*/
+/*	$NetBSD: tprof.c,v 1.20 2022/12/11 01:36:49 chs Exp $	*/
 
 /*-
  * Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.19 2022/12/01 00:32:52 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.20 2022/12/11 01:36:49 chs Exp $");
 
 #include 
 #include 
@@ -404,6 +404,8 @@ tprof_start(tprof_countermask_t runmask)
 			workqueue_enqueue(tprof_wq, >c_work, ci);
 		}
 	}
+	error = 0;
+
 done:
 	return error;
 }



CVS commit: src/sys/dev/tprof

2022-12-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Dec 11 01:36:49 UTC 2022

Modified Files:
src/sys/dev/tprof: tprof.c

Log Message:
make sure error is initialized before we return it.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/tprof/tprof.c

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



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Reinoud Zandijk
Module Name:src
Committed By:   reinoud
Date:   Sat Dec 10 20:58:37 UTC 2022

Modified Files:
src/usr.sbin/sysinst: disks.c

Log Message:
Update list with file systems who do have fsck adding udf since there is now a
fsck_udf.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.sbin/sysinst/disks.c

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

Modified files:

Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.93 src/usr.sbin/sysinst/disks.c:1.94
--- src/usr.sbin/sysinst/disks.c:1.93	Sat Dec 10 16:52:02 2022
+++ src/usr.sbin/sysinst/disks.c	Sat Dec 10 20:58:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.93 2022/12/10 16:52:02 martin Exp $ */
+/*	$NetBSD: disks.c,v 1.94 2022/12/10 20:58:37 reinoud Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -88,12 +88,12 @@ static const char name_prefix[] = NAME_P
 
 /* things we could have as /sbin/newfs_* and /sbin/fsck_* */
 static const char *extern_fs_with_chk[] = {
-	"ext2fs", "lfs", "msdos", "v7fs"
+	"ext2fs", "lfs", "msdos", "udf", "v7fs"
 };
 
 /* things we could have as /sbin/newfs_* but not /sbin/fsck_* */
 static const char *extern_fs_newfs_only[] = {
-	"sysvbfs", "udf"
+	"sysvbfs"
 };
 
 /* Local prototypes */



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Reinoud Zandijk
Module Name:src
Committed By:   reinoud
Date:   Sat Dec 10 20:58:37 UTC 2022

Modified Files:
src/usr.sbin/sysinst: disks.c

Log Message:
Update list with file systems who do have fsck adding udf since there is now a
fsck_udf.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.sbin/sysinst/disks.c

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



CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

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



CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

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

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.20 src/external/bsd/file/dist/magic/magdir/filesystems:1.21
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.20	Sat Dec 10 11:22:21 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 15:57:10 2022
@@ -1,5 +1,5 @@
 #--
-# $File: filesystems,v 1.150 2022/07/04 16:40:33 christos Exp $
+# $File: filesystems,v 1.152 2022/12/10 20:56:50 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0	name	partid
@@ -1596,7 +1596,8 @@
 >0x1e	lequad	x			%lld total clusters,
 >0x26	lequad	x			%lld clusters in use
 
-9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+
+0	name		ffsv1
 >8404	string		x		last mounted on %s,
 #>9504	ledate		x		last checked at %s,
 >8224	ledate		x		last written at %s,
@@ -1612,185 +1613,59 @@
 >8320	lelong		0		TIME optimization
 >8320	lelong		1		SPACE optimization
 
-42332	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
+9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+>0	use		ffsv1
 
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168  

CVS commit: src/sys/arch/vax/vsa

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 19:50:43 UTC 2022

Modified Files:
src/sys/arch/vax/vsa: lcg.c

Log Message:
Don't let compiler optimize out the framebuffer probe in lcg_match() by
using keyword volatile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vsa/lcg.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/vax/vsa/lcg.c
diff -u src/sys/arch/vax/vsa/lcg.c:1.10 src/sys/arch/vax/vsa/lcg.c:1.11
--- src/sys/arch/vax/vsa/lcg.c:1.10	Wed Jul  6 12:33:41 2022
+++ src/sys/arch/vax/vsa/lcg.c	Sat Dec 10 19:50:43 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: lcg.c,v 1.10 2022/07/06 12:33:41 andvar Exp $ */
+/*	$NetBSD: lcg.c,v 1.11 2022/12/10 19:50:43 jakllsch Exp $ */
 /*
  * LCG accelerated framebuffer driver
  * Copyright (c) 2003, 2004 Blaz Antonic
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.10 2022/07/06 12:33:41 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.11 2022/12/10 19:50:43 jakllsch Exp $");
 
 #define LCG_NO_ACCEL
 
@@ -433,7 +433,7 @@ lcg_match(struct device *parent, struct 
 {
 	struct vsbus_softc *sc = device_private(parent);
 	struct vsbus_attach_args *va = aux;
-	char *ch = (char *)va->va_addr;
+	volatile char * const ch = (char *)va->va_addr;
 
 	if ((vax_boardtype != VAX_BTYP_46) && (vax_boardtype != VAX_BTYP_48))
 		return 0;



CVS commit: src/sys/arch/vax/vsa

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 19:50:43 UTC 2022

Modified Files:
src/sys/arch/vax/vsa: lcg.c

Log Message:
Don't let compiler optimize out the framebuffer probe in lcg_match() by
using keyword volatile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vsa/lcg.c

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



CVS commit: src/sbin/restore

2022-12-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sat Dec 10 18:49:44 UTC 2022

Modified Files:
src/sbin/restore: dirs.c tape.c

Log Message:
apply this change from FreeBSD:

  commit c028393d7072f1f88efd8d6e6c77bb9b15b3f3b6
  Author: Kirk McKusick 
  Date:   Fri Apr 11 21:48:14 2008 +

  Correctly set file group when restore is run by a user other than root.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/restore/dirs.c
cvs rdiff -u -r1.72 -r1.73 src/sbin/restore/tape.c

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



CVS commit: src/sbin/restore

2022-12-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sat Dec 10 18:49:44 UTC 2022

Modified Files:
src/sbin/restore: dirs.c tape.c

Log Message:
apply this change from FreeBSD:

  commit c028393d7072f1f88efd8d6e6c77bb9b15b3f3b6
  Author: Kirk McKusick 
  Date:   Fri Apr 11 21:48:14 2008 +

  Correctly set file group when restore is run by a user other than root.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/restore/dirs.c
cvs rdiff -u -r1.72 -r1.73 src/sbin/restore/tape.c

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

Modified files:

Index: src/sbin/restore/dirs.c
diff -u src/sbin/restore/dirs.c:1.53 src/sbin/restore/dirs.c:1.54
--- src/sbin/restore/dirs.c:1.53	Wed Jun 23 14:22:08 2021
+++ src/sbin/restore/dirs.c	Sat Dec 10 18:49:44 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: dirs.c,v 1.53 2021/06/23 14:22:08 riastradh Exp $	*/
+/*	$NetBSD: dirs.c,v 1.54 2022/12/10 18:49:44 chs Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: dirs.c,v 1.53 2021/06/23 14:22:08 riastradh Exp $");
+__RCSID("$NetBSD: dirs.c,v 1.54 2022/12/10 18:49:44 chs Exp $");
 #endif
 #endif /* not lint */
 
@@ -598,6 +598,7 @@ setdirmodes(int flags)
 	struct entry *ep;
 	char *cp, *buf;
 	int bufsize;
+	uid_t myuid;
 
 	vprintf(stdout, "Set directory mode, owner, and times.\n");
 	if (command == 'r' || command == 'R')
@@ -618,6 +619,7 @@ setdirmodes(int flags)
 	clearerr(mf);
 	bufsize = 0;
 	buf = NULL;
+	myuid = getuid();
 	for (;;) {
 		(void) fread((char *), 1, sizeof(struct modeinfo), mf);
 		if (ferror(mf)) {
@@ -683,10 +685,13 @@ setdirmodes(int flags)
 	"extended attributes for ", cp);
 }
 			}
+			if (myuid != 0)
+(void) chown(cp, myuid, node.gid);
+			else
+(void) chown(cp, node.uid, node.gid);
+			(void) chmod(cp, node.mode);
 			(void) utimens(cp, node.ctimep);
 			(void) utimens(cp, node.mtimep);
-			(void) chown(cp, node.uid, node.gid);
-			(void) chmod(cp, node.mode);
 			if (Mtreefile) {
 writemtree(cp, "dir",
 node.uid, node.gid, node.mode,

Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.72 src/sbin/restore/tape.c:1.73
--- src/sbin/restore/tape.c:1.72	Thu May  5 07:45:43 2022
+++ src/sbin/restore/tape.c	Sat Dec 10 18:49:44 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: tape.c,v 1.72 2022/05/05 07:45:43 mrg Exp $	*/
+/*	$NetBSD: tape.c,v 1.73 2022/12/10 18:49:44 chs Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.72 2022/05/05 07:45:43 mrg Exp $");
+__RCSID("$NetBSD: tape.c,v 1.73 2022/12/10 18:49:44 chs Exp $");
 #endif
 #endif /* not lint */
 
@@ -656,7 +656,9 @@ extractfile(char *name)
 		ctimep[1].tv_nsec = curfile.birthtime_nsec;
 	}
 	extsize = curfile.extsize;
-	uid = curfile.uid;
+	uid = getuid();
+	if (uid == 0)
+		uid = curfile.uid;
 	gid = curfile.gid;
 	mode = curfile.mode;
 	flags = curfile.file_flags;



CVS commit: src/doc

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:42:36 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1902 -r1.1903 src/doc/3RDPARTY
cvs rdiff -u -r1.2936 -r1.2937 src/doc/CHANGES

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.1902 src/doc/3RDPARTY:1.1903
--- src/doc/3RDPARTY:1.1902	Wed Dec  7 20:32:35 2022
+++ src/doc/3RDPARTY	Sat Dec 10 12:42:36 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1902 2022/12/08 01:32:35 gutteridge Exp $
+#	$NetBSD: 3RDPARTY,v 1.1903 2022/12/10 17:42:36 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -41,12 +41,12 @@
 #
 
 Package:	acpica
-Version:	20220331
+Version:	20221020
 Current Vers:	20221020
 Maintainer:	Intel
 Archive Site:	http://www.acpica.org/downloads/
 Home Page:	http://www.acpica.org/
-Date:		2022-12-08
+Date:		2022-12-10
 Mailing List:	de...@acpica.org
 License:	BSD-like
 Responsible:	jruoho

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2936 src/doc/CHANGES:1.2937
--- src/doc/CHANGES:1.2936	Thu Dec  8 21:01:09 2022
+++ src/doc/CHANGES	Sat Dec 10 12:42:36 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2936 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2937 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -754,3 +754,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		[ryo 20221201]
 	tprof: Add AMD family 19h (zen3 and zen4) support to tprof(4) and
 		tprof(8). [msaitoh 20221208]
+	acpi(4): Updated ACPICA to 20221020. [christos 20221210]



CVS commit: src/doc

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:42:36 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1902 -r1.1903 src/doc/3RDPARTY
cvs rdiff -u -r1.2936 -r1.2937 src/doc/CHANGES

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



CVS commit: src/external/bsd/acpica/bin/iasl

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:41:06 UTC 2022

Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile

Log Message:
new file


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/acpica/bin/iasl/Makefile

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



CVS commit: src/external/bsd/acpica/bin/iasl

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:41:06 UTC 2022

Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile

Log Message:
new file


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/acpica/bin/iasl/Makefile

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

Modified files:

Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.27 src/external/bsd/acpica/bin/iasl/Makefile:1.28
--- src/external/bsd/acpica/bin/iasl/Makefile:1.27	Sat Sep 12 11:25:42 2020
+++ src/external/bsd/acpica/bin/iasl/Makefile	Sat Dec 10 12:41:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/09/12 15:25:42 jmcneill Exp $
+# $NetBSD: Makefile,v 1.28 2022/12/10 17:41:05 christos Exp $
 
 .include 
 
@@ -234,6 +234,7 @@ SRCS+= \
 	utascii.c \
 	utbuffer.c \
 	utcache.c \
+	utcksum.c \
 	utcopy.c \
 	utdebug.c \
 	utdecode.c \



CVS commit: src/sys/external/bsd/acpica

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:40:50 UTC 2022

Modified Files:
src/sys/external/bsd/acpica/conf: files.acpica
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
src/sys/external/bsd/acpica/dist/compiler: aslcompile.c aslerror.c
asloptions.c aslpredef.c dtcompile.c dtutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c
src/sys/external/bsd/acpica/dist/hardware: hwsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acglobal.h
acpixf.h actables.h actbl1.h actypes.h acutils.h
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbutils.c
tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utglobal.c

Log Message:
merge acpica 20220331 to 20221020


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/conf/files.acpica
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/actables.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/tables/tbdata.c \
src/sys/external/bsd/acpica/dist/tables/tbfadt.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/utilities/utglobal.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/external/bsd/acpica/conf/files.acpica
diff -u src/sys/external/bsd/acpica/conf/files.acpica:1.17 src/sys/external/bsd/acpica/conf/files.acpica:1.18
--- src/sys/external/bsd/acpica/conf/files.acpica:1.17	Sat Jan  5 15:40:05 2019
+++ src/sys/external/bsd/acpica/conf/files.acpica	Sat Dec 10 12:40:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.17 2019/01/05 20:40:05 christos Exp $
+# $NetBSD: files.acpica,v 1.18 2022/12/10 17:40:49 christos Exp $
 
 define		acpica
 makeoptions	acpi	CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -183,6 +183,7 @@ file	utilities/utalloc.c		acpica
 file	utilities/utascii.c		acpica
 file	utilities/utbuffer.c		acpica
 file	utilities/utcache.c		acpica
+file	utilities/utcksum.c		acpica
 file	utilities/utcopy.c		acpica
 file	utilities/utdebug.c		acpica
 file	utilities/utdecode.c		acpica

Index: src/sys/external/bsd/acpica/dist/common/dmtables.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtables.c:1.6 src/sys/external/bsd/acpica/dist/common/dmtables.c:1.7
--- src/sys/external/bsd/acpica/dist/common/dmtables.c:1.6	Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/common/dmtables.c	Sat Dec 10 12:40:49 2022
@@ -188,7 +188,7 @@ AdCreateTableHeader (
 
 AcpiOsPrintf ("\n * Checksum 0x%2.2X",Table->Checksum);
 
-Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
+Checksum = AcpiUtChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
 if (Checksum)
 {
 AcpiOsPrintf ("  Incorrect checksum, should be 0x%2.2X",

Index: src/sys/external/bsd/acpica/dist/common/dmtbdump.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.14 src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.15
--- src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.14	Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/common/dmtbdump.c	Sat Dec 10 12:40:49 2022
@@ -222,7 +222,7 @@ 

CVS commit: src/sys/external/bsd/acpica

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 17:40:50 UTC 2022

Modified Files:
src/sys/external/bsd/acpica/conf: files.acpica
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
src/sys/external/bsd/acpica/dist/compiler: aslcompile.c aslerror.c
asloptions.c aslpredef.c dtcompile.c dtutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c
src/sys/external/bsd/acpica/dist/hardware: hwsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acglobal.h
acpixf.h actables.h actbl1.h actypes.h acutils.h
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbutils.c
tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utglobal.c

Log Message:
merge acpica 20220331 to 20221020


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/conf/files.acpica
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/actables.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/tables/tbdata.c \
src/sys/external/bsd/acpica/dist/tables/tbfadt.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/utilities/utglobal.c

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



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 16:52:02 UTC 2022

Modified Files:
src/usr.sbin/sysinst: disks.c

Log Message:
Always map FS_BSDFFS to one of "FFS", "FFSv2" or "FFSv2ea" - previously
the disklabel name "4.2BSD" could show up initially but we could never
go back to it via the menu used to change the file system type.
This was confusing.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/usr.sbin/sysinst/disks.c

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

Modified files:

Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.92 src/usr.sbin/sysinst/disks.c:1.93
--- src/usr.sbin/sysinst/disks.c:1.92	Wed Nov 30 19:44:06 2022
+++ src/usr.sbin/sysinst/disks.c	Sat Dec 10 16:52:02 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.92 2022/11/30 19:44:06 martin Exp $ */
+/*	$NetBSD: disks.c,v 1.93 2022/12/10 16:52:02 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -114,7 +114,7 @@ getfslabelname(uint f, uint f_version)
 		return "mfs";
 	else if (f == FS_EFI_SP)
 		return msg_string(MSG_fs_type_efi_sp);
-	else if (f == FS_BSDFFS && f_version > 0) {
+	else if (f == FS_BSDFFS) {
 		switch (f_version) {
 		default:
 		case 1:	return msg_string(MSG_fs_type_ffs);



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 16:52:02 UTC 2022

Modified Files:
src/usr.sbin/sysinst: disks.c

Log Message:
Always map FS_BSDFFS to one of "FFS", "FFSv2" or "FFSv2ea" - previously
the disklabel name "4.2BSD" could show up initially but we could never
go back to it via the menu used to change the file system type.
This was confusing.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/usr.sbin/sysinst/disks.c

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



CVS import: src/sys/external/bsd/acpica/dist

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 16:34:48 UTC 2022

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9315

Log Message:
Import acpica 2022-10-20

20 October 2022. Summary of changes for version 20221020:

This release is available at https://acpica.org/downloads

0) Global changes:

Allow disabling of -Werror. For distro maintainers having `-Werror`
can delay update of GCC. Since every GCC release might add new
warnings that were not yet captured, it might break the build of
packages. With this change, distros can now build with `NOWERROR=TRUE`
instead of patching either the errors or the makefiles. The default
behavior keeps on using `-Werror`.

1) ACPICA kernel-resident subsystem:

Added support for FFH Operation Region special context data.
FFH(Fixed Function Hardware) Opregion is approved to be added in
ACPI 6.5 via code first approach[1]. It requires special context
data similar to GPIO and Generic Serial Bus as it needs to know
platform specific offset and length.

Reverted this commit "executer/exsystem: Warn about sleeps greater
than 10 ms." Due to user complaints about valid sleeps greater than
10ms seen in some existing machines -- generating lots of warnings.

Do not touch VGA memory when EBDA < 1KiB. The ACPICA code assumes
that EBDA region must be at least 1KiB in size. Because this is
not guaranteed, it might happen that while scanning the memory for
RSDP pointer, the kernel touches memory above 640KiB. This is
unwanted as the VGA memory range may not be decoded or even present
when running under virtualization.

Check that EBDA pointer is in valid memory. If the memory at 0x40e
is uninitialized, the retrieved physical memory address of EBDA
may be beyond the low memory (i.e. above 640K). If so, the kernel
may unintentionally access the VGA memory, that might not be decoded
or even present in case of virtualization.

2) iASL Compiler/Disassembler and ACPICA tools:

Completed the existing partial support for the CDAT "table". Although
this isn't technically an ACPI table (It doesn't go into the XSDT),
it is possible to support this table in the Data Table compiler.
Created one new file, "utilities/utcksum.c", used to centralize
checksum generation/validation into one location. Includes changes
to makefiles and MSVC project files.

Updated support for the IORT table - update to version E.e

Added CXL 3.0 structures (CXIMS & RDPAS) to the CEDT table

iASL: Added CCEL table to both compiler/disassembler.

iASL: NHLT table: Fixed compilation of optional undocumented fields

iASL: Fix iASL compile error due to ACPI_TDEL_OFFSET. Commit #
10e4763 ("iASL: Add CCEL table to both compiler/disassembler")
introduced the iASL build issue. The issue is due to using
ACPI_TDEL_OFFSET for CCEL table member reference. To fix it, change
ACPI_TDEL_OFFSET with ACPI_CCEL_OFFSET.


Status:

Vendor Tag: intel
Release Tags:   acpica-20221020

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile
U src/sys/external/bsd/acpica/dist/common/acfileio.c
U src/sys/external/bsd/acpica/dist/common/acgetline.c
U src/sys/external/bsd/acpica/dist/common/adfile.c
U src/sys/external/bsd/acpica/dist/common/adisasm.c
U src/sys/external/bsd/acpica/dist/common/adwalk.c
U src/sys/external/bsd/acpica/dist/common/ahids.c
U src/sys/external/bsd/acpica/dist/common/ahpredef.c
U src/sys/external/bsd/acpica/dist/common/ahtable.c
U src/sys/external/bsd/acpica/dist/common/ahuuids.c
U 

CVS import: src/sys/external/bsd/acpica/dist

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 16:34:48 UTC 2022

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9315

Log Message:
Import acpica 2022-10-20

20 October 2022. Summary of changes for version 20221020:

This release is available at https://acpica.org/downloads

0) Global changes:

Allow disabling of -Werror. For distro maintainers having `-Werror`
can delay update of GCC. Since every GCC release might add new
warnings that were not yet captured, it might break the build of
packages. With this change, distros can now build with `NOWERROR=TRUE`
instead of patching either the errors or the makefiles. The default
behavior keeps on using `-Werror`.

1) ACPICA kernel-resident subsystem:

Added support for FFH Operation Region special context data.
FFH(Fixed Function Hardware) Opregion is approved to be added in
ACPI 6.5 via code first approach[1]. It requires special context
data similar to GPIO and Generic Serial Bus as it needs to know
platform specific offset and length.

Reverted this commit "executer/exsystem: Warn about sleeps greater
than 10 ms." Due to user complaints about valid sleeps greater than
10ms seen in some existing machines -- generating lots of warnings.

Do not touch VGA memory when EBDA < 1KiB. The ACPICA code assumes
that EBDA region must be at least 1KiB in size. Because this is
not guaranteed, it might happen that while scanning the memory for
RSDP pointer, the kernel touches memory above 640KiB. This is
unwanted as the VGA memory range may not be decoded or even present
when running under virtualization.

Check that EBDA pointer is in valid memory. If the memory at 0x40e
is uninitialized, the retrieved physical memory address of EBDA
may be beyond the low memory (i.e. above 640K). If so, the kernel
may unintentionally access the VGA memory, that might not be decoded
or even present in case of virtualization.

2) iASL Compiler/Disassembler and ACPICA tools:

Completed the existing partial support for the CDAT "table". Although
this isn't technically an ACPI table (It doesn't go into the XSDT),
it is possible to support this table in the Data Table compiler.
Created one new file, "utilities/utcksum.c", used to centralize
checksum generation/validation into one location. Includes changes
to makefiles and MSVC project files.

Updated support for the IORT table - update to version E.e

Added CXL 3.0 structures (CXIMS & RDPAS) to the CEDT table

iASL: Added CCEL table to both compiler/disassembler.

iASL: NHLT table: Fixed compilation of optional undocumented fields

iASL: Fix iASL compile error due to ACPI_TDEL_OFFSET. Commit #
10e4763 ("iASL: Add CCEL table to both compiler/disassembler")
introduced the iASL build issue. The issue is due to using
ACPI_TDEL_OFFSET for CCEL table member reference. To fix it, change
ACPI_TDEL_OFFSET with ACPI_CCEL_OFFSET.


Status:

Vendor Tag: intel
Release Tags:   acpica-20221020

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile
U src/sys/external/bsd/acpica/dist/common/acfileio.c
U src/sys/external/bsd/acpica/dist/common/acgetline.c
U src/sys/external/bsd/acpica/dist/common/adfile.c
U src/sys/external/bsd/acpica/dist/common/adisasm.c
U src/sys/external/bsd/acpica/dist/common/adwalk.c
U src/sys/external/bsd/acpica/dist/common/ahids.c
U src/sys/external/bsd/acpica/dist/common/ahpredef.c
U src/sys/external/bsd/acpica/dist/common/ahtable.c
U src/sys/external/bsd/acpica/dist/common/ahuuids.c
U 

CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

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

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.19 src/external/bsd/file/dist/magic/magdir/filesystems:1.20
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.19	Sat Sep 24 20:21:46 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 16:22:21 2022
@@ -1652,6 +1652,46 @@
 >&-1248	lelong		0		TIME optimization
 >&-1248	lelong		1		SPACE optimization
 
+42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
+66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168   belong		0x4c41424c	Apple UFS Volume
 >>7186  string		x		named %s,
@@ -1712,6 +1752,46 @@
 >&-1248	belong		0		TIME optimization
 >&-1248	belong		1		SPACE optimization
 
+42332	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
+66908	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
 0	ulequad		0xc8414d4dc5523031	HAMMER filesystem (little-endian),
 >0x90	lelong+1	x			volume %d
 >0x94	lelong		x			(of %d),



CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

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



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 16:13:19 UTC 2022

Modified Files:
src/usr.sbin/sysinst: label.c

Log Message:
Comment and code style (cosmetic) changes, no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/sysinst/label.c

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

Modified files:

Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.43 src/usr.sbin/sysinst/label.c:1.44
--- src/usr.sbin/sysinst/label.c:1.43	Wed Nov 30 15:53:35 2022
+++ src/usr.sbin/sysinst/label.c	Sat Dec 10 16:13:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: label.c,v 1.43 2022/11/30 15:53:35 martin Exp $	*/
+/*	$NetBSD: label.c,v 1.44 2022/12/10 16:13:19 martin Exp $	*/
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.43 2022/11/30 15:53:35 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.44 2022/12/10 16:13:19 martin Exp $");
 #endif
 
 #include 
@@ -795,7 +795,7 @@ edit_fs_type(menudesc *menu, void *arg)
 	if (opts == NULL)
 		return 0;
 
-	/* special case entry 0 and 1: three FFS entries */
+	/* special case entry 0 - 2: three FFS entries */
 	for (i = 0; i < __arraycount(edit_fs_common_types); i++) {
 		opts[i+2].opt_name = getfslabelname(edit_fs_common_types[i], 0);
 		opts[i+2].opt_action = set_fstype;
@@ -1190,16 +1190,17 @@ draw_edit_ptn_line(menudesc *m, int opt,
 	if (opt < 4) {
 		switch (opt) {
 		case 0:
-			if (edit->info.fs_type == FS_BSDFFS)
+			if (edit->info.fs_type == FS_BSDFFS) {
 if (edit->info.fs_sub_type == 3)
 	c = msg_string(MSG_fs_type_ffsv2ea);
 else if (edit->info.fs_sub_type == 2)
 	c = msg_string(MSG_fs_type_ffsv2);
 else
 	c = msg_string(MSG_fs_type_ffs);
-			else
+			} else {
 c = getfslabelname(edit->info.fs_type,
 edit->info.fs_sub_type);
+			}
 			wprintw(m->mw, "%*s : %s", col_width, ptn_type, c);
 			return;
 		case 1:



CVS commit: src/usr.sbin/sysinst

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 16:13:19 UTC 2022

Modified Files:
src/usr.sbin/sysinst: label.c

Log Message:
Comment and code style (cosmetic) changes, no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/sysinst/label.c

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



CVS commit: src/usr.sbin/sysinst/arch/vax

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:03:15 UTC 2022

Modified Files:
src/usr.sbin/sysinst/arch/vax: md.h

Log Message:
VAX bootxx has had ffsv2 support since May 2018, allow its use as boot
filesystem in sysinst.

Sucessfully tested in simh-microvax3900 booting from FFSv2ea.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/vax/md.h

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

Modified files:

Index: src/usr.sbin/sysinst/arch/vax/md.h
diff -u src/usr.sbin/sysinst/arch/vax/md.h:1.5 src/usr.sbin/sysinst/arch/vax/md.h:1.6
--- src/usr.sbin/sysinst/arch/vax/md.h:1.5	Thu Jun 16 14:03:39 2022
+++ src/usr.sbin/sysinst/arch/vax/md.h	Sat Dec 10 16:03:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $	*/
+/*	$NetBSD: md.h,v 1.6 2022/12/10 16:03:15 jakllsch Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -53,6 +53,9 @@
 #define XNEEDMB 	150	/* Extra megs for full X installation */
 #define DEBNEEDMB	650	/* Extra megs for debug sets */
 
+/* have support for booting from UFS2 */
+#define HAVE_UFS2_BOOT
+
 /*
  * Default filesets to fetch and install during installation
  * or upgrade.



CVS commit: src/usr.sbin/sysinst/arch/vax

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:03:15 UTC 2022

Modified Files:
src/usr.sbin/sysinst/arch/vax: md.h

Log Message:
VAX bootxx has had ffsv2 support since May 2018, allow its use as boot
filesystem in sysinst.

Sucessfully tested in simh-microvax3900 booting from FFSv2ea.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/vax/md.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/powerpc/powerpc

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 13:15:00 UTC 2022

Modified Files:
src/sys/arch/powerpc/powerpc: ofw_machdep.c

Log Message:
Move some output to DEBUG-only state


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/ofw_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/powerpc/powerpc

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 13:15:00 UTC 2022

Modified Files:
src/sys/arch/powerpc/powerpc: ofw_machdep.c

Log Message:
Move some output to DEBUG-only state


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/ofw_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/powerpc/powerpc/ofw_machdep.c
diff -u src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.34 src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.35
--- src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.34	Sat Dec 10 13:06:41 2022
+++ src/sys/arch/powerpc/powerpc/ofw_machdep.c	Sat Dec 10 13:15:00 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_machdep.c,v 1.34 2022/12/10 13:06:41 martin Exp $	*/
+/*	$NetBSD: ofw_machdep.c,v 1.35 2022/12/10 13:15:00 martin Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.34 2022/12/10 13:06:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.35 2022/12/10 13:15:00 martin Exp $");
 
 #include 
 #include 
@@ -254,7 +254,7 @@ ofw_bootstrap_get_memory(void)
 #endif
 		OFmem[memcnt].start = addr;
 		OFmem[memcnt].size = size;
-		ofprint("mem region %d start=%"PRIx64" size=%"PRIx64"\n",
+		DPRINTF("mem region %d start=%"PRIx64" size=%"PRIx64"\n",
 		memcnt, addr, size);
 		memcnt++;
 	}
@@ -317,7 +317,7 @@ ofw_bootstrap_get_memory(void)
 #endif
 		OFavail[cnt].start = addr;
 		OFavail[cnt].size = size;
-		ofprint("avail region %d start=%#"PRIx64" size=%#"PRIx64"\n",
+		DPRINTF("avail region %d start=%#"PRIx64" size=%#"PRIx64"\n",
 		cnt, addr, size);
 		cnt++;
 	}
@@ -423,7 +423,7 @@ ofw_bootstrap_get_translations(void)
 			continue;
 		}
 
-		ofprint("translation %d virt=%#"PRIx32
+		DPRINTF("translation %d virt=%#"PRIx32
 		" phys=%#"PRIx64" size=%#"PRIx32" mode=%#"PRIx32"\n",
 		idx, virt, phys, size, mode);
 		
@@ -488,7 +488,7 @@ ofw_bootstrap(void)
 			ofw_real_mode = false;
 		}
 	}
-	ofprint("OpenFirmware running in %s-mode\n",
+	DPRINTF("OpenFirmware running in %s-mode\n",
 	ofw_real_mode ? "real" : "virtual");
 
 	/* Get #address-cells and #size-cells to fetching memory info. */



CVS commit: src/sys/arch/powerpc/powerpc

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 13:06:41 UTC 2022

Modified Files:
src/sys/arch/powerpc/powerpc: ofw_machdep.c

Log Message:
Convert more kernel printfs that might happen very early (before kernel
console is usable) to ofprint.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/powerpc/powerpc/ofw_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/powerpc/powerpc/ofw_machdep.c
diff -u src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.33 src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.34
--- src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.33	Thu Nov 24 00:13:54 2022
+++ src/sys/arch/powerpc/powerpc/ofw_machdep.c	Sat Dec 10 13:06:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_machdep.c,v 1.33 2022/11/24 00:13:54 macallan Exp $	*/
+/*	$NetBSD: ofw_machdep.c,v 1.34 2022/12/10 13:06:41 martin Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.33 2022/11/24 00:13:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.34 2022/12/10 13:06:41 martin Exp $");
 
 #include 
 #include 
@@ -88,6 +88,11 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_machdep.
 #define DPRINTF while(0) printf
 #endif
 
+#define	ofpanic(FORMAT, ...)	do {\
+		ofprint(FORMAT __VA_OPT__(,) __VA_ARGS__);	\
+		panic(FORMAT __VA_OPT__(,) __VA_ARGS__);	\
+	} while (0)
+
 int	ofw_root;
 int	ofw_chosen;
 
@@ -185,7 +190,7 @@ ofw_bootstrap_console(void)
 
 	return;
  nocons:
-	panic("No /chosen could be found!\n");
+	ofpanic("No /chosen could be found!\n");
 	console_node = -1;
 }
 
@@ -356,7 +361,7 @@ error:
 	OFavail[0].size = 0x2000 - 0x3000;
 
 #else
-	panic("no memory?");
+	ofpanic("no memory?");
 #endif
 	return;
 }
@@ -375,19 +380,19 @@ ofw_bootstrap_get_translations(void)
 
 	if (OF_getprop(ofw_chosen, "mmu", _ihandle,
 		   sizeof(mmu_ihandle)) <= 0) {
-		aprint_normal("No /chosen/mmu\n");
+		ofprint("No /chosen/mmu\n");
 		return;
 	}
 	mmu_phandle = OF_instance_to_package(mmu_ihandle);
 
 	proplen = OF_getproplen(mmu_phandle, "translations");
 	if (proplen <= 0) {
-		aprint_normal("No translations in /chosen/mmu\n");
+		ofprint("No translations in /chosen/mmu\n");
 		return;
 	}
 
 	if (proplen > sizeof(regs)) {
-		panic("/chosen/mmu translations too large");
+		ofpanic("/chosen/mmu translations too large");
 	}
 
 	proplen = OF_getprop(mmu_phandle, "translations", regs, sizeof(regs));
@@ -406,11 +411,11 @@ ofw_bootstrap_get_translations(void)
 			phys = (phys << 32) | *rp++;
 			break;
 		default:
-			panic("unexpected #address-cells");
+			ofpanic("unexpected #address-cells");
 		}
 		mode = *rp++;
 		if (rp > [nregs]) {
-			panic("unexpected OFW translations format");
+			ofpanic("unexpected OFW translations format");
 		}
 
 		/* Wouldn't expect this, but... */
@@ -418,16 +423,16 @@ ofw_bootstrap_get_translations(void)
 			continue;
 		}
 
-		aprint_normal("translation %d virt=%#"PRIx32
+		ofprint("translation %d virt=%#"PRIx32
 		" phys=%#"PRIx64" size=%#"PRIx32" mode=%#"PRIx32"\n",
 		idx, virt, phys, size, mode);
 		
 		if (sizeof(paddr_t) < 8 && phys >= 0x1ULL) {
-			panic("translation phys out of range");
+			ofpanic("translation phys out of range");
 		}
 
 		if (idx == OFW_MAX_TRANSLATIONS) {
-			panic("too many OFW translations");
+			ofpanic("too many OFW translations");
 		}
 
 		ofw_translations[idx].virt = virt;



CVS commit: src/sys/arch/powerpc/powerpc

2022-12-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 10 13:06:41 UTC 2022

Modified Files:
src/sys/arch/powerpc/powerpc: ofw_machdep.c

Log Message:
Convert more kernel printfs that might happen very early (before kernel
console is usable) to ofprint.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/powerpc/powerpc/ofw_machdep.c

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