CVS commit: src/sys/dev/pci

2018-03-25 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 26 02:57:09 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1312 -r1.1313 src/sys/dev/pci/pcidevs_data.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/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1313 src/sys/dev/pci/pcidevs.h:1.1314
--- src/sys/dev/pci/pcidevs.h:1.1313	Tue Mar 20 11:24:14 2018
+++ src/sys/dev/pci/pcidevs.h	Mon Mar 26 02:57:09 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1313 2018/03/20 11:24:14 nonaka Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1314 2018/03/26 02:57:09 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1321 2018/03/20 11:23:06 nonaka Exp
+ *	NetBSD: pcidevs,v 1.1322 2018/03/26 02:56:45 msaitoh Exp
  */
 
 /*
@@ -7114,6 +7114,8 @@
 #define	PCI_PRODUCT_VIATECH_VT8237S_ISA	0x3372		/* VT8237S PCI-ISA Bridge */
 #define	PCI_PRODUCT_VIATECH_VT8237A_PPB	0x337a		/* VT8237A PCI-PCI Bridge */
 #define	PCI_PRODUCT_VIATECH_VT8237A_HB	0x337b		/* VT8237A Host Bridge */
+#define	PCI_PRODUCT_VIATECH_VL80x_XHCI	0x3432		/* VL80x xHCI */
+#define	PCI_PRODUCT_VIATECH_VL805_XHCI	0x3483		/* VL805 xHCI */
 #define	PCI_PRODUCT_VIATECH_KT880_4	0x4269		/* KT880 CPU to PCI Bridge */
 #define	PCI_PRODUCT_VIATECH_VT3351_HB_4351	0x4351		/* VT3351 Host Bridge */
 #define	PCI_PRODUCT_VIATECH_P4M900_4	0x4364		/* CN896/P4M900 Host Bridge */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1312 src/sys/dev/pci/pcidevs_data.h:1.1313
--- src/sys/dev/pci/pcidevs_data.h:1.1312	Tue Mar 20 11:24:14 2018
+++ src/sys/dev/pci/pcidevs_data.h	Mon Mar 26 02:57:09 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1312 2018/03/20 11:24:14 nonaka Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1313 2018/03/26 02:57:09 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1321 2018/03/20 11:23:06 nonaka Exp
+ *	NetBSD: pcidevs,v 1.1322 2018/03/26 02:56:45 msaitoh Exp
  */
 
 /*
@@ -12386,6 +12386,10 @@ static const uint16_t pci_products[] = {
 	33316, 8226, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_HB, 
 	33316, 6807, 6417, 0,
+	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VL80x_XHCI, 
+	33829, 8429, 0,
+	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VL805_XHCI, 
+	33835, 8429, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_KT880_4, 
 	33153, 2544, 6863, 615, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3351_HB_4351, 
@@ -12393,7 +12397,7 @@ static const uint16_t pci_products[] = {
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_P4M900_4, 
 	33194, 6807, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_CX700M2_IDE, 
-	33829, 6480, 6309, 0,
+	33841, 6480, 6309, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_SATA_2, 
 	33316, 692, 8413, 6309, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3351_IOAPIC, 
@@ -12403,7 +12407,7 @@ static const uint16_t pci_products[] = {
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA, 
 	33821, 692, 8413, 6309, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C100A, 
-	33843, 33853, 5673, 5571, 0,
+	33855, 33865, 5673, 5571, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA, 
 	33504, 692, 8413, 6309, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_P4M900_6, 
@@ -12417,23 +12421,23 @@ static const uint16_t pci_products[] = {
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_P4M900_7, 
 	33194, 6807, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231, 
-	33864, 6691, 6417, 0,
+	33876, 6691, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231_PWR, 
-	33864, 3749, 6932, 6309, 0,
+	33876, 3749, 6932, 6309, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363_PPB, 
 	33165, 33172, 33180, 615, 6863, 8239, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_CX700, 
 	33288, 27709, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX800, 
-	33871, 27709, 6417, 0,
+	33883, 27709, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_PPB, 
 	33207, 33172, 33214, 8226, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501AGP, 
-	33227, 33172, 33234, 33883, 6417, 0,
+	33227, 33172, 33234, 33895, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP, 
-	33348, 33172, 33357, 33883, 6417, 0,
+	33348, 33172, 33357, 33895, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C598AGP, 
-	33362, 33172, 33371, 33883, 6417, 0,
+	33362, 33172, 33371, 33895, 6417, 0,
 	PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605AGP, 
 	33377, 33172, 33384, 33393, 

CVS commit: src/sys/dev/pci

2018-03-25 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon Mar 26 02:56:45 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
 Add two VIA xHCI devices from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1321 -r1.1322 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1321 src/sys/dev/pci/pcidevs:1.1322
--- src/sys/dev/pci/pcidevs:1.1321	Tue Mar 20 11:23:06 2018
+++ src/sys/dev/pci/pcidevs	Mon Mar 26 02:56:45 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1321 2018/03/20 11:23:06 nonaka Exp $
+$NetBSD: pcidevs,v 1.1322 2018/03/26 02:56:45 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7107,6 +7107,8 @@ product VIATECH CHROME9_HC	0x3371	Chrome
 product VIATECH VT8237S_ISA	0x3372	VT8237S PCI-ISA Bridge
 product VIATECH VT8237A_PPB	0x337a	VT8237A PCI-PCI Bridge
 product VIATECH VT8237A_HB	0x337b	VT8237A Host Bridge
+product VIATECH VL80x_XHCI 	0x3432	VL80x xHCI
+product	VIATECH	VL805_XHCI	0x3483	VL805 xHCI
 product VIATECH KT880_4		0x4269	KT880 CPU to PCI Bridge
 product VIATECH VT3351_HB_4351	0x4351	VT3351 Host Bridge
 product VIATECH P4M900_4	0x4364	CN896/P4M900 Host Bridge



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

2018-03-25 Thread Kengo NAKAHARA
Module Name:src
Committed By:   knakahara
Date:   Mon Mar 26 02:30:08 UTC 2018

Modified Files:
src/sys/arch/x86/x86: intr.c

Log Message:
Fix "intrctl list" causes panic while attaching MSI/MSI-X devices.

When there are devices which is already pci_intr_alloc'ed, however is not
established yet, "intrctl list" causes panic. E.g.
# while true; do intrctl list > /dev/null ; done&
# drvctl -d ixg0 && drvctl -r pci0

And add some KASSERTMSG to similar but not the same code.

Pointed out by msaitoh@n.o.

XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/x86/x86/intr.c

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

Modified files:

Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.123 src/sys/arch/x86/x86/intr.c:1.124
--- src/sys/arch/x86/x86/intr.c:1.123	Sat Feb 17 18:51:53 2018
+++ src/sys/arch/x86/x86/intr.c	Mon Mar 26 02:30:08 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.123 2018/02/17 18:51:53 maxv Exp $	*/
+/*	$NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.123 2018/02/17 18:51:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -2012,6 +2012,9 @@ intr_get_affinity(struct intrsource *isp
 		return;
 	}
 
+	KASSERTMSG(isp->is_handlers != NULL,
+	"Don't get affinity for the device which is not established.");
+
 	ci = isp->is_handlers->ih_cpu;
 	if (ci == NULL) {
 		kcpuset_zero(cpuset);
@@ -2064,6 +2067,9 @@ intr_set_affinity(struct intrsource *isp
 	}
 
 	ih = isp->is_handlers;
+	KASSERTMSG(ih != NULL,
+	"Don't set affinity for the device which is not established.");
+
 	oldci = ih->ih_cpu;
 	if (newci == oldci) /* nothing to do */
 		return 0;
@@ -2130,6 +2136,13 @@ intr_is_affinity_intrsource(struct intrs
 
 	KASSERT(mutex_owned(_lock));
 
+	/*
+	 * The device is already pci_intr_alloc'ed, however it is not
+	 * established yet.
+	 */
+	if (isp->is_handlers == NULL)
+		return false;
+
 	ci = isp->is_handlers->ih_cpu;
 	KASSERT(ci != NULL);
 



CVS commit: [pgoyette-compat] src/sys/modules/compat

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Mar 26 00:00:39 UTC 2018

Modified Files:
src/sys/modules/compat [pgoyette-compat]: Makefile

Log Message:
Remove duplicate setting of -DCPU_UCODE


To generate a diff of this commit:
cvs rdiff -u -r1.14.14.5 -r1.14.14.6 src/sys/modules/compat/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/modules/compat/Makefile
diff -u src/sys/modules/compat/Makefile:1.14.14.5 src/sys/modules/compat/Makefile:1.14.14.6
--- src/sys/modules/compat/Makefile:1.14.14.5	Thu Mar 22 01:44:51 2018
+++ src/sys/modules/compat/Makefile	Mon Mar 26 00:00:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14.14.5 2018/03/22 01:44:51 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.14.14.6 2018/03/26 00:00:39 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -24,13 +24,6 @@ CPPFLAGS+=	-DCOMPAT_20
 CPPFLAGS+=	-DCOMPAT_30 -DCOMPAT_40 -DCOMPAT_50
 CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 CPPFLAGS+=	-DCOMPAT_43
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CPPFLAGS+=	-DCPU_UCODE
-# pick up more for bsd.klinks.mk as needed.
-MACHINE_EXTRA=	x86
-.else
-MACHINE_EXTRA=	none
-.endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=	-DCPU_UCODE
@@ -38,7 +31,6 @@ CPPFLAGS+=	-DCPU_UCODE
 MACHINE_EXTRA= x86
 .else
 MACHINE_EXTRA= none
-
 .endif
 
 .include "../../compat/common/Makefile.sysio"



CVS commit: [pgoyette-compat] src/doc

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 23:53:51 UTC 2018

Modified Files:
src/doc [pgoyette-compat]: COMPAT-branch-notes

Log Message:
Another reminder, to update syscalls.master and other modules to refer
to specific compat_xx modules rather than the monolithic compat module.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/COMPAT-branch-notes

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

Modified files:

Index: src/doc/COMPAT-branch-notes
diff -u src/doc/COMPAT-branch-notes:1.1.2.6 src/doc/COMPAT-branch-notes:1.1.2.7
--- src/doc/COMPAT-branch-notes:1.1.2.6	Sun Mar 25 08:52:54 2018
+++ src/doc/COMPAT-branch-notes	Sun Mar 25 23:53:51 2018
@@ -46,3 +46,7 @@ TODO
Need to decide how to handle the COMPAT_BSDPTY stuff.
 
 3. XXX The compat_60 module still needs some work for XEN systems.
+
+4. Update syscalls.master to point the compat calls at the specific
+   modules rather than the monolithic compat module.  Update the
+   "required" lists of other modules, too.



CVS commit: [pgoyette-compat] src/sys/compat/common

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 21:27:51 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio

Log Message:
Don't add the compat_60_cpu_ucode.c file here.  It's already added in
the main Makefile, and doing again here results in trying to link it
twice (with resulting symbol redefinition errors).


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.15 -r1.7.18.16 src/sys/compat/common/Makefile.sysio

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

Modified files:

Index: src/sys/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.15 src/sys/compat/common/Makefile.sysio:1.7.18.16
--- src/sys/compat/common/Makefile.sysio:1.7.18.15	Sun Mar 25 10:38:51 2018
+++ src/sys/compat/common/Makefile.sysio	Sun Mar 25 21:27:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.15 2018/03/25 10:38:51 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.16 2018/03/25 21:27:51 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -61,9 +61,3 @@ SRCS+=	puffs_compat.c
 .PATH:	${S}/dev/wscons
 SRCS+=	wsevent_50.c
 
-# x86-specific compatability code for NetBSD 6.0
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CPPFLAGS+=  -DCPU_UCODE
-.PATH:  ${S}/arch/x86/x86
-SRCS+=  compat_60_cpu_ucode.c
-.endif



CVS commit: src/libexec/ld.elf_so/arch/sparc

2018-03-25 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Mar 25 18:56:01 UTC 2018

Modified Files:
src/libexec/ld.elf_so/arch/sparc: mdreloc.c

Log Message:
Don't skip PLT processing for the main binary. It can still contain
ifunc references.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/libexec/ld.elf_so/arch/sparc/mdreloc.c

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

Modified files:

Index: src/libexec/ld.elf_so/arch/sparc/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.52 src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.53
--- src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.52	Sat Aug 12 09:03:27 2017
+++ src/libexec/ld.elf_so/arch/sparc/mdreloc.c	Sun Mar 25 18:56:01 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdreloc.c,v 1.52 2017/08/12 09:03:27 joerg Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.53 2018/03/25 18:56:01 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.52 2017/08/12 09:03:27 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.53 2018/03/25 18:56:01 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -396,9 +396,6 @@ _rtld_relocate_plt_lazy(Obj_Entry *obj)
 {
 	const Elf_Rela *rela;
 
-	if (!obj->relocbase)
-		return 0;
-
 	for (rela = obj->pltrelalim; rela-- > obj->pltrela; ) {
 		if (ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_IREL))
 			obj->ifunc_remaining = obj->pltrelalim - rela + 1;



CVS commit: [netbsd-6-0] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 18:40:02 UTC 2018

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
Ticket #1539


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-6.0.7

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

Modified files:

Index: src/doc/CHANGES-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.134 src/doc/CHANGES-6.0.7:1.1.2.135
--- src/doc/CHANGES-6.0.7:1.1.2.134	Tue Mar 13 17:59:51 2018
+++ src/doc/CHANGES-6.0.7	Sun Mar 25 18:40:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.134 2018/03/13 17:59:51 snj Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.135 2018/03/25 18:40:02 martin Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -15391,3 +15391,34 @@ sys/netipsec/ipsec_input.c			1.57-1.58
 	Fix out-of-bounds read.
 	[maxv, ticket #1536]
 
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/calendarsup to 1.1.1.1
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+	(with external/public-domain/tz/dist -> share/zoneinfo)
+share/zoneinfo/Theory   		delete
+doc/3RDPARTY	(patch)
+distrib/sets/lists/base/mi			1.1164
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1539]
+



CVS commit: [netbsd-6] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 18:32:04 UTC 2018

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Ticket #1539


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.327 -r1.1.2.328 src/doc/CHANGES-6.2

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

Modified files:

Index: src/doc/CHANGES-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.327 src/doc/CHANGES-6.2:1.1.2.328
--- src/doc/CHANGES-6.2:1.1.2.327	Tue Mar 13 18:06:22 2018
+++ src/doc/CHANGES-6.2	Sun Mar 25 18:32:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.327 2018/03/13 18:06:22 snj Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.328 2018/03/25 18:32:04 martin Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -21165,3 +21165,34 @@ share/man/man4/altq.41.3
 	Update URL for the cited paper
 	[sevan, ticket #1538]
 
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/calendarsup to 1.1.1.1
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+	(with external/public-domain/tz/dist -> share/zoneinfo)
+share/zoneinfo/Theory   		delete
+doc/3RDPARTY	(patch)
+distrib/sets/lists/base/mi			1.1164
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1539]
+



CVS commit: [netbsd-6-1] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 18:36:12 UTC 2018

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
Ticket #1539


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-6.1.6

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

Modified files:

Index: src/doc/CHANGES-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.131 src/doc/CHANGES-6.1.6:1.1.2.132
--- src/doc/CHANGES-6.1.6:1.1.2.131	Tue Mar 13 18:02:25 2018
+++ src/doc/CHANGES-6.1.6	Sun Mar 25 18:36:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.131 2018/03/13 18:02:25 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.132 2018/03/25 18:36:12 martin Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -15060,3 +15060,33 @@ sys/netipsec/ipsec_input.c			1.57-1.58
 	Fix out-of-bounds read.
 	[maxv, ticket #1536]
 
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/calendarsup to 1.1.1.1
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+	(with external/public-domain/tz/dist -> share/zoneinfo)
+share/zoneinfo/Theory   		delete
+doc/3RDPARTY	(patch)
+distrib/sets/lists/base/mi			1.1164
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1539]



CVS commit: xsrc/external/mit/xtrap/dist

2018-03-25 Thread Joerg Sonnenberger
Module Name:xsrc
Committed By:   joerg
Date:   Sun Mar 25 16:18:27 UTC 2018

Modified Files:
xsrc/external/mit/xtrap/dist: xtrapout.c

Log Message:
Don't cast around function types incorrectly, but adjust them as
appropiate.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xtrap/dist/xtrapout.c

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

Modified files:

Index: xsrc/external/mit/xtrap/dist/xtrapout.c
diff -u xsrc/external/mit/xtrap/dist/xtrapout.c:1.3 xsrc/external/mit/xtrap/dist/xtrapout.c:1.4
--- xsrc/external/mit/xtrap/dist/xtrapout.c:1.3	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapout.c	Sun Mar 25 16:18:27 2018
@@ -110,11 +110,11 @@ extern int opterr; 
 
 
 /* Forward declarations */
-static void SetGlobalDone (void );
+static void SetGlobalDone (int);
 static void print_req_callback (XETC *tc , XETrapDatum *data , 
-char *my_buf );
+unsigned char *my_buf );
 static void print_evt_callback (XETC *tc , XETrapDatum *data , 
-char *my_buf );
+unsigned char *my_buf );
 
 
 FILE *ofp;
@@ -126,14 +126,14 @@ XrmOptionDescRec optionTable [] = 
 {"-v", "*verbose",   XrmoptionSkipArg, (caddr_t) NULL},
 };
 
-static void SetGlobalDone(void)
+static void SetGlobalDone(int unused)
 {
 GlobalDone = 1L;
 fprintf(stderr,"Process Completed!\n");
 return;
 }
 
-static void print_req_callback(XETC *tc, XETrapDatum *data, char *my_buf)
+static void print_req_callback(XETC *tc, XETrapDatum *data, unsigned char *my_buf)
 {
 char *req_type;
 req_type = (data->u.req.reqType == XETrapGetExtOpcode(tc) ? "XTrap" :
@@ -143,7 +143,7 @@ static void print_req_callback(XETC *tc,
 (long)data->u.req.id);
 }
 
-static void print_evt_callback(XETC *tc, XETrapDatum *data, char *my_buf)
+static void print_evt_callback(XETC *tc, XETrapDatum *data, unsigned char *my_buf)
 {
 static Time last_time = 0;
 int delta;
@@ -274,8 +274,8 @@ main(int argc, char *argv[])
 XEPrintCurrent(stderr,_cur);
 
 /* Add signal handlers so that we clean up properly */
-_InitExceptionHandling((void_function)SetGlobalDone);
-(void)XEEnableCtrlKeys((void_function)SetGlobalDone);
+_InitExceptionHandling(SetGlobalDone);
+(void)XEEnableCtrlKeys(SetGlobalDone);
  
 XETrapAppWhileLoop(app,tc,);
 



CVS commit: [netbsd-7-0] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 14:12:19 UTC 2018

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
Ticket #1589


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.95 src/doc/CHANGES-7.0.3:1.1.2.96
--- src/doc/CHANGES-7.0.3:1.1.2.95	Wed Mar 21 11:11:29 2018
+++ src/doc/CHANGES-7.0.3	Sun Mar 25 14:12:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.95 2018/03/21 11:11:29 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.96 2018/03/25 14:12:19 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5330,3 +5330,30 @@ sys/sys/bitops.h1.12-1.14
 	the size of the bitmap type.
 	[mrg, ticket #1582]
 
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+doc/3RDPARTY	1.1506 (patch)
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1589]
+



CVS commit: [netbsd-7-1] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 14:10:23 UTC 2018

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.3

Log Message:
Ticket #1589


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-7.1.3

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

Modified files:

Index: src/doc/CHANGES-7.1.3
diff -u src/doc/CHANGES-7.1.3:1.1.2.2 src/doc/CHANGES-7.1.3:1.1.2.3
--- src/doc/CHANGES-7.1.3:1.1.2.2	Wed Mar 21 11:09:49 2018
+++ src/doc/CHANGES-7.1.3	Sun Mar 25 14:10:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.3,v 1.1.2.2 2018/03/21 11:09:49 martin Exp $
+# $NetBSD: CHANGES-7.1.3,v 1.1.2.3 2018/03/25 14:10:23 martin Exp $
 
 A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3
 release:
@@ -22,3 +22,30 @@ sys/sys/bitops.h1.12-1.14
 	the size of the bitmap type.
 	[mrg, ticket #1582]
 
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+doc/3RDPARTY	1.1506 (patch)
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1589]
+



CVS commit: [netbsd-7] src/doc

2018-03-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar 25 14:07:56 UTC 2018

Modified Files:
src/doc [netbsd-7]: 3RDPARTY CHANGES-7.2

Log Message:
Ticket #1589 - Updated tzdata to 2018d.


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.47 -r1.1145.2.48 src/doc/3RDPARTY
cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-7.2

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.1145.2.47 src/doc/3RDPARTY:1.1145.2.48
--- src/doc/3RDPARTY:1.1145.2.47	Sun Nov  5 20:42:18 2017
+++ src/doc/3RDPARTY	Sun Mar 25 14:07:56 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1145.2.47 2017/11/05 20:42:18 snj Exp $
+#	$NetBSD: 3RDPARTY,v 1.1145.2.48 2018/03/25 14:07:56 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1300,8 +1300,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2014j (+ upgraded zic) / tzdata2017c
-Current Vers:	tzcode2017c / tzdata2017c
+Version:	tzcode2014j (+ upgraded zic) / tzdata2017d
+Current Vers:	tzcode2017d / tzdata2017d
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.79 src/doc/CHANGES-7.2:1.1.2.80
--- src/doc/CHANGES-7.2:1.1.2.79	Wed Mar 21 12:19:30 2018
+++ src/doc/CHANGES-7.2	Sun Mar 25 14:07:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.79 2018/03/21 12:19:30 martin Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.80 2018/03/25 14:07:56 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5362,3 +5362,30 @@ usr.bin/audiocfg/audiodev.c			(patch)
 	in-kernel audio mixer)
 	[mrg, ticket #1588]
 
+external/public-domain/tz/dist/ziguard.awk  up to 1.1.1.1
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5
+external/public-domain/tz/dist/Makefile up to 1.1.1.20
+external/public-domain/tz/dist/NEWS up to 1.1.1.21
+external/public-domain/tz/dist/README   up to 1.1.1.6
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
+external/public-domain/tz/dist/africa   up to 1.1.1.14
+external/public-domain/tz/dist/antarctica   up to 1.1.1.10
+external/public-domain/tz/dist/asia up to 1.1.1.19
+external/public-domain/tz/dist/australasia  up to 1.1.1.14
+external/public-domain/tz/dist/backzone up to 1.1.1.14
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.9
+external/public-domain/tz/dist/europe   up to 1.1.1.20
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.10
+external/public-domain/tz/dist/northamerica up to 1.1.1.19
+external/public-domain/tz/dist/southamerica up to 1.1.1.14
+external/public-domain/tz/dist/theory.html  up to 1.1.1.3
+external/public-domain/tz/dist/version  up to 1.1.1.8
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.14
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.16
+doc/3RDPARTY	1.1506 (patch)
+
+	Updated tzdata to 2018d.
+	[kre, ticket #1589]
+



CVS commit: [pgoyette-compat] src/sys

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 10:38:51 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Include compat code in the modules


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.14 -r1.7.18.15 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/modules/compat_60/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/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.14 src/sys/compat/common/Makefile.sysio:1.7.18.15
--- src/sys/compat/common/Makefile.sysio:1.7.18.14	Sun Mar 25 09:16:07 2018
+++ src/sys/compat/common/Makefile.sysio	Sun Mar 25 10:38:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.14 2018/03/25 09:16:07 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.15 2018/03/25 10:38:51 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -64,4 +64,6 @@ SRCS+=	wsevent_50.c
 # x86-specific compatability code for NetBSD 6.0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=  -DCPU_UCODE
+.PATH:  ${S}/arch/x86/x86
+SRCS+=  compat_60_cpu_ucode.c
 .endif

Index: src/sys/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.10 src/sys/modules/compat_60/Makefile:1.1.2.11
--- src/sys/modules/compat_60/Makefile:1.1.2.10	Sun Mar 25 09:16:07 2018
+++ src/sys/modules/compat_60/Makefile	Sun Mar 25 10:38:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.10 2018/03/25 09:16:07 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.11 2018/03/25 10:38:51 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,11 +8,14 @@ KMOD=	compat_60
 
 CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 
+SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+	kern_cpu_60.c
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=	-DCPU_UCODE
-.endif
 
-SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
-	kern_cpu_60.c
+.PATH:	${S}/arch/x86/x86
+SRCS+=	compat_60_cpu_ucode.c
+.endif
 
 .include 



CVS commit: src/sys/dev/usb

2018-03-25 Thread Ryo ONODERA
Module Name:src
Committed By:   ryoon
Date:   Sun Mar 25 09:34:02 UTC 2018

Modified Files:
src/sys/dev/usb: uts.c

Log Message:
Add extra newline for normal message from uts(4)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uts.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/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.8 src/sys/dev/usb/uts.c:1.9
--- src/sys/dev/usb/uts.c:1.8	Sun Dec 10 17:03:07 2017
+++ src/sys/dev/usb/uts.c	Sun Mar 25 09:34:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uts.c,v 1.8 2017/12/10 17:03:07 bouyer Exp $	*/
+/*	$NetBSD: uts.c,v 1.9 2018/03/25 09:34:02 ryoon Exp $	*/
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.8 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.9 2018/03/25 09:34:02 ryoon Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -144,7 +144,7 @@ uts_attach(device_t parent, device_t sel
 	struct hid_data * d;
 	struct hid_item item;
 
-	aprint_naive("\n");
+	aprint_normal("\n");
 
 	sc->sc_hdev.sc_dev = self;
 	sc->sc_hdev.sc_intr = uts_intr;



CVS commit: [pgoyette-compat] src/sys

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 09:16:07 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Undo previous.  Clearly this is not the right thing to do!  The ucode
support should already be in the kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.13 -r1.7.18.14 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/modules/compat_60/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/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.13 src/sys/compat/common/Makefile.sysio:1.7.18.14
--- src/sys/compat/common/Makefile.sysio:1.7.18.13	Sun Mar 25 08:50:58 2018
+++ src/sys/compat/common/Makefile.sysio	Sun Mar 25 09:16:07 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.13 2018/03/25 08:50:58 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.14 2018/03/25 09:16:07 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -64,6 +64,4 @@ SRCS+=	wsevent_50.c
 # x86-specific compatability code for NetBSD 6.0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=  -DCPU_UCODE
-.PATH:	${S}/arch/x86/x86/
-SRCS+=	cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
 .endif

Index: src/sys/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.9 src/sys/modules/compat_60/Makefile:1.1.2.10
--- src/sys/modules/compat_60/Makefile:1.1.2.9	Sun Mar 25 08:50:58 2018
+++ src/sys/modules/compat_60/Makefile	Sun Mar 25 09:16:07 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.9 2018/03/25 08:50:58 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.10 2018/03/25 09:16:07 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,18 +8,11 @@ KMOD=	compat_60
 
 CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 
-SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
-	kern_cpu_60.c
-
-# x86-specific compatability code for NetBSD 6.0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-
 CPPFLAGS+=	-DCPU_UCODE
-
-.PATH:  ${S}/arch/x86/x86/
-
-SRCS+=  cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
-
 .endif
 
+SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+	kern_cpu_60.c
+
 .include 



CVS commit: [pgoyette-compat] src/doc

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:52:54 UTC 2018

Modified Files:
src/doc [pgoyette-compat]: COMPAT-branch-notes

Log Message:
Add reminder to deal with XEN for compat_60 cpu_ucode stuff


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/COMPAT-branch-notes

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

Modified files:

Index: src/doc/COMPAT-branch-notes
diff -u src/doc/COMPAT-branch-notes:1.1.2.5 src/doc/COMPAT-branch-notes:1.1.2.6
--- src/doc/COMPAT-branch-notes:1.1.2.5	Sat Mar 24 03:04:48 2018
+++ src/doc/COMPAT-branch-notes	Sun Mar 25 08:52:54 2018
@@ -45,3 +45,4 @@ TODO
COMPAT_70, most of COMPAT_60, and much of COMPAT_50 are finished.
Need to decide how to handle the COMPAT_BSDPTY stuff.
 
+3. XXX The compat_60 module still needs some work for XEN systems.



CVS commit: [pgoyette-compat] src/sys

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:50:58 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Include the cpu_ucode*.c files in the module for x86 machines


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.12 -r1.7.18.13 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/modules/compat_60/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/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.12 src/sys/compat/common/Makefile.sysio:1.7.18.13
--- src/sys/compat/common/Makefile.sysio:1.7.18.12	Sat Mar 24 23:52:19 2018
+++ src/sys/compat/common/Makefile.sysio	Sun Mar 25 08:50:58 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.12 2018/03/24 23:52:19 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.13 2018/03/25 08:50:58 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -60,3 +60,10 @@ SRCS+=	puffs_compat.c
 # wsevent compatability code for NetBSD 5.0
 .PATH:	${S}/dev/wscons
 SRCS+=	wsevent_50.c
+
+# x86-specific compatability code for NetBSD 6.0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+=  -DCPU_UCODE
+.PATH:	${S}/arch/x86/x86/
+SRCS+=	cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
+.endif

Index: src/sys/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.8 src/sys/modules/compat_60/Makefile:1.1.2.9
--- src/sys/modules/compat_60/Makefile:1.1.2.8	Sun Mar 25 08:17:42 2018
+++ src/sys/modules/compat_60/Makefile	Sun Mar 25 08:50:58 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.8 2018/03/25 08:17:42 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.9 2018/03/25 08:50:58 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,11 +8,18 @@ KMOD=	compat_60
 
 CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 
+SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+	kern_cpu_60.c
+
+# x86-specific compatability code for NetBSD 6.0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+
 CPPFLAGS+=	-DCPU_UCODE
-.endif
 
-SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
-	kern_cpu_60.c
+.PATH:  ${S}/arch/x86/x86/
+
+SRCS+=  cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
+
+.endif
 
 .include 



CVS commit: [pgoyette-compat] src/sys/arch/x86/x86

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:49:12 UTC 2018

Modified Files:
src/sys/arch/x86/x86 [pgoyette-compat]: cpu_ucode_amd.c
cpu_ucode_intel.c

Log Message:
Don't try to #include opt_*.h files when building kernel modules


To generate a diff of this commit:
cvs rdiff -u -r1.7.28.2 -r1.7.28.3 src/sys/arch/x86/x86/cpu_ucode_amd.c
cvs rdiff -u -r1.12.8.2 -r1.12.8.3 src/sys/arch/x86/x86/cpu_ucode_intel.c

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

Modified files:

Index: src/sys/arch/x86/x86/cpu_ucode_amd.c
diff -u src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.2 src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.3
--- src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.2	Thu Mar 22 01:44:47 2018
+++ src/sys/arch/x86/x86/cpu_ucode_amd.c	Sun Mar 25 08:49:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.7.28.2 2018/03/22 01:44:47 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.7.28.3 2018/03/25 08:49:12 pgoyette Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,10 +29,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.7.28.2 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.7.28.3 2018/03/25 08:49:12 pgoyette Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_xen.h"
 #include "opt_cpu_ucode.h"
+#endif
 
 #include 
 #include 

Index: src/sys/arch/x86/x86/cpu_ucode_intel.c
diff -u src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.2 src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.3
--- src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.2	Thu Mar 22 01:44:47 2018
+++ src/sys/arch/x86/x86/cpu_ucode_intel.c	Sun Mar 25 08:49:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_intel.c,v 1.12.8.2 2018/03/22 01:44:47 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode_intel.c,v 1.12.8.3 2018/03/25 08:49:12 pgoyette Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,10 +29,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.12.8.2 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.12.8.3 2018/03/25 08:49:12 pgoyette Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_xen.h"
 #include "opt_cpu_ucode.h"
+#endif
 
 #include 
 #include 



CVS commit: [pgoyette-compat] src/sys/kern

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:46:15 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: syscalls.c

Log Message:
Missed this in the regen


To generate a diff of this commit:
cvs rdiff -u -r1.310.2.4 -r1.310.2.5 src/sys/kern/syscalls.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/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.310.2.4 src/sys/kern/syscalls.c:1.310.2.5
--- src/sys/kern/syscalls.c:1.310.2.4	Sat Mar 17 06:50:55 2018
+++ src/sys/kern/syscalls.c	Sun Mar 25 08:46:14 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.310.2.4 2018/03/17 06:50:55 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.310.2.5 2018/03/25 08:46:14 pgoyette Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.4 2018/03/17 06:49:57 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.5 2018/03/25 07:19:13 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.4 2018/03/17 06:50:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.5 2018/03/25 08:46:14 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"



CVS commit: [pgoyette-compat] src/sys/modules/compat_60

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:17:42 UTC 2018

Modified Files:
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Add missing kern_cpu_60.c to the module


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/modules/compat_60/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/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.7 src/sys/modules/compat_60/Makefile:1.1.2.8
--- src/sys/modules/compat_60/Makefile:1.1.2.7	Sun Mar 18 21:41:31 2018
+++ src/sys/modules/compat_60/Makefile	Sun Mar 25 08:17:42 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.7 2018/03/18 21:41:31 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.8 2018/03/25 08:17:42 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -12,6 +12,7 @@ CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOM
 CPPFLAGS+=	-DCPU_UCODE
 .endif
 
-SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c
+SRCS+=	compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+	kern_cpu_60.c
 
 .include 



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

2018-03-25 Thread Anders Magnusson
Module Name:src
Committed By:   ragge
Date:   Sun Mar 25 08:13:20 UTC 2018

Modified Files:
src/sys/arch/vax/vax: ka780.c

Log Message:
Fix cpu type printout error.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/vax/ka780.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/vax/ka780.c
diff -u src/sys/arch/vax/vax/ka780.c:1.32 src/sys/arch/vax/vax/ka780.c:1.33
--- src/sys/arch/vax/vax/ka780.c:1.32	Thu Jul  7 06:55:39 2016
+++ src/sys/arch/vax/vax/ka780.c	Sun Mar 25 08:13:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $ */
+/*	$NetBSD: ka780.c,v 1.33 2018/03/25 08:13:20 ragge Exp $ */
 /*-
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.33 2018/03/25 08:13:20 ragge Exp $");
 
 #include 
 #include 
@@ -365,8 +365,8 @@ ka780_attach_cpu(device_t self)
 	struct ka78x * const ka78 = (void *)_cpudata;
 
 	aprint_normal(": KA%s, S/N %d(%d), hardware ECO level %d(%d)\n",
-	cpu_getmodel() + 8, ka78->snr, ka78->plant, ka78->eco >> 4, ka78->eco);
-	aprint_normal_dev(self, "4KB L1 cachen");
+	cpu_getmodel() + 7, ka78->snr, ka78->plant, ka78->eco >> 4, ka78->eco);
+	aprint_normal_dev(self, "4KB L1 cache");
 	if (mfpr(PR_ACCS) & 255) {
 		aprint_normal(", FPA present\n");
 		mtpr(0x8000, PR_ACCS);



CVS commit: [pgoyette-compat] src/sys/compat/common

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 08:03:26 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c

Log Message:
Now that we have a compat_80 module, make sure it is marked as "included"
in the monolithic compat module


To generate a diff of this commit:
cvs rdiff -u -r1.24.14.19 -r1.24.14.20 src/sys/compat/common/compat_mod.c

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

Modified files:

Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.19 src/sys/compat/common/compat_mod.c:1.24.14.20
--- src/sys/compat/common/compat_mod.c:1.24.14.19	Thu Mar 22 01:44:47 2018
+++ src/sys/compat/common/compat_mod.c	Sun Mar 25 08:03:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.19 2018/03/22 01:44:47 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.24.14.20 2018/03/25 08:03:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.19 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.20 2018/03/25 08:03:26 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -81,7 +81,7 @@ static struct sysctllog *compat_clog = N
 #endif
 
 static const char * const compat_includes[] = {
-	"compat_70", "compat_60", "compat_50", 
+	"compat_80", "compat_70", "compat_60", "compat_50", 
 	NULL
 };
 



CVS commit: [pgoyette-compat] src/sys

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 07:19:47 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: init_sysent.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump [pgoyette-compat]: rump_syscalls.h
src/sys/rump/librump/rumpkern [pgoyette-compat]: rump_syscalls.c
src/sys/sys [pgoyette-compat]: syscall.h syscallargs.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.319.2.4 -r1.319.2.5 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.27.2.4 -r1.27.2.5 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.29.2.4 -r1.29.2.5 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.108.2.4 -r1.108.2.5 \
src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.137.2.4 -r1.137.2.5 \
src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.304.2.4 -r1.304.2.5 src/sys/sys/syscall.h
cvs rdiff -u -r1.288.2.4 -r1.288.2.5 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.319.2.4 src/sys/kern/init_sysent.c:1.319.2.5
--- src/sys/kern/init_sysent.c:1.319.2.4	Sat Mar 17 06:50:55 2018
+++ src/sys/kern/init_sysent.c	Sun Mar 25 07:19:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.319.2.4 2018/03/17 06:50:55 pgoyette Exp $ */
+/* $NetBSD: init_sysent.c,v 1.319.2.5 2018/03/25 07:19:47 pgoyette Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.4 2018/03/17 06:49:57 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.5 2018/03/25 07:19:13 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.4 2018/03/17 06:50:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.5 2018/03/25 07:19:47 pgoyette Exp $");
 
 #include "opt_modular.h"
 #include "opt_ntp.h"
@@ -1595,26 +1595,26 @@ struct sysent sysent[] = {
 	{
 		ns(struct compat_60_sys_sa_register_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)compat_60(sys_sa_register)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 330 = compat_60_sa_register */
 	{
 		ns(struct compat_60_sys_sa_stacks_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)compat_60(sys_sa_stacks)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 331 = compat_60_sa_stacks */
 	{
-		.sy_call = (sy_call_t *)compat_60(sys_sa_enable)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 332 = compat_60_sa_enable */
 	{
 		ns(struct compat_60_sys_sa_setconcurrency_args),
-		.sy_call = (sy_call_t *)compat_60(sys_sa_setconcurrency)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 333 = compat_60_sa_setconcurrency */
 	{
-		.sy_call = (sy_call_t *)compat_60(sys_sa_yield)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 334 = compat_60_sa_yield */
 	{
 		ns(struct compat_60_sys_sa_preempt_args),
-		.sy_call = (sy_call_t *)compat_60(sys_sa_preempt)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 335 = compat_60_sa_preempt */
 	{
 		.sy_call = sys_nosys,

Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.27.2.4 src/sys/kern/syscalls_autoload.c:1.27.2.5
--- src/sys/kern/syscalls_autoload.c:1.27.2.4	Sat Mar 17 06:50:55 2018
+++ src/sys/kern/syscalls_autoload.c	Sun Mar 25 07:19:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.27.2.4 2018/03/17 06:50:55 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.27.2.5 2018/03/25 07:19:47 pgoyette Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.4 2018/03/17 06:49:57 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.5 2018/03/25 07:19:13 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27.2.4 2018/03/17 06:50:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27.2.5 2018/03/25 07:19:47 pgoyette Exp $");
 
 #include 
 static struct sc_autoload netbsd_syscalls_autoload[] = {
@@ -151,6 +151,12 @@ static struct sc_autoload netbsd_syscall
 	{ SYS_compat_50___msgctl13, "compat_sysv" },
 	{ SYS_compat_50___shmctl13, "compat_sysv" },
 	{ SYS_compat_50__lwp_park, "compat" },
+	{ SYS_compat_60_sa_register, "compat" },
+	{ SYS_compat_60_sa_stacks, "compat" },
+	{ SYS_compat_60_sa_enable, "compat" },
+	{ SYS_compat_60_sa_setconcurrency, "compat" },
+	{ SYS_compat_60_sa_yield, "compat" },
+	{ SYS_compat_60_sa_preempt, "compat" },
 	{ SYS_compat_50_kevent, "compat" },
 	{ SYS_compat_30_fhstatvfs1, "compat" },
 	{ SYS_compat_50_pselect, "compat" },

Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.29.2.4 src/sys/kern/systrace_args.c:1.29.2.5
--- src/sys/kern/systrace_args.c:1.29.2.4	Sat Mar 17 06:50:55 2018
+++ 

CVS commit: [pgoyette-compat] src/sys/kern

2018-03-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 25 07:19:13 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: syscalls.master

Log Message:
Since we're including the sa sysscalls in the compat_60 module code (even
if they are all implemented as no-ops), mark the master syscall list
appropriately.  Otherwise we fail to load the module.


To generate a diff of this commit:
cvs rdiff -u -r1.291.2.4 -r1.291.2.5 src/sys/kern/syscalls.master

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

Modified files:

Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.291.2.4 src/sys/kern/syscalls.master:1.291.2.5
--- src/sys/kern/syscalls.master:1.291.2.4	Sat Mar 17 06:49:57 2018
+++ src/sys/kern/syscalls.master	Sun Mar 25 07:19:13 2018
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.291.2.4 2018/03/17 06:49:57 pgoyette Exp $
+	$NetBSD: syscalls.master,v 1.291.2.5 2018/03/25 07:19:13 pgoyette Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -656,13 +656,19 @@
 328	UNIMPL
 329	UNIMPL
 ; SA system calls.
-330	COMPAT_60 	{ int|sys||sa_register(void *newv, void **oldv, \
+330	COMPAT_60 MODULAR compat	\
+		 	{ int|sys||sa_register(void *newv, void **oldv, \
 int flags, ssize_t stackinfo_offset); }
-331	COMPAT_60 	{ int|sys||sa_stacks(int num, stack_t *stacks); }
-332	COMPAT_60 	{ int|sys||sa_enable(void); }
-333	COMPAT_60 	{ int|sys||sa_setconcurrency(int concurrency); }
-334	COMPAT_60 	{ int|sys||sa_yield(void); }
-335	COMPAT_60 	{ int|sys||sa_preempt(int sa_id); }
+331	COMPAT_60 MODULAR compat	\
+			{ int|sys||sa_stacks(int num, stack_t *stacks); }
+332	COMPAT_60 MODULAR compat	\
+			{ int|sys||sa_enable(void); }
+333	COMPAT_60 MODULAR compat	\
+			{ int|sys||sa_setconcurrency(int concurrency); }
+334	COMPAT_60 MODULAR compat	\
+			{ int|sys||sa_yield(void); }
+335	COMPAT_60 MODULAR compat	\
+			{ int|sys||sa_preempt(int sa_id); }
 336	OBSOL 		sys_sa_unblockyield
 ;
 ; Syscalls 337-339 are reserved for other scheduler activation syscalls.