CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 06:46:43 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-i740/dist/src: i740_dga.c i740_driver.c
i740_video.c

Log Message:
merge xf86-video-i128 1.4.0 and xf86-video-i740 1.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c \
xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.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/xf86-video-i128/dist/src/i128_driver.c
diff -u xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.3 xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.4
--- xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.3	Sat Aug 20 05:00:58 2016
+++ xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c	Sat Dec 29 06:46:43 2018
@@ -38,9 +38,6 @@
 
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
@@ -53,7 +50,6 @@
 #include "micmap.h"
 
 #include "xf86DDC.h"
-#include "vbe.h"
 
 #include "xf86cmap.h"
 #include "fb.h"

Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.3 xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.4
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.3	Thu Jul 11 10:28:27 2013
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c	Sat Dec 29 06:46:43 2018
@@ -29,7 +29,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "vgaHW.h"
 #include "xf86xv.h"
 #include "i740.h"
Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.3 xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.4
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.3	Sun Jun  2 07:36:43 2013
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c	Sat Dec 29 06:46:43 2018
@@ -60,7 +60,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86fbman.h"
 #include "regionstr.h"

Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.5 xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.6
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.5	Thu Jul 23 01:19:16 2015
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c	Sat Dec 29 06:46:43 2018
@@ -780,7 +780,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags
 
 static Bool I740MapMem(ScrnInfoPtr pScrn)
 {
+#ifndef XSERVER_LIBPCIACCESS
   int mmioFlags;
+#endif
   I740Ptr pI740;
 
   pI740 = I740PTR(pScrn);

CVS import: xsrc/external/mit/xf86-video-chips/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 06:45:09 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-chips/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7111

Log Message:
initial import of xf86-video-chips-1.3.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-chips-1-3-0

U xsrc/external/mit/xf86-video-chips/dist/aclocal.m4
U xsrc/external/mit/xf86-video-chips/dist/INSTALL
U xsrc/external/mit/xf86-video-chips/dist/config.h.in
U xsrc/external/mit/xf86-video-chips/dist/README
U xsrc/external/mit/xf86-video-chips/dist/ChangeLog
U xsrc/external/mit/xf86-video-chips/dist/ltmain.sh
U xsrc/external/mit/xf86-video-chips/dist/configure.ac
U xsrc/external/mit/xf86-video-chips/dist/missing
U xsrc/external/mit/xf86-video-chips/dist/configure
U xsrc/external/mit/xf86-video-chips/dist/config.sub
U xsrc/external/mit/xf86-video-chips/dist/compile
U xsrc/external/mit/xf86-video-chips/dist/depcomp
U xsrc/external/mit/xf86-video-chips/dist/Makefile.in
U xsrc/external/mit/xf86-video-chips/dist/Makefile.am
U xsrc/external/mit/xf86-video-chips/dist/install-sh
U xsrc/external/mit/xf86-video-chips/dist/COPYING
U xsrc/external/mit/xf86-video-chips/dist/config.guess
U xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
U xsrc/external/mit/xf86-video-chips/dist/util/modClock.c
U xsrc/external/mit/xf86-video-chips/dist/util/dRegs.c
U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.in
U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.am
U xsrc/external/mit/xf86-video-chips/dist/util/mRegs.c
U xsrc/external/mit/xf86-video-chips/dist/util/iopl.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_pcirename.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_ddc.c
U xsrc/external/mit/xf86-video-chips/dist/src/ct_BlitMM.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
U xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_dga.c
U xsrc/external/mit/xf86-video-chips/dist/src/ct_regs.c
U xsrc/external/mit/xf86-video-chips/dist/src/ct_Blitter.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_cursor.c
C xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_shadow.c
U xsrc/external/mit/xf86-video-chips/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-chips/dist/src/ct_video.c
U xsrc/external/mit/xf86-video-chips/dist/src/ct_bank.c
U xsrc/external/mit/xf86-video-chips/dist/man/chips.man
U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.am

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-chips/dist

CVS import: xsrc/external/mit/xf86-video-i128/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 06:45:13 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-i128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13428

Log Message:
initial import of xf86-video-i128-1.4.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-i128-1-4-0

U xsrc/external/mit/xf86-video-i128/dist/COPYING
U xsrc/external/mit/xf86-video-i128/dist/ChangeLog
N xsrc/external/mit/xf86-video-i128/dist/compile
U xsrc/external/mit/xf86-video-i128/dist/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/INSTALL
U xsrc/external/mit/xf86-video-i128/dist/config.guess
U xsrc/external/mit/xf86-video-i128/dist/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/configure.ac
U xsrc/external/mit/xf86-video-i128/dist/missing
U xsrc/external/mit/xf86-video-i128/dist/depcomp
U xsrc/external/mit/xf86-video-i128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-i128/dist/config.sub
U xsrc/external/mit/xf86-video-i128/dist/configure
U xsrc/external/mit/xf86-video-i128/dist/install-sh
U xsrc/external/mit/xf86-video-i128/dist/config.h.in
U xsrc/external/mit/xf86-video-i128/dist/README
U xsrc/external/mit/xf86-video-i128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/man/i128.man
U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/src/i128.h
U xsrc/external/mit/xf86-video-i128/dist/src/i128pcirename.h
U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/src/i128init.c
U xsrc/external/mit/xf86-video-i128/dist/src/Ti302X.h
U xsrc/external/mit/xf86-video-i128/dist/src/IBMRGB.h
C xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
U xsrc/external/mit/xf86-video-i128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-i128/dist/src/i128exa.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128IBMDAC.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128reg.h
U xsrc/external/mit/xf86-video-i128/dist/src/i128accel.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128dga.c

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-i128/dist

CVS import: xsrc/external/mit/xf86-video-neomagic/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 06:45:22 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-neomagic/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29742

Log Message:
initial import of xf86-video-neomagic-1.3.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-neomagic-1-3-0

U xsrc/external/mit/xf86-video-neomagic/dist/aclocal.m4
U xsrc/external/mit/xf86-video-neomagic/dist/INSTALL
U xsrc/external/mit/xf86-video-neomagic/dist/config.h.in
U xsrc/external/mit/xf86-video-neomagic/dist/README
U xsrc/external/mit/xf86-video-neomagic/dist/ChangeLog
U xsrc/external/mit/xf86-video-neomagic/dist/NM-reg.txt
U xsrc/external/mit/xf86-video-neomagic/dist/ltmain.sh
U xsrc/external/mit/xf86-video-neomagic/dist/configure.ac
U xsrc/external/mit/xf86-video-neomagic/dist/missing
U xsrc/external/mit/xf86-video-neomagic/dist/configure
U xsrc/external/mit/xf86-video-neomagic/dist/compile
U xsrc/external/mit/xf86-video-neomagic/dist/config.sub
U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.am
U xsrc/external/mit/xf86-video-neomagic/dist/TODO
U xsrc/external/mit/xf86-video-neomagic/dist/install-sh
U xsrc/external/mit/xf86-video-neomagic/dist/COPYING
U xsrc/external/mit/xf86-video-neomagic/dist/config.guess
U xsrc/external/mit/xf86-video-neomagic/dist/depcomp
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_pcirename.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_shadow.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2200.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2070.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_cursor.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_reg.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2097.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_i2c.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_dga.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_driver.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2090.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_macros.h
U xsrc/external/mit/xf86-video-neomagic/dist/man/neomagic.man
U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/xf86-video-i740/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 06:45:17 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-i740/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8882

Log Message:
initial import of xf86-video-i740-1.4.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-i740-1-4-0

U xsrc/external/mit/xf86-video-i740/dist/COPYING
U xsrc/external/mit/xf86-video-i740/dist/ChangeLog
U xsrc/external/mit/xf86-video-i740/dist/compile
U xsrc/external/mit/xf86-video-i740/dist/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/INSTALL
U xsrc/external/mit/xf86-video-i740/dist/config.guess
U xsrc/external/mit/xf86-video-i740/dist/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/configure.ac
U xsrc/external/mit/xf86-video-i740/dist/missing
U xsrc/external/mit/xf86-video-i740/dist/depcomp
U xsrc/external/mit/xf86-video-i740/dist/ltmain.sh
U xsrc/external/mit/xf86-video-i740/dist/config.sub
U xsrc/external/mit/xf86-video-i740/dist/configure
U xsrc/external/mit/xf86-video-i740/dist/install-sh
U xsrc/external/mit/xf86-video-i740/dist/config.h.in
U xsrc/external/mit/xf86-video-i740/dist/README
U xsrc/external/mit/xf86-video-i740/dist/aclocal.m4
U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/man/i740.man
U xsrc/external/mit/xf86-video-i740/dist/src/i740_macros.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740.h
C xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
C xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_accel.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.h
U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/src/i740_pcirename.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740_reg.h
U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/src/i740_io.c
C xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_i2c.c
U xsrc/external/mit/xf86-video-i740/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740_cursor.c

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-i740/dist

CVS commit: src/sys/dev/usb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Dec 29 06:34:16 UTC 2018

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

Log Message:
Enable the same workaround as
USB_PRODUCT_MICROSOFT_24GHZ_XCVR20

For Microsoft Natural 6000 wheel.

Modified patch from Julian in kern/44634


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/ums.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/ums.c
diff -u src/sys/dev/usb/ums.c:1.91 src/sys/dev/usb/ums.c:1.92
--- src/sys/dev/usb/ums.c:1.91	Sun Dec 10 17:03:07 2017
+++ src/sys/dev/usb/ums.c	Sat Dec 29 06:34:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ums.c,v 1.91 2017/12/10 17:03:07 bouyer Exp $	*/
+/*	$NetBSD: ums.c,v 1.92 2018/12/29 06:34:16 maya Exp $	*/
 
 /*
  * Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.91 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.92 2018/12/29 06:34:16 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -171,6 +171,7 @@ ums_attach(device_t parent, device_t sel
 		switch (uha->uiaa->uiaa_product) {
 		case USB_PRODUCT_MICROSOFT_24GHZ_XCVR10:
 		case USB_PRODUCT_MICROSOFT_24GHZ_XCVR20:
+		case USB_PRODUCT_MICROSOFT_NATURAL_6000:
 			fixpos = 24;
 			break;
 		case USB_PRODUCT_MICROSOFT_CM6000:

CVS commit: src/sys/dev/usb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Dec 29 06:29:29 UTC 2018

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Fix typo in previous :)


To generate a diff of this commit:
cvs rdiff -u -r1.766 -r1.767 src/sys/dev/usb/usbdevs

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/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.766 src/sys/dev/usb/usbdevs:1.767
--- src/sys/dev/usb/usbdevs:1.766	Sat Dec 29 06:27:42 2018
+++ src/sys/dev/usb/usbdevs	Sat Dec 29 06:29:29 2018
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.766 2018/12/29 06:27:42 maya Exp $
+$NetBSD: usbdevs,v 1.767 2018/12/29 06:29:29 maya Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2292,12 +2292,12 @@ product MICROSOFT NATURALKBD	0x000b	Natu
 product MICROSOFT DDS80		0x0014	Digital Sound System 80
 product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
 product MICROSOFT INETPRO	0x001c	Internet Keyboard Pro
-product MICROSOFT NATURAL_6000	0x001e	Wireless Laser Mouse 6000 Receiver
 product MICROSOFT TBEXPLORER	0x0024	Trackball Explorer
 product MICROSOFT INTELLIEYE	0x0025	IntelliEye mouse
 product MICROSOFT INETPRO2	0x002b	Internet Keyboard Pro
 product MICROSOFT MN510		0x006e	MN510 Wireless
 product MICROSOFT MN110		0x007a	10/100 USB NIC
+product MICROSOFT NATURAL_6000	0x00e1	Wireless Laser Mouse 6000 Receiver
 product MICROSOFT XBOX_MEMORY_UNIT	0x0280	Xbox Memory Unit
 product MICROSOFT XBOX_DVD_PLAYBACK	0x0284	Xbox DVD Movie Playback Kit
 product MICROSOFT XBOX_CONTROLLER_S10	0x0285	Xbox Controller S (1.0)

CVS commit: src/sys/dev/usb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Dec 29 06:27:42 UTC 2018

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add Microsoft Natural Wireless Mouse 600.

Modified patches from Julian in PR kern/44634


To generate a diff of this commit:
cvs rdiff -u -r1.765 -r1.766 src/sys/dev/usb/usbdevs

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/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.765 src/sys/dev/usb/usbdevs:1.766
--- src/sys/dev/usb/usbdevs:1.765	Thu Dec 20 15:09:46 2018
+++ src/sys/dev/usb/usbdevs	Sat Dec 29 06:27:42 2018
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.765 2018/12/20 15:09:46 tih Exp $
+$NetBSD: usbdevs,v 1.766 2018/12/29 06:27:42 maya Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2292,6 +2292,7 @@ product MICROSOFT NATURALKBD	0x000b	Natu
 product MICROSOFT DDS80		0x0014	Digital Sound System 80
 product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
 product MICROSOFT INETPRO	0x001c	Internet Keyboard Pro
+product MICROSOFT NATURAL_6000	0x001e	Wireless Laser Mouse 6000 Receiver
 product MICROSOFT TBEXPLORER	0x0024	Trackball Explorer
 product MICROSOFT INTELLIEYE	0x0025	IntelliEye mouse
 product MICROSOFT INETPRO2	0x002b	Internet Keyboard Pro

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 06:23:50 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: md.sparc64

Log Message:
fix sets for binutils-2.31.1


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/distrib/sets/lists/comp/md.sparc64

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/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.202 src/distrib/sets/lists/comp/md.sparc64:1.203
--- src/distrib/sets/lists/comp/md.sparc64:1.202	Wed Dec 19 08:57:44 2018
+++ src/distrib/sets/lists/comp/md.sparc64	Sat Dec 29 01:23:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.202 2018/12/19 13:57:44 maxv Exp $
+# $NetBSD: md.sparc64,v 1.203 2018/12/29 06:23:50 christos Exp $
 ./usr/include/g++/bits/sparc			comp-c-include		compat
 ./usr/include/g++/bits/sparc/c++config.h	comp-c-include		gcc,compat
 ./usr/include/g++/bits/sparc64			comp-c-include		compat
@@ -181,8 +181,8 @@
 ./usr/libdata/ldscripts/elf64_sparc.xsw		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf64_sparc.xu		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf64_sparc.xw		comp-util-bin		binutils
-./usr/libdata/ldscripts/sparcnbsd.x		comp-util-bin		binutils
-./usr/libdata/ldscripts/sparcnbsd.xbn		comp-util-bin		binutils
-./usr/libdata/ldscripts/sparcnbsd.xn		comp-util-bin		binutils
-./usr/libdata/ldscripts/sparcnbsd.xr		comp-util-bin		binutils
-./usr/libdata/ldscripts/sparcnbsd.xu		comp-util-bin		binutils
+./usr/libdata/ldscripts/sparcnbsd.x		comp-util-bin		binutils=227
+./usr/libdata/ldscripts/sparcnbsd.xbn		comp-util-bin		binutils=227
+./usr/libdata/ldscripts/sparcnbsd.xn		comp-util-bin		binutils=227
+./usr/libdata/ldscripts/sparcnbsd.xr		comp-util-bin		binutils=227
+./usr/libdata/ldscripts/sparcnbsd.xu		comp-util-bin		binutils=227

CVS commit: src/sys/dev/sdmmc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec 29 04:59:33 UTC 2018

Modified Files:
src/sys/dev/sdmmc: sdmmcdevs.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sdmmc/sdmmcdevs.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/sdmmc/sdmmcdevs.h
diff -u src/sys/dev/sdmmc/sdmmcdevs.h:1.3 src/sys/dev/sdmmc/sdmmcdevs.h:1.4
--- src/sys/dev/sdmmc/sdmmcdevs.h:1.3	Thu Jun 28 13:31:57 2018
+++ src/sys/dev/sdmmc/sdmmcdevs.h	Sat Dec 29 04:59:33 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: sdmmcdevs.h,v 1.3 2018/06/28 13:31:57 jmcneill Exp $	*/
+/*	$NetBSD: sdmmcdevs.h,v 1.4 2018/12/29 04:59:33 thorpej Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		NetBSD: sdmmcdevs,v 1.3 2018/06/28 13:31:38 jmcneill Exp 
+ *		NetBSD: sdmmcdevs,v 1.4 2018/12/29 04:58:52 thorpej Exp 
  */
 /*	$OpenBSD: sdmmcdevs,v 1.8 2007/05/11 17:16:16 mglocker Exp $	*/
 
@@ -98,6 +98,8 @@
 /* Realtek */
 #define	SDMMC_CIS_REALTEK_RTL8703BS	{ NULL, NULL, NULL, NULL }
 #define	SDMMC_PRODUCT_REALTEK_RTL8703BS	0xb703
+#define	SDMMC_CIS_REALTEK_RTL8189FTV	{ NULL, NULL, NULL, NULL }
+#define	SDMMC_PRODUCT_REALTEK_RTL8189FTV	0xf179
 
 /* Ricoh */
 #define	SDMMC_CIS_RICOH_MMCREADER	{ NULL, NULL, NULL, NULL }

CVS commit: src/sys/dev/sdmmc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec 29 04:58:52 UTC 2018

Modified Files:
src/sys/dev/sdmmc: sdmmcdevs

Log Message:
Add ReakTek RTL8189FTV SDIO 802.11 interface.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sdmmc/sdmmcdevs

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/sdmmc/sdmmcdevs
diff -u src/sys/dev/sdmmc/sdmmcdevs:1.3 src/sys/dev/sdmmc/sdmmcdevs:1.4
--- src/sys/dev/sdmmc/sdmmcdevs:1.3	Thu Jun 28 13:31:38 2018
+++ src/sys/dev/sdmmc/sdmmcdevs	Sat Dec 29 04:58:52 2018
@@ -1,4 +1,4 @@
-	$NetBSD: sdmmcdevs,v 1.3 2018/06/28 13:31:38 jmcneill Exp $
+	$NetBSD: sdmmcdevs,v 1.4 2018/12/29 04:58:52 thorpej Exp $
 /*	$OpenBSD: sdmmcdevs,v 1.8 2007/05/11 17:16:16 mglocker Exp $	*/
 
 /*
@@ -73,6 +73,7 @@ product SOCKETCOM BTCARD	0x00c5	Socket B
 
 /* Realtek */
 product REALTEK RTL8703BS	0xb703	RTL8703BS Wireless LAN 802.11n SDIO
+product REALTEK RTL8189FTV	0xf179	RTL8189FTV Wireless LAN 802.11n SDIO
 
 /* Ricoh */
 product RICOH MMCREADER		0xe823  MMC card reader

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 04:51:04 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: ad.aarch64

Log Message:
fix for binutils-2.31.1


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/comp/ad.aarch64

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/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.26 src/distrib/sets/lists/comp/ad.aarch64:1.27
--- src/distrib/sets/lists/comp/ad.aarch64:1.26	Sun Dec 23 14:17:26 2018
+++ src/distrib/sets/lists/comp/ad.aarch64	Fri Dec 28 23:51:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.26 2018/12/23 19:17:26 christos Exp $
+# $NetBSD: ad.aarch64,v 1.27 2018/12/29 04:51:04 christos Exp $
 ./usr/include/aarch64comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -214,6 +214,9 @@
 ./usr/libdata/ldscripts/armelf.x		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xd		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelf.xdc		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelf.xdw		-unknown-		binutils=231
 ./usr/libdata/ldscripts/armelf.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xs		-unknown-		binutils
@@ -263,6 +266,9 @@
 ./usr/libdata/ldscripts/armelfb.x		-unknown-		binutils
 ./usr/libdata/ldscripts/armelfb.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelfb.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb.xd		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelfb.xdc		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelfb.xdw		-unknown-		binutils=231
 ./usr/libdata/ldscripts/armelfb.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelfb.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/armelfb.xs		-unknown-		binutils

CVS commit: src/sys/kern

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec 29 04:39:14 UTC 2018

Modified Files:
src/sys/kern: kern_threadpool.c

Log Message:
Expose the worker thread idle timeout via sysctl as "kern.threadpool.idle_ms".


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/kern_threadpool.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/kern_threadpool.c
diff -u src/sys/kern/kern_threadpool.c:1.13 src/sys/kern/kern_threadpool.c:1.14
--- src/sys/kern/kern_threadpool.c:1.13	Fri Dec 28 00:15:57 2018
+++ src/sys/kern/kern_threadpool.c	Sat Dec 29 04:39:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_threadpool.c,v 1.13 2018/12/28 00:15:57 thorpej Exp $	*/
+/*	$NetBSD: kern_threadpool.c,v 1.14 2018/12/29 04:39:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.13 2018/12/28 00:15:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_threadpool.c,v 1.14 2018/12/29 04:39:14 thorpej Exp $");
 
 #include 
 #include 
@@ -98,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_threadp
 #include 
 #include 
 #include 
+#include 
 #include 
 
 /* Data structures */
@@ -144,8 +145,8 @@ static pool_cache_t	threadpool_thread_pc
 
 static kmutex_t		threadpools_lock __cacheline_aligned;
 
-	/* Idle out threads after 30 seconds */
-#define	THREADPOOL_IDLE_TICKS	mstohz(30 * 1000)
+	/* Default to 30 second idle timeout for pool threads. */
+static int	threadpool_idle_time_ms = 30 * 1000;
 
 struct threadpool_unbound {
 	struct threadpool		tpu_pool;
@@ -226,6 +227,53 @@ threadpool_remove_percpu(struct threadpo
 #define	TP_LOG(x)		/* nothing */
 #endif /* THREADPOOL_VERBOSE */
 
+static int
+sysctl_kern_threadpool_idle_ms(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	int val, error;
+
+	node = *rnode;
+
+	val = threadpool_idle_time_ms;
+	node.sysctl_data = 
+	error = sysctl_lookup(SYSCTLFN_CALL());
+	if (error == 0 && newp != NULL) {
+		/* Disallow negative values and 0 (forever). */
+		if (val < 1)
+			error = EINVAL;
+		else
+			threadpool_idle_time_ms = val;
+	}
+
+	return error;
+}
+
+SYSCTL_SETUP_PROTO(sysctl_threadpool_setup);
+
+SYSCTL_SETUP(sysctl_threadpool_setup,
+"sysctl kern.threadpool subtree setup")
+{
+	const struct sysctlnode *rnode, *cnode;
+	int error __diagused;
+
+	error = sysctl_createv(clog, 0, NULL, ,
+	CTLFLAG_PERMANENT,
+	CTLTYPE_NODE, "threadpool",
+	SYSCTL_DESCR("threadpool subsystem options"),
+	NULL, 0, NULL, 0,
+	CTL_KERN, CTL_CREATE, CTL_EOL);
+	KASSERT(error == 0);
+
+	error = sysctl_createv(clog, 0, , ,
+	CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+	CTLTYPE_INT, "idle_ms",
+	SYSCTL_DESCR("idle thread timeout in ms"),
+	sysctl_kern_threadpool_idle_ms, 0, NULL, 0,
+	CTL_CREATE, CTL_EOL);
+	KASSERT(error == 0);
+}
+
 void
 threadpools_init(void)
 {
@@ -980,7 +1028,7 @@ threadpool_thread(void *arg)
 break;
 			}
 			if (cv_timedwait(>tpt_cv, >tp_lock,
-THREADPOOL_IDLE_TICKS))
+mstohz(threadpool_idle_time_ms)))
 break;
 		}
 		if (__predict_false(thread->tpt_job == NULL)) {

CVS commit: src/sys/external/bsd/gnu-efi/dist/gnuefi

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 04:05:47 UTC 2018

Modified Files:
src/sys/external/bsd/gnu-efi/dist/gnuefi: elf_aarch64_efi.lds

Log Message:
adjust for binutils 2.31.1


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds

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/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds
diff -u src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds:1.2
--- src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds:1.1.1.1	Thu Aug 16 14:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds	Fri Dec 28 23:05:47 2018
@@ -1,8 +1,15 @@
-/*	$NetBSD: elf_aarch64_efi.lds,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $	*/
+/*	$NetBSD: elf_aarch64_efi.lds,v 1.2 2018/12/29 04:05:47 christos Exp $	*/
 
 OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64")
 OUTPUT_ARCH(aarch64)
 ENTRY(_start)
+
+PHDRS
+{
+  text PT_LOAD;
+  headers PT_PHDR FILEHDR PHDRS;
+}
+
 SECTIONS
 {
   .text 0x0 : {
@@ -14,7 +21,7 @@ SECTIONS
 *(.srodata)
 *(.rodata*)
 . = ALIGN(16);
-  }
+  } :text
   _etext = .;
   _text_size = . - _text;
   .dynamic  : { *(.dynamic) }

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 01:22:57 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: ad.arm

Log Message:
What is bunutils?


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/comp/ad.arm

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/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.89 src/distrib/sets/lists/comp/ad.arm:1.90
--- src/distrib/sets/lists/comp/ad.arm:1.89	Fri Dec 28 20:08:14 2018
+++ src/distrib/sets/lists/comp/ad.arm	Fri Dec 28 20:22:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.89 2018/12/29 01:08:14 christos Exp $
+# $NetBSD: ad.arm,v 1.90 2018/12/29 01:22:57 christos Exp $
 ./usr/include/acorn26comp-obsolete		obsolete
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -688,9 +688,9 @@
 ./usr/libdata/ldscripts/armelf.x		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xc		-unknown-		binutils
-./usr/libdata/ldscripts/armelf.xd		-unknown-		bunutils=231
-./usr/libdata/ldscripts/armelf.xdc		-unknown-		bunutils=231
-./usr/libdata/ldscripts/armelf.xdw		-unknown-		bunutils=231
+./usr/libdata/ldscripts/armelf.xd		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelf.xdc		-unknown-		binutils=231
+./usr/libdata/ldscripts/armelf.xdw		-unknown-		binutils=231
 ./usr/libdata/ldscripts/armelf.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xs		-unknown-		binutils

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 01:08:14 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: ad.arm

Log Message:
adjust for binutils 2.31.1


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/ad.arm

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/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.88 src/distrib/sets/lists/comp/ad.arm:1.89
--- src/distrib/sets/lists/comp/ad.arm:1.88	Wed Aug 22 13:38:38 2018
+++ src/distrib/sets/lists/comp/ad.arm	Fri Dec 28 20:08:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.88 2018/08/22 17:38:38 christos Exp $
+# $NetBSD: ad.arm,v 1.89 2018/12/29 01:08:14 christos Exp $
 ./usr/include/acorn26comp-obsolete		obsolete
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -688,6 +688,9 @@
 ./usr/libdata/ldscripts/armelf.x		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xd		-unknown-		bunutils=231
+./usr/libdata/ldscripts/armelf.xdc		-unknown-		bunutils=231
+./usr/libdata/ldscripts/armelf.xdw		-unknown-		bunutils=231
 ./usr/libdata/ldscripts/armelf.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xs		-unknown-		binutils
@@ -696,6 +699,7 @@
 ./usr/libdata/ldscripts/armelf.xu		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf.xw		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf_nbsd.x		-unknown-		binutils
+
 ./usr/libdata/ldscripts/armelf_nbsd.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf_nbsd.xc		-unknown-		binutils
 ./usr/libdata/ldscripts/armelf_nbsd.xd		-unknown-		binutils
@@ -773,11 +777,11 @@
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xsw	-unknown-		binutils,eabi
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xu	-unknown-		binutils,eabi
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xw	-unknown-		binutils,eabi
-./usr/libdata/ldscripts/armnbsd.x		-unknown-		binutils
-./usr/libdata/ldscripts/armnbsd.xbn		-unknown-		binutils
-./usr/libdata/ldscripts/armnbsd.xn		-unknown-		binutils
-./usr/libdata/ldscripts/armnbsd.xr		-unknown-		binutils
-./usr/libdata/ldscripts/armnbsd.xu		-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.x		-unknown-		binutils=227
+./usr/libdata/ldscripts/armnbsd.xbn		-unknown-		binutils=227
+./usr/libdata/ldscripts/armnbsd.xn		-unknown-		binutils=227
+./usr/libdata/ldscripts/armnbsd.xr		-unknown-		binutils=227
+./usr/libdata/ldscripts/armnbsd.xu		-unknown-		binutils=227
 ./usr/libdata/lint/llib-larm.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-larm32.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lpmc.ln			comp-obsolete		obsolete

CVS commit: src/distrib/common

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Sat Dec 29 01:04:39 UTC 2018

Modified Files:
src/distrib/common: cgdroot.rc

Log Message:
Break the loop after a successful mount.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/common/cgdroot.rc

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

Modified files:

Index: src/distrib/common/cgdroot.rc
diff -u src/distrib/common/cgdroot.rc:1.2 src/distrib/common/cgdroot.rc:1.3
--- src/distrib/common/cgdroot.rc:1.2	Sat Dec 29 00:52:11 2018
+++ src/distrib/common/cgdroot.rc	Sat Dec 29 01:04:38 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: cgdroot.rc,v 1.2 2018/12/29 00:52:11 alnsn Exp $
+#	$NetBSD: cgdroot.rc,v 1.3 2018/12/29 01:04:38 alnsn Exp $
 #
 # Copyright (c) 2013 Pierre Pronchery 
 # All rights reserved.
@@ -40,6 +40,7 @@ mounted=
 for dev in NAME=cgd.conf ROOT.a ; do
 	if mount -o ro $dev /etc/cgd 2>/dev/null ; then
 		mounted=$dev
+		break
 	fi
 done
 if [ -z "$mounted" ]; then

CVS commit: src/distrib/common

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Sat Dec 29 00:52:11 UTC 2018

Modified Files:
src/distrib/common: cgdroot.rc

Log Message:
Don't hardcode wd0a in cgdroot.kmod, try NAME=cgd.conf and ROOT.a.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/common/cgdroot.rc

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

Modified files:

Index: src/distrib/common/cgdroot.rc
diff -u src/distrib/common/cgdroot.rc:1.1 src/distrib/common/cgdroot.rc:1.2
--- src/distrib/common/cgdroot.rc:1.1	Mon Jul 15 00:25:38 2013
+++ src/distrib/common/cgdroot.rc	Sat Dec 29 00:52:11 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: cgdroot.rc,v 1.1 2013/07/15 00:25:38 khorben Exp $
+#	$NetBSD: cgdroot.rc,v 1.2 2018/12/29 00:52:11 alnsn Exp $
 #
 # Copyright (c) 2013 Pierre Pronchery 
 # All rights reserved.
@@ -36,8 +36,13 @@ export EDITOR
 
 umask 022
 
-mount -o ro /dev/wd0a /etc/cgd
-if [ $? -ne 0 ]; then
+mounted=
+for dev in NAME=cgd.conf ROOT.a ; do
+	if mount -o ro $dev /etc/cgd 2>/dev/null ; then
+		mounted=$dev
+	fi
+done
+if [ -z "$mounted" ]; then
 	echo "Could not mount the boot partition" 1>&2
 	exit 2
 fi

CVS commit: src/sys/arch/acorn32/stand

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 29 00:35:21 UTC 2018

Modified Files:
src/sys/arch/acorn32/stand: module.ldscript

Log Message:
Adjust for binutils-2.31.1


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/stand/module.ldscript

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/acorn32/stand/module.ldscript
diff -u src/sys/arch/acorn32/stand/module.ldscript:1.1 src/sys/arch/acorn32/stand/module.ldscript:1.2
--- src/sys/arch/acorn32/stand/module.ldscript:1.1	Tue Mar 28 15:45:46 2006
+++ src/sys/arch/acorn32/stand/module.ldscript	Fri Dec 28 19:35:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module.ldscript,v 1.1 2006/03/28 20:45:46 bjh21 Exp $ */
+/* $NetBSD: module.ldscript,v 1.2 2018/12/29 00:35:21 christos Exp $ */
 
 /* linker script for generating RISC OS relocatable modules */
 /*
@@ -10,9 +10,15 @@
 
 OUTPUT_ARCH(arm)
 
+PHDRS
+{
+  text PT_LOAD;
+  headers PT_PHDR FILEHDR PHDRS;
+}
+
 SECTIONS
 {
-  .text		: { *(.text) *(.gnu.warning) }
+  .text		: { *(.text) *(.gnu.warning) } :text
   _etext = .;
   PROVIDE (etext = .);
   .rodata	: { *(.rodata) }
@@ -24,4 +30,4 @@ SECTIONS
   .bss		: { *(.bss) *(COMMON) }
   _end = .;
   PROVIDE (end = .);
-}
\ No newline at end of file
+}

CVS commit: src/usr.sbin/screenblank

[David H. Gutteridge]

Module Name:src
Committed By:   gutteridge
Date:   Fri Dec 28 23:53:35 UTC 2018

Modified Files:
src/usr.sbin/screenblank: screenblank.1

Log Message:
Add caveats section to the screenblank(1) man page to note issues will
arise if /dev is on a file system mounted with noatime or nodevmtime.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/screenblank/screenblank.1

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/screenblank/screenblank.1
diff -u src/usr.sbin/screenblank/screenblank.1:1.15 src/usr.sbin/screenblank/screenblank.1:1.16
--- src/usr.sbin/screenblank/screenblank.1:1.15	Wed Apr 30 13:11:02 2008
+++ src/usr.sbin/screenblank/screenblank.1	Fri Dec 28 23:53:35 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: screenblank.1,v 1.15 2008/04/30 13:11:02 martin Exp $
+.\"	$NetBSD: screenblank.1,v 1.16 2018/12/28 23:53:35 gutteridge Exp $
 .\"
 .\" Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 23, 2006
+.Dd December 28, 2018
 .Dt SCREENBLANK 1
 .Os
 .Sh NAME
@@ -116,3 +116,12 @@ The console device for wscons machines.
 File containing the pid of
 .Nm .
 .El
+.Sh CAVEATS
+.Nm
+checks the access and modification times of the devices it is
+monitoring to determine activity. If the devices are on a file system
+mounted with the
+.Cm noatime
+and/or
+.Cm nodevmtime
+options, it will not function as expected.

CVS commit: src/sys/dev/usb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 28 22:55:20 UTC 2018

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

Log Message:
Define DPRINTF() as __nothing when !USB_DEBUG. Drop excess braces.

No functional changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/if_mue.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/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.25 src/sys/dev/usb/if_mue.c:1.26
--- src/sys/dev/usb/if_mue.c:1.25	Sat Dec 22 16:58:51 2018
+++ src/sys/dev/usb/if_mue.c	Fri Dec 28 22:55:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.26 2018/12/28 22:55:20 rin Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $	*/
 
 /*
@@ -20,7 +20,7 @@
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.26 2018/12/28 22:55:20 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -76,7 +76,7 @@ int muedebug = 0;
 			MUE_PRINTF(sc, fmt, ##args);			\
 	} while (0 /* CONSTCOND */)
 #else
-#define DPRINTF(sc, fmt, args...)	/* nothing */
+#define DPRINTF(sc, fmt, args...)	__nothing
 #endif
 
 /*
@@ -657,12 +657,10 @@ mue_init_ltm(struct mue_softc *sc)
 goto done;
 			}
 			DPRINTF(sc, "success\n");
-		} else {
+		} else
 			DPRINTF(sc, "nothing to do\n");
-		}
-	} else {
+	} else
 		DPRINTF(sc, "nothing to do\n");
-	}
 done:
 	for (i = 0; i < __arraycount(idx); i++)
 		mue_csr_write(sc, MUE_LTM_INDEX(i), idx[i]);
@@ -823,30 +821,27 @@ mue_get_macaddr(struct mue_softc *sc, pr
 		sc->mue_enaddr[0] = (uint8_t)((low) & 0xff);
 		if (ETHER_IS_VALID(sc->mue_enaddr))
 			return 0;
-		else {
+		else
 			DPRINTF(sc, "registers: %s\n",
 			ether_sprintf(sc->mue_enaddr));
-		}
 	}
 
 	if (mue_eeprom_present(sc) && !mue_read_eeprom(sc, sc->mue_enaddr,
 	MUE_E2P_MAC_OFFSET, ETHER_ADDR_LEN)) {
 		if (ETHER_IS_VALID(sc->mue_enaddr))
 			return 0;
-		else {
+		else
 			DPRINTF(sc, "EEPROM: %s\n",
 			ether_sprintf(sc->mue_enaddr));
-		}
 	}
 
 	if (mue_read_otp(sc, sc->mue_enaddr, MUE_OTP_MAC_OFFSET,
 	ETHER_ADDR_LEN) == 0) {
 		if (ETHER_IS_VALID(sc->mue_enaddr))
 			return 0;
-		else {
+		else
 			DPRINTF(sc, "OTP: %s\n",
 			ether_sprintf(sc->mue_enaddr));
-		}
 	}
 
 	/*
@@ -862,10 +857,9 @@ mue_get_macaddr(struct mue_softc *sc, pr
 		ETHER_ADDR_LEN);
 		if (ETHER_IS_VALID(sc->mue_enaddr))
 			return 0;
-		else {
+		else
 			DPRINTF(sc, "prop_dictionary_get: %s\n",
 			ether_sprintf(sc->mue_enaddr));
-		}
 	}
 
 	return 1;
@@ -1334,11 +1328,10 @@ mue_setmulti(struct mue_softc *sc)
 		rxfilt |= MUE_RFE_CTL_UNICAST;
 allmulti:	rxfilt |= MUE_RFE_CTL_MULTICAST;
 		ifp->if_flags |= IFF_ALLMULTI;
-		if (ifp->if_flags & IFF_PROMISC) {
+		if (ifp->if_flags & IFF_PROMISC)
 			DPRINTF(sc, "promisc\n");
-		} else {
+		else
 			DPRINTF(sc, "allmulti\n");
-		}
 	} else {
 		/* Now program new ones. */
 		pfiltbl[0][0] = MUE_ENADDR_HI(enaddr) | MUE_ADDR_FILTX_VALID;
@@ -1370,11 +1363,10 @@ allmulti:	rxfilt |= MUE_RFE_CTL_MULTICAS
 		}
 		rxfilt |= MUE_RFE_CTL_PERFECT;
 		ifp->if_flags &= ~IFF_ALLMULTI;
-		if (rxfilt & MUE_RFE_CTL_MULTICAST_HASH) {
+		if (rxfilt & MUE_RFE_CTL_MULTICAST_HASH)
 			DPRINTF(sc, "perfect filter and hash tables\n");
-		} else {
+		else
 			DPRINTF(sc, "perfect filter\n");
-		}
 	}
 
 	for (i = 0; i < MUE_NUM_ADDR_FILTX; i++) {

CVS commit: xsrc/external/mit/xdpyinfo/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:18:13 UTC 2018

Modified Files:
xsrc/external/mit/xdpyinfo/include: config.h

Log Message:
commit missing update from xdpyinfo 1.3.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xdpyinfo/include/config.h

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/xdpyinfo/include/config.h
diff -u xsrc/external/mit/xdpyinfo/include/config.h:1.1 xsrc/external/mit/xdpyinfo/include/config.h:1.2
--- xsrc/external/mit/xdpyinfo/include/config.h:1.1	Fri May 31 06:47:44 2013
+++ xsrc/external/mit/xdpyinfo/include/config.h	Fri Dec 28 22:18:12 2018
@@ -95,7 +95,7 @@
 #define PACKAGE_NAME "xdpyinfo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xdpyinfo 1.3.1"
+#define PACKAGE_STRING "xdpyinfo 1.3.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xdpyinfo"
@@ -104,7 +104,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.1"
+#define PACKAGE_VERSION "1.3.2"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -113,10 +113,10 @@
 #define PACKAGE_VERSION_MINOR 3
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 1
+#define PACKAGE_VERSION_PATCHLEVEL 2
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.3.1"
+#define VERSION "1.3.2"

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:16:48 UTC 2018

Modified Files:
xsrc/external/mit/libXScrnSaver/dist/src: XScrnSaver.c
xsrc/external/mit/libXinerama/dist/src: Xinerama.c
xsrc/external/mit/libxcb/dist/src: xcb_in.c
xsrc/external/mit/libxcb/include: config.h

Log Message:
merge libxcb 1.13.1, libXinerama 1.1.4, and libXScrnSaver 1.2.3.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXinerama/dist/src/Xinerama.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libxcb/include/config.h

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/libXScrnSaver/dist/src/XScrnSaver.c
diff -u xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.3 xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.4
--- xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.3	Mon Jun  3 04:37:59 2013
+++ xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c	Fri Dec 28 22:16:48 2018
@@ -102,7 +102,7 @@ static Bool wire_to_event (
 	se->send_event = (sevent->type & 0x80) != 0;
 	se->display = dpy;
 	se->window = sevent->window;
-	se->window = sevent->root;
+	se->root = sevent->root;
 	se->state = sevent->state;
 	se->kind = sevent->kind;
 	se->forced = True;

Index: xsrc/external/mit/libXinerama/dist/src/Xinerama.c
diff -u xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.4 xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.5
--- xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.4	Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXinerama/dist/src/Xinerama.c	Fri Dec 28 22:16:48 2018
@@ -35,20 +35,6 @@ Equipment Corporation.
 #include 
 #include 
 
-#ifndef HAVE__XEATDATAWORDS
-#include   /* for LONG64 on 64-bit platforms */
-#include 
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-if (n >= (ULONG_MAX >> 2))
-_XIOError(dpy);
-# endif
-_XEatData (dpy, n << 2);
-}
-#endif
-
 static XExtensionInfo _panoramiX_ext_info_data;
 static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
 static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
@@ -300,6 +286,7 @@ XineramaQueryScreens(
 if (!_XReply (dpy, (xReply *) , 0, xFalse)) {
 	UnlockDisplay (dpy);
 	SyncHandle ();
+	*number = 0;
 	return NULL;
 }
 

Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6	Wed Mar 14 06:43:45 2018
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c	Fri Dec 28 22:16:48 2018
@@ -958,8 +958,20 @@ void _xcb_in_replies_done(xcb_connection
 pend = container_of(c->in.pending_replies_tail, struct pending_reply, next);
 if(pend->workaround == WORKAROUND_EXTERNAL_SOCKET_OWNER)
 {
-pend->last_request = c->out.request;
-pend->workaround = WORKAROUND_NONE;
+if (XCB_SEQUENCE_COMPARE(pend->first_request, <=, c->out.request)) {
+pend->last_request = c->out.request;
+pend->workaround = WORKAROUND_NONE;
+} else {
+/* The socket was taken, but no requests were actually sent
+ * so just discard the pending_reply that was created.
+ */
+struct pending_reply **prev_next = >in.pending_replies;
+while (*prev_next != pend)
+prev_next = &(*prev_next)->next;
+*prev_next = NULL;
+c->in.pending_replies_tail = prev_next;
+free(pend);
+}
 }
 }
 }

Index: xsrc/external/mit/libxcb/include/config.h
diff -u xsrc/external/mit/libxcb/include/config.h:1.8 xsrc/external/mit/libxcb/include/config.h:1.9
--- xsrc/external/mit/libxcb/include/config.h:1.8	Wed Mar 14 06:43:45 2018
+++ xsrc/external/mit/libxcb/include/config.h	Fri Dec 28 22:16:48 2018
@@ -75,7 +75,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.13"
+#define PACKAGE_STRING "libxcb 1.13.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -84,7 +84,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.13"
+#define PACKAGE_VERSION "1.13.1"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -93,7 +93,7 @@
 #define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -124,7 +124,7 @@
 
 
 /* 

CVS import: xsrc/external/mit/libxcb/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:14:54 UTC 2018

Update of /cvsroot/xsrc/external/mit/libxcb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3312

Log Message:
initial import of libxcb-1.13.1

Status:

Vendor Tag: xorg
Release Tags:   libxcb-1-13-1

U xsrc/external/mit/libxcb/dist/INSTALL
U xsrc/external/mit/libxcb/dist/NEWS
U xsrc/external/mit/libxcb/dist/check-pc-requires
U xsrc/external/mit/libxcb/dist/autogen.sh
U xsrc/external/mit/libxcb/dist/README
U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in
U xsrc/external/mit/libxcb/dist/ChangeLog
U xsrc/external/mit/libxcb/dist/COPYING
U xsrc/external/mit/libxcb/dist/xcb.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in
U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in
U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in
U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in
U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in
U xsrc/external/mit/libxcb/dist/xcb-present.pc.in
U xsrc/external/mit/libxcb/dist/xcb-res.pc.in
U xsrc/external/mit/libxcb/dist/xcb-render.pc.in
U xsrc/external/mit/libxcb/dist/xcb-record.pc.in
U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in
U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in
U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in
U xsrc/external/mit/libxcb/dist/xcb-ge.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in
U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in
U xsrc/external/mit/libxcb/dist/Makefile.in
U xsrc/external/mit/libxcb/dist/aclocal.m4
U xsrc/external/mit/libxcb/dist/configure.ac
U xsrc/external/mit/libxcb/dist/configure
U xsrc/external/mit/libxcb/dist/Makefile.am
U xsrc/external/mit/libxcb/dist/man/xcb-requests.man
U xsrc/external/mit/libxcb/dist/man/xcb-examples.man
U xsrc/external/mit/libxcb/dist/man/Makefile.in
U xsrc/external/mit/libxcb/dist/man/Makefile.am
U xsrc/external/mit/libxcb/dist/doc/xkb_internals
U xsrc/external/mit/libxcb/dist/doc/xkb_issues
U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.am
U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html
U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css
U xsrc/external/mit/libxcb/dist/tests/check_public.c
U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl
U xsrc/external/mit/libxcb/dist/tests/check_suites.h
U xsrc/external/mit/libxcb/dist/tests/check_all.c
U xsrc/external/mit/libxcb/dist/tests/Makefile.in
U xsrc/external/mit/libxcb/dist/tests/Makefile.am
U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h
U xsrc/external/mit/libxcb/dist/src/c_client.py
U xsrc/external/mit/libxcb/dist/src/xcb_auth.c
U xsrc/external/mit/libxcb/dist/src/xcb_util.c
U xsrc/external/mit/libxcb/dist/src/xcb_list.c
U xsrc/external/mit/libxcb/dist/src/xcb_xid.c
U xsrc/external/mit/libxcb/dist/src/xcb_ext.c
C xsrc/external/mit/libxcb/dist/src/xcb_in.c
U xsrc/external/mit/libxcb/dist/src/xcb_out.c
U xsrc/external/mit/libxcb/dist/src/xcb_conn.c
U xsrc/external/mit/libxcb/dist/src/config.h.in
U xsrc/external/mit/libxcb/dist/src/Makefile.in
U xsrc/external/mit/libxcb/dist/src/Makefile.am
U xsrc/external/mit/libxcb/dist/src/xcbext.h
U xsrc/external/mit/libxcb/dist/src/xcb.h
U xsrc/external/mit/libxcb/dist/src/xcbint.h
U xsrc/external/mit/libxcb/dist/tools/constants
U xsrc/external/mit/libxcb/dist/tools/api_conv.pl
U xsrc/external/mit/libxcb/dist/tools/README
U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libxcb/dist/m4/xcb.m4
U xsrc/external/mit/libxcb/dist/m4/ltversion.m4
U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4
U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4
U xsrc/external/mit/libxcb/dist/m4/libtool.m4
U xsrc/external/mit/libxcb/dist/build-aux/test-driver
U xsrc/external/mit/libxcb/dist/build-aux/depcomp
U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh
U xsrc/external/mit/libxcb/dist/build-aux/missing
U xsrc/external/mit/libxcb/dist/build-aux/install-sh
U xsrc/external/mit/libxcb/dist/build-aux/config.sub
U xsrc/external/mit/libxcb/dist/build-aux/config.guess
U xsrc/external/mit/libxcb/dist/build-aux/compile

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

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxcb/dist

CVS import: xsrc/external/mit/libXinerama/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:14:47 UTC 2018

Update of /cvsroot/xsrc/external/mit/libXinerama/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12887

Log Message:
initial import of libXinerama-1.1.4

Status:

Vendor Tag: xorg
Release Tags:   libXinerama-1-1-4

U xsrc/external/mit/libXinerama/dist/xinerama.pc.in
U xsrc/external/mit/libXinerama/dist/Makefile.am
U xsrc/external/mit/libXinerama/dist/configure
U xsrc/external/mit/libXinerama/dist/configure.ac
U xsrc/external/mit/libXinerama/dist/aclocal.m4
U xsrc/external/mit/libXinerama/dist/Makefile.in
U xsrc/external/mit/libXinerama/dist/config.h.in
U xsrc/external/mit/libXinerama/dist/ChangeLog
U xsrc/external/mit/libXinerama/dist/COPYING
U xsrc/external/mit/libXinerama/dist/config.guess
U xsrc/external/mit/libXinerama/dist/INSTALL
U xsrc/external/mit/libXinerama/dist/README
N xsrc/external/mit/libXinerama/dist/compile
U xsrc/external/mit/libXinerama/dist/config.sub
U xsrc/external/mit/libXinerama/dist/install-sh
U xsrc/external/mit/libXinerama/dist/ltmain.sh
U xsrc/external/mit/libXinerama/dist/missing
U xsrc/external/mit/libXinerama/dist/depcomp
U xsrc/external/mit/libXinerama/dist/src/Makefile.am
U xsrc/external/mit/libXinerama/dist/src/Makefile.in
C xsrc/external/mit/libXinerama/dist/src/Xinerama.c
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/panoramiXext.h
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/Xinerama.h
U xsrc/external/mit/libXinerama/dist/man/Makefile.am
U xsrc/external/mit/libXinerama/dist/man/Makefile.in
U xsrc/external/mit/libXinerama/dist/man/Xinerama.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryExtension.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryVersion.man
U xsrc/external/mit/libXinerama/dist/man/XineramaIsActive.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryScreens.man

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

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXinerama/dist

CVS import: xsrc/external/mit/libXScrnSaver/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:14:43 UTC 2018

Update of /cvsroot/xsrc/external/mit/libXScrnSaver/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv715

Log Message:
initial import of libXScrnSaver-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   libXScrnSaver-1-2-3

U xsrc/external/mit/libXScrnSaver/dist/xscrnsaver.pc.in
U xsrc/external/mit/libXScrnSaver/dist/Makefile.am
U xsrc/external/mit/libXScrnSaver/dist/configure
U xsrc/external/mit/libXScrnSaver/dist/configure.ac
U xsrc/external/mit/libXScrnSaver/dist/aclocal.m4
U xsrc/external/mit/libXScrnSaver/dist/Makefile.in
U xsrc/external/mit/libXScrnSaver/dist/config.h.in
U xsrc/external/mit/libXScrnSaver/dist/ChangeLog
U xsrc/external/mit/libXScrnSaver/dist/COPYING
U xsrc/external/mit/libXScrnSaver/dist/config.guess
U xsrc/external/mit/libXScrnSaver/dist/INSTALL
U xsrc/external/mit/libXScrnSaver/dist/README
N xsrc/external/mit/libXScrnSaver/dist/compile
U xsrc/external/mit/libXScrnSaver/dist/config.sub
U xsrc/external/mit/libXScrnSaver/dist/install-sh
U xsrc/external/mit/libXScrnSaver/dist/ltmain.sh
U xsrc/external/mit/libXScrnSaver/dist/missing
U xsrc/external/mit/libXScrnSaver/dist/depcomp
U xsrc/external/mit/libXScrnSaver/dist/src/Makefile.am
U xsrc/external/mit/libXScrnSaver/dist/src/Makefile.in
C xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
U xsrc/external/mit/libXScrnSaver/dist/include/X11/extensions/scrnsaver.h
U xsrc/external/mit/libXScrnSaver/dist/man/Makefile.am
U xsrc/external/mit/libXScrnSaver/dist/man/Makefile.in
U xsrc/external/mit/libXScrnSaver/dist/man/Xss.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverQueryExtension.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverQueryVersion.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverAllocInfo.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverQueryInfo.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverSelectInput.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverSetAttributes.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverUnsetAttributes.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverRegister.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverUnregister.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverGetRegistered.man
U xsrc/external/mit/libXScrnSaver/dist/man/XScreenSaverSuspend.man

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/libXScrnSaver/dist

CVS import: xsrc/external/mit/libXxf86misc/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 22:14:50 UTC 2018

Update of /cvsroot/xsrc/external/mit/libXxf86misc/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5859

Log Message:
initial import of libXxf86misc-1.0.4

Status:

Vendor Tag: xorg
Release Tags:   libXxf86misc-1-0-4

U xsrc/external/mit/libXxf86misc/dist/xxf86misc.pc.in
U xsrc/external/mit/libXxf86misc/dist/Makefile.am
U xsrc/external/mit/libXxf86misc/dist/configure
U xsrc/external/mit/libXxf86misc/dist/configure.ac
U xsrc/external/mit/libXxf86misc/dist/aclocal.m4
U xsrc/external/mit/libXxf86misc/dist/Makefile.in
U xsrc/external/mit/libXxf86misc/dist/ChangeLog
U xsrc/external/mit/libXxf86misc/dist/COPYING
U xsrc/external/mit/libXxf86misc/dist/config.guess
U xsrc/external/mit/libXxf86misc/dist/INSTALL
U xsrc/external/mit/libXxf86misc/dist/README
N xsrc/external/mit/libXxf86misc/dist/compile
U xsrc/external/mit/libXxf86misc/dist/depcomp
U xsrc/external/mit/libXxf86misc/dist/config.sub
U xsrc/external/mit/libXxf86misc/dist/install-sh
U xsrc/external/mit/libXxf86misc/dist/ltmain.sh
U xsrc/external/mit/libXxf86misc/dist/missing
U xsrc/external/mit/libXxf86misc/dist/src/Makefile.am
U xsrc/external/mit/libXxf86misc/dist/src/Makefile.in
U xsrc/external/mit/libXxf86misc/dist/src/config.h.in
U xsrc/external/mit/libXxf86misc/dist/src/XF86Misc.c
U xsrc/external/mit/libXxf86misc/dist/man/Makefile.am
U xsrc/external/mit/libXxf86misc/dist/man/Makefile.in
U xsrc/external/mit/libXxf86misc/dist/man/XF86Misc.man

No conflicts created by this import

CVS commit: src/doc

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Dec 28 21:51:49 UTC 2018

Modified Files:
src/doc: TODO.modules

Log Message:
Expand the weak-symbol section to mention module unload issues.  As
noted by martin@ on source-chages-d list.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/doc/TODO.modules

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

Modified files:

Index: src/doc/TODO.modules
diff -u src/doc/TODO.modules:1.17 src/doc/TODO.modules:1.18
--- src/doc/TODO.modules:1.17	Fri Dec 28 21:37:56 2018
+++ src/doc/TODO.modules	Fri Dec 28 21:51:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: TODO.modules,v 1.17 2018/12/28 21:37:56 pgoyette Exp $ */
+/* $NetBSD: TODO.modules,v 1.18 2018/12/28 21:51:49 pgoyette Exp $ */
 
 Some notes on the limitations of our current (as of 7.99.35) module
 subsystem.  This list was triggered by an Email exchange between
@@ -208,3 +208,7 @@ christos and pgoyette.
 module A, the symbol gets resolved.  But if module A is loaded first,
 the symbol won't be resolved.  If we subsequently load module B, we
 would have to "go back" and re-run the linker for module A.
+
+Additional difficulties arise when the module which defines the
+weak symbol gets unloaded.  Then, you would need to re-run the
+linker and _unresolve_ the weak symbol which is no longer defined.

CVS commit: src/doc

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Dec 28 21:37:56 UTC 2018

Modified Files:
src/doc: TODO.modules

Log Message:
Add an entry regarding weak symbols


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/doc/TODO.modules

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

Modified files:

Index: src/doc/TODO.modules
diff -u src/doc/TODO.modules:1.16 src/doc/TODO.modules:1.17
--- src/doc/TODO.modules:1.16	Thu Dec 13 11:28:00 2018
+++ src/doc/TODO.modules	Fri Dec 28 21:37:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: TODO.modules,v 1.16 2018/12/13 11:28:00 pgoyette Exp $ */
+/* $NetBSD: TODO.modules,v 1.17 2018/12/28 21:37:56 pgoyette Exp $ */
 
 Some notes on the limitations of our current (as of 7.99.35) module
 subsystem.  This list was triggered by an Email exchange between
@@ -200,3 +200,11 @@ christos and pgoyette.
 no such device so we autoload /stand/.../x/x.kmod and initialize
 the module loaded, even if the loaded module is for some other
 device entirely!
+
+21. We currently do not support "weak" symbols in the in-kernel linker.
+It would take some serious thought to get such support right.  For
+example, consider module A with a weak reference to symbol S which
+is defined in module B.  If module B is loaded first, and then
+module A, the symbol gets resolved.  But if module A is loaded first,
+the symbol won't be resolved.  If we subsequently load module B, we
+would have to "go back" and re-run the linker for module A.

CVS commit: src/external/gpl3

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 28 21:30:20 UTC 2018

Modified Files:
src/external/gpl3/gcc.old/dist/gcc/config/m68k: netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h

Log Message:
PR toolchain/53810
PR toolchain/53684
PR toolchain/53685

No one defines TARGET_DEFAULT_CPU anymore. Use ENABLE_SHARED_LIBGCC
instead to determine whether GCC is configured for m68k or m68000.
This fixes C++ binaries on m68k, that require libgcc_s.

OK mrg


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h

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

Modified files:

Index: src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h
diff -u src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h:1.6 src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h:1.7
--- src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h:1.6	Thu Aug  2 00:02:57 2018
+++ src/external/gpl3/gcc.old/dist/gcc/config/m68k/netbsd-elf.h	Fri Dec 28 21:30:20 2018
@@ -79,7 +79,7 @@ along with GCC; see the file COPYING3.  
 #define LINK_SPEC NETBSD_LINK_SPEC_ELF
 
 /* NetBSD/sun2 does not support shlibs, avoid using libgcc_pic.  */
-#if TARGET_DEFAULT_CPU == 0
+#ifndef ENABLE_SHARED_LIBGCC
 #undef REAL_LIBGCC_SPEC
 #define REAL_LIBGCC_SPEC	"-lgcc"
 #endif

Index: src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.12 src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.13
--- src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.12	Fri Feb  2 03:41:05 2018
+++ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h	Fri Dec 28 21:30:20 2018
@@ -79,7 +79,7 @@ along with GCC; see the file COPYING3.  
 #define LINK_SPEC NETBSD_LINK_SPEC_ELF
 
 /* NetBSD/sun2 does not support shlibs, avoid using libgcc_pic.  */
-#if TARGET_DEFAULT_CPU == 0
+#ifndef ENABLE_SHARED_LIBGCC
 #undef REAL_LIBGCC_SPEC
 #define REAL_LIBGCC_SPEC	"-lgcc"
 #endif

CVS commit: src/external/gpl3/binutils

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 21:23:01 UTC 2018

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/aarch64: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/alpha: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/arm: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/armeb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/earm: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/earmeb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/earmhf: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/earmhfeb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/hppa: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/ia64: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/m68000: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/m68k: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/mips64eb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/mips64el: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/mipseb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/mipsel: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/powerpc: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/powerpc64: bfd.h
bfd_stdint.h bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/sh3eb: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/sh3el: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/sparc64: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libbfd/arch/vax: bfd.h bfd_stdint.h
bfdver.h config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/aarch64: config.h
src/external/gpl3/binutils/lib/libiberty/arch/alpha: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/arm: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/armeb: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/earm: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/earmeb: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/earmhf: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/earmhfeb: config.h
defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/hppa: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/ia64: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/m68000: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/m68k: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mips64eb: config.h
defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mips64el: config.h
defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mipseb: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mipsel: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/powerpc: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/powerpc64: config.h
defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/sh3eb: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/sh3el: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/sparc: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/sparc64: config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/vax: config.h defs.mk
src/external/gpl3/binutils/lib/libopcodes/arch/aarch64: config.h
src/external/gpl3/binutils/lib/libopcodes/arch/alpha: config.h
src/external/gpl3/binutils/lib/libopcodes/arch/arm: config.h
src/external/gpl3/binutils/lib/libopcodes/arch/armeb: config.h
src/external/gpl3/binutils/lib/libopcodes/arch/earm: config.h

CVS commit: src/external/gpl3/binutils/dist/ld

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 20:43:25 UTC 2018

Modified Files:
src/external/gpl3/binutils/dist/ld: configure.tgt

Log Message:
remove armnbsd which is not supported anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/binutils/dist/ld/configure.tgt

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

Modified files:

Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.30 src/external/gpl3/binutils/dist/ld/configure.tgt:1.31
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.30	Fri Dec 28 10:46:30 2018
+++ src/external/gpl3/binutils/dist/ld/configure.tgt	Fri Dec 28 15:43:25 2018
@@ -113,18 +113,18 @@ arm*-*-freebsd* | arm-*-kfreebsd*-gnu)
 			targ_extra_emuls="armelfb_fbsd armelf" ;;
 arm*eb-*-netbsdelf*-*eabihf*)
 			targ_emul=armelfb_nbsd_eabihf;
-			targ_extra_emuls="armelf_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelf_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf" ;;
 arm*eb-*-netbsdelf*-*eabi*)
 			targ_emul=armelfb_nbsd_eabi;
-			targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf" ;;
 arm*-*-netbsdelf*-*eabihf*)
 			targ_emul=armelf_nbsd_eabihf;
-			targ_extra_emuls="armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf" ;;
 arm*-*-netbsdelf*-*eabi*)
 			targ_emul=armelf_nbsd_eabi;
-			targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf" ;;
 arm*eb-*-netbsdelf*)	targ_emul=armelfb_nbsd;
-			targ_extra_emuls="armelf_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelf_nbsd armelf" ;;
 arm-*-netbsdelf*)	targ_emul=armelf_nbsd;
 			targ_extra_emuls="armelfb_nbsd armelf" ;;
 arm-*-nto*)		targ_emul=armnto ;;

CVS commit: src/lib/csu/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 20:12:35 UTC 2018

Modified Files:
src/lib/csu/common: crt0-common.c

Log Message:
Re-do previous (always make available preinit/initarray/finiarray), with
less disruption.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/csu/common/crt0-common.c

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

Modified files:

Index: src/lib/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.22 src/lib/csu/common/crt0-common.c:1.23
--- src/lib/csu/common/crt0-common.c:1.22	Fri Dec 28 13:17:11 2018
+++ src/lib/csu/common/crt0-common.c	Fri Dec 28 15:12:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $ */
+/* $NetBSD: crt0-common.c,v 1.23 2018/12/28 20:12:35 christos Exp $ */
 
 /*
  * Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.23 2018/12/28 20:12:35 christos Exp $");
 
 #include 
 #include 
@@ -48,9 +48,8 @@ __RCSID("$NetBSD: crt0-common.c,v 1.22 2
 
 extern int main(int, char **, char **);
 
-#ifdef HAVE_INITFINI_ARRAY
 typedef void (*fptr_t)(void);
-#else
+#ifndef HAVE_INITFINI_ARRAY
 extern void	_init(void);
 extern void	_fini(void);
 #endif
@@ -87,7 +86,6 @@ do {		\
 	_exit(1);\
 } while (0)
 
-#ifdef HAVE_INITFINI_ARRAY
 /*
  * If we are using INIT_ARRAY/FINI_ARRAY and we are linked statically,
  * we have to process these instead of relying on RTLD to do it for us.
@@ -111,7 +109,7 @@ _preinit(void)
 }
 
 static inline void
-_init(void)
+_initarray(void)
 {
 	for (const fptr_t *f = __init_array_start; f < __init_array_end; f++) {
 		(*f)();
@@ -119,13 +117,12 @@ _init(void)
 }
 
 static void
-_fini(void)
+_finiarray(void)
 {
 	for (const fptr_t *f = __fini_array_start; f < __fini_array_end; f++) {
 		(*f)();
 	}
 }
-#endif /* HAVE_INITFINI_ARRAY */
 
 #if defined(__x86_64__) || defined(__powerpc__) || defined(__sparc__)
 #define HAS_IPLTA
@@ -327,17 +324,20 @@ ___start(void (*cleanup)(void),			/* fro
 #endif
 	}
 
-#ifdef HAVE_INITFINI_ARRAY
 	_preinit();
-#endif
 
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&__eprol, (u_long)&__etext);
 #endif
 
+	atexit(_finiarray);
+	_initarray();
+
+#ifndef HAVE_INITFINI_ARRAY
 	atexit(_fini);
 	_init();
+#endif
 
 	exit(main(ps_strings->ps_nargvstr, ps_strings->ps_argvstr, environ));
 }

CVS commit: src/tests/rump

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Fri Dec 28 19:54:36 UTC 2018

Modified Files:
src/tests/rump/kernspace: kernspace.h threadpool.c
src/tests/rump/rumpkern: t_threadpool.c

Log Message:
Add a test case that exercises repeated sceduling and cancelling of a job,
with periodic dropping of the interlock.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/rump/kernspace/kernspace.h
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/kernspace/threadpool.c
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/t_threadpool.c

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

Modified files:

Index: src/tests/rump/kernspace/kernspace.h
diff -u src/tests/rump/kernspace/kernspace.h:1.7 src/tests/rump/kernspace/kernspace.h:1.8
--- src/tests/rump/kernspace/kernspace.h:1.7	Mon Dec 24 21:42:05 2018
+++ src/tests/rump/kernspace/kernspace.h	Fri Dec 28 19:54:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernspace.h,v 1.7 2018/12/24 21:42:05 thorpej Exp $	*/
+/*	$NetBSD: kernspace.h,v 1.8 2018/12/28 19:54:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2018 The NetBSD Foundation, Inc.
@@ -51,5 +51,6 @@ void rumptest_threadpool_percpu_lifecycl
 void rumptest_threadpool_unbound_schedule(void);
 void rumptest_threadpool_percpu_schedule(void);
 void rumptest_threadpool_job_cancel(void);
+void rumptest_threadpool_job_cancelthrash(void);
 
 #endif /* _TESTS_RUMP_KERNSPACE_KERNSPACE_H_ */

Index: src/tests/rump/kernspace/threadpool.c
diff -u src/tests/rump/kernspace/threadpool.c:1.3 src/tests/rump/kernspace/threadpool.c:1.4
--- src/tests/rump/kernspace/threadpool.c:1.3	Wed Dec 26 18:54:20 2018
+++ src/tests/rump/kernspace/threadpool.c	Fri Dec 28 19:54:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: threadpool.c,v 1.3 2018/12/26 18:54:20 thorpej Exp $	*/
+/*	$NetBSD: threadpool.c,v 1.4 2018/12/28 19:54:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include 
 #if !defined(lint)
-__RCSID("$NetBSD: threadpool.c,v 1.3 2018/12/26 18:54:20 thorpej Exp $");
+__RCSID("$NetBSD: threadpool.c,v 1.4 2018/12/28 19:54:36 thorpej Exp $");
 #endif /* !lint */
 
 #include 
@@ -237,3 +237,31 @@ rumptest_threadpool_job_cancel(void)
 
 	threadpool_put(pool, PRI_NONE);
 }
+
+void
+rumptest_threadpool_job_cancelthrash(void)
+{
+	struct test_job_data data;
+	struct threadpool *pool;
+	int i, error;
+
+	error = threadpool_get(, PRI_NONE);
+	KASSERT(error == 0);
+
+	init_test_job_data(, test_job_func_cancel);
+
+	mutex_enter();
+	for (i = 0; i < 1; i++) {
+		threadpool_schedule_job(pool, );
+		if ((i % 3) == 0) {
+			mutex_exit();
+			mutex_enter();
+		}
+		threadpool_cancel_job(pool, );
+	}
+	mutex_exit();
+
+	fini_test_job_data();
+
+	threadpool_put(pool, PRI_NONE);
+}

Index: src/tests/rump/rumpkern/t_threadpool.c
diff -u src/tests/rump/rumpkern/t_threadpool.c:1.1 src/tests/rump/rumpkern/t_threadpool.c:1.2
--- src/tests/rump/rumpkern/t_threadpool.c:1.1	Mon Dec 24 21:42:05 2018
+++ src/tests/rump/rumpkern/t_threadpool.c	Fri Dec 28 19:54:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_threadpool.c,v 1.1 2018/12/24 21:42:05 thorpej Exp $	*/
+/*	$NetBSD: t_threadpool.c,v 1.2 2018/12/28 19:54:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -126,6 +126,24 @@ ATF_TC_BODY(threadpool_job_cancel, tc)
 	rump_unschedule();
 }
 
+ATF_TC(threadpool_job_cancelthrash);
+ATF_TC_HEAD(threadpool_job_cancelthrash, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	"Tests thrashing job scheduling / cancellation");
+}
+
+ATF_TC_BODY(threadpool_job_cancelthrash, tc)
+{
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_threadpool_job_cancelthrash(); /* panics if fails */
+	rump_unschedule();
+}
+
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, threadpool_unbound_lifecycle);
@@ -133,6 +151,7 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, threadpool_unbound_schedule);
 	ATF_TP_ADD_TC(tp, threadpool_percpu_schedule);
 	ATF_TP_ADD_TC(tp, threadpool_job_cancel);
+	ATF_TP_ADD_TC(tp, threadpool_job_cancelthrash);
 
 	return atf_no_error();
 }

CVS commit: src/lib/libutil

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Fri Dec 28 18:44:11 UTC 2018

Modified Files:
src/lib/libutil: getfsspecname.3

Log Message:
Document "ROOT." syntax before documenting a generic .


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libutil/getfsspecname.3

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

Modified files:

Index: src/lib/libutil/getfsspecname.3
diff -u src/lib/libutil/getfsspecname.3:1.6 src/lib/libutil/getfsspecname.3:1.7
--- src/lib/libutil/getfsspecname.3:1.6	Sat Oct  6 13:09:53 2018
+++ src/lib/libutil/getfsspecname.3	Fri Dec 28 18:44:11 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getfsspecname.3,v 1.6 2018/10/06 13:09:53 jmcneill Exp $
+.\"	$NetBSD: getfsspecname.3,v 1.7 2018/12/28 18:44:11 alnsn Exp $
 .\"
 .\" Copyright (c) 2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd October 6, 2018
+.Dd December 28, 2018
 .Dt GETFSSPECNAME 3
 .Os
 .Sh NAME
@@ -58,16 +58,6 @@ up to len
 .Pp
 If the
 .Fa spec
-argument is not of the form
-.Dq NAME=wedgename ,
-.Fa spec
-is copied
-to
-.Fa buf
-and returned.
-.Pp
-If the
-.Fa spec
 argument starts with
 .Dq ROOT. ,
 a path in the form
@@ -85,6 +75,18 @@ is the characters following
 in the
 .Fa spec
 argument.
+.Pp
+If the
+.Fa spec
+argument is not of the form
+.Dq NAME=wedgename
+and it doesn't start with
+.Dq ROOT. ,
+.Fa spec
+is copied
+to
+.Fa buf
+and returned.
 .Sh RETURN VALUES
 On success the absolute pathname of the underlying wedge device is returned,
 or the original

CVS commit: src/sbin/cgdconfig

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Fri Dec 28 18:33:54 UTC 2018

Modified Files:
src/sbin/cgdconfig: cgdconfig.8

Log Message:
s/Dec/December/.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sbin/cgdconfig/cgdconfig.8

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

Modified files:

Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.42 src/sbin/cgdconfig/cgdconfig.8:1.43
--- src/sbin/cgdconfig/cgdconfig.8:1.42	Thu Dec 27 21:17:08 2018
+++ src/sbin/cgdconfig/cgdconfig.8	Fri Dec 28 18:33:54 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.42 2018/12/27 21:17:08 alnsn Exp $
+.\" $NetBSD: cgdconfig.8,v 1.43 2018/12/28 18:33:54 alnsn Exp $
 .\"
 .\" Copyright (c) 2002, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd Dec 27, 2018
+.Dd December 27, 2018
 .Dt CGDCONFIG 8
 .Os
 .Sh NAME

CVS commit: src/lib/csu

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 18:17:11 UTC 2018

Modified Files:
src/lib/csu/arch/aarch64: Makefile.inc
src/lib/csu/arch/arm: Makefile.inc
src/lib/csu/arch/earm: Makefile.inc
src/lib/csu/arch/or1k: Makefile.inc
src/lib/csu/arch/riscv: Makefile.inc
src/lib/csu/common: Makefile.inc crt0-common.c crtbegin.c

Log Message:
Undo previous; breaks macppc/m68k (at least)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/aarch64/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/lib/csu/arch/arm/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/csu/arch/earm/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/or1k/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/riscv/Makefile.inc
cvs rdiff -u -r1.34 -r1.35 src/lib/csu/common/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/lib/csu/common/crt0-common.c
cvs rdiff -u -r1.16 -r1.17 src/lib/csu/common/crtbegin.c

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

Modified files:

Index: src/lib/csu/arch/aarch64/Makefile.inc
diff -u src/lib/csu/arch/aarch64/Makefile.inc:1.2 src/lib/csu/arch/aarch64/Makefile.inc:1.3
--- src/lib/csu/arch/aarch64/Makefile.inc:1.2	Thu Dec 27 13:57:14 2018
+++ src/lib/csu/arch/aarch64/Makefile.inc	Fri Dec 28 13:17:10 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:14 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:10 christos Exp $
 
 CPPFLAGS+=	-I${ARCHDIR}
+CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 #CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"

Index: src/lib/csu/arch/arm/Makefile.inc
diff -u src/lib/csu/arch/arm/Makefile.inc:1.8 src/lib/csu/arch/arm/Makefile.inc:1.9
--- src/lib/csu/arch/arm/Makefile.inc:1.8	Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/arm/Makefile.inc	Fri Dec 28 13:17:10 2018
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.8 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2018/12/28 18:17:10 christos Exp $
 
 CPPFLAGS+=	-I${ARCHDIR}
+.if (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
+CPPFLAGS+=  -DHAVE_INITFINI_ARRAY
+.endif
 CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"

Index: src/lib/csu/arch/earm/Makefile.inc
diff -u src/lib/csu/arch/earm/Makefile.inc:1.4 src/lib/csu/arch/earm/Makefile.inc:1.5
--- src/lib/csu/arch/earm/Makefile.inc:1.4	Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/earm/Makefile.inc	Fri Dec 28 13:17:10 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2018/12/28 18:17:10 christos Exp $
 
 CPPFLAGS+=	-I${ARCHDIR}
+CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"

Index: src/lib/csu/arch/or1k/Makefile.inc
diff -u src/lib/csu/arch/or1k/Makefile.inc:1.2 src/lib/csu/arch/or1k/Makefile.inc:1.3
--- src/lib/csu/arch/or1k/Makefile.inc:1.2	Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/or1k/Makefile.inc	Fri Dec 28 13:17:11 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:11 christos Exp $
 
 CPPFLAGS+=	-I${ARCHDIR}
+CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 #CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"

Index: src/lib/csu/arch/riscv/Makefile.inc
diff -u src/lib/csu/arch/riscv/Makefile.inc:1.2 src/lib/csu/arch/riscv/Makefile.inc:1.3
--- src/lib/csu/arch/riscv/Makefile.inc:1.2	Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/riscv/Makefile.inc	Fri Dec 28 13:17:11 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:11 christos Exp $
 
 CPPFLAGS+=	-I${ARCHDIR}
+CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 #CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"

Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.34 src/lib/csu/common/Makefile.inc:1.35
--- src/lib/csu/common/Makefile.inc:1.34	Thu Dec 27 13:57:15 2018
+++ src/lib/csu/common/Makefile.inc	Fri Dec 28 13:17:11 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.34 2018/12/27 18:57:15 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.35 2018/12/28 18:17:11 christos Exp $
 
 .include 
 
@@ -9,7 +9,6 @@ COMMON_DIR:=	${.CURDIR}/common
 .PATH:		${COMMON_DIR}
 
 CPPFLAGS+=	-I${COMMON_DIR} -I.
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 
 OBJS+=		crt0.o gcrt0.o crti.o crtn.o
 OBJS+=		crtbegin.o crtend.o

Index: src/lib/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.21 src/lib/csu/common/crt0-common.c:1.22
--- src/lib/csu/common/crt0-common.c:1.21	Thu Dec 27 14:32:32 2018
+++ src/lib/csu/common/crt0-common.c	Fri Dec 28 13:17:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.21 2018/12/27 19:32:32 christos Exp $ */
+/* $NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $ */
 
 /*
  * Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: crt0-common.c,v 1.21 2018/12/27 

CVS commit: src/tests/kernel

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Fri Dec 28 16:01:53 UTC 2018

Modified Files:
src/tests/kernel: t_threadpool.sh

Log Message:
kre@ notified me that the kernel/t_threadpool "rapid" test was occasionally
tripping a KASSERT() failure in the i386-qemu test rig.  It turns out this
is due to "rapid" simply being a buggy test that makes assumptions that
aren't always true, especially on slower / uniprocesor hardware.  So, the
right thing to do is just remove the test.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_threadpool.sh

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

Modified files:

Index: src/tests/kernel/t_threadpool.sh
diff -u src/tests/kernel/t_threadpool.sh:1.1 src/tests/kernel/t_threadpool.sh:1.2
--- src/tests/kernel/t_threadpool.sh:1.1	Mon Dec 24 16:58:54 2018
+++ src/tests/kernel/t_threadpool.sh	Fri Dec 28 16:01:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_threadpool.sh,v 1.1 2018/12/24 16:58:54 thorpej Exp $
+# $NetBSD: t_threadpool.sh,v 1.2 2018/12/28 16:01:53 thorpej Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -133,37 +133,8 @@ percpu_cleanup() {
 	modunload threadpool_tester >/dev/null 2>&1
 }
 
-atf_test_case rapid cleanup
-rapid_head() {
-	atf_set "descr" "Test rapid get/schedule/put sequence"
-	atf_set "require.user" "root"
-}
-rapid_body() {
-	modload $(atf_get_srcdir)/threadpool_tester/threadpool_tester.kmod
-	if [ $? -ne 0 ]; then
-		atf_skip "cannot load threadpool_tester.kmod"
-	fi
-
-	# Ensure that the state is clean.
-	read_sysctl kern.threadpool_tester.test_value 0
-
-	# Create an unbound pool.  Immediatelty schedule a job on it
-	# and destroy it.
-	write_sysctl kern.threadpool_tester.get_unbound $tp_pri
-	write_sysctl kern.threadpool_tester.run_unbound $tp_pri
-	write_sysctl kern.threadpool_tester.put_unbound $tp_pri
-
-	# Now ensure the job successfully ran.
-	sleep $job_delay
-	read_sysctl kern.threadpool_tester.test_value 1
-}
-rapid_cleanup() {
-	modunload threadpool_tester >/dev/null 2>&1
-}
-
 atf_init_test_cases()
 {
 	atf_add_test_case unbound
 	atf_add_test_case percpu
-	atf_add_test_case rapid
 }

CVS commit: src/external/gpl3/binutils/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 15:46:30 UTC 2018

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd
src/external/gpl3/binutils/dist/ld: configure.tgt

Log Message:
remove m68k a.out/4k and sh64 vectors that are not supported anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/binutils/dist/bfd/config.bfd
cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/binutils/dist/ld/configure.tgt

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

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.28 src/external/gpl3/binutils/dist/bfd/config.bfd:1.29
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.28	Fri Dec 28 10:28:36 2018
+++ src/external/gpl3/binutils/dist/bfd/config.bfd	Fri Dec 28 10:46:30 2018
@@ -1266,7 +1266,7 @@ case "${targ}" in
 ;;
   sh-*-netbsdelf*)
 targ_defvec=sh_elf32_nbsd_vec
-targ_selvecs="sh_elf32_nbsd_le_vec sh_coff_vec sh_coff_le_vec sh64_elf32_nbsd_le_vec sh64_elf32_nbsd_vec sh64_elf64_nbsd_le_vec sh64_elf64_nbsd_vec"
+targ_selvecs="sh_elf32_nbsd_le_vec sh_coff_vec sh_coff_le_vec"
 want64=true
 ;;
 

Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.29 src/external/gpl3/binutils/dist/ld/configure.tgt:1.30
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.29	Fri Dec 28 10:28:36 2018
+++ src/external/gpl3/binutils/dist/ld/configure.tgt	Fri Dec 28 10:46:30 2018
@@ -416,14 +416,8 @@ m68hc11-*-*|m6811-*-*)	targ_emul=m68hc11
 			targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;
 m68hc12-*-*|m6812-*-*)	targ_emul=m68hc12elf
 			targ_extra_emuls="m68hc12elfb m68hc11elf m68hc11elfb" ;;
-m68*-*-netbsd*4k*)	targ_emul=m68k4knbsd
-			targ_extra_emuls="m68knbsd m68kelfnbsd" ;;
 m68*-*-netbsdelf* | m5407*-*-netbsdelf*)
-			targ_emul=m68kelfnbsd
-			targ_extra_emuls="m68knbsd m68k4knbsd" ;;
-m68*-*-netbsdaout* | m68*-*-netbsd*)
-			targ_emul=m68knbsd
-			targ_extra_emuls="m68kelfnbsd m68k4knbsd" ;;
+			targ_emul=m68kelfnbsd ;;
 m68*-*-*)		targ_emul=m68kelf ;;
 s12z-*-*)		targ_emul=m9s12zelf
 			;;

CVS commit: src/external/gpl3/binutils/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 15:28:36 UTC 2018

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd
src/external/gpl3/binutils/dist/ld: configure.tgt

Log Message:
remove sparc a.out emulations (not supported anymore)


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/binutils/dist/bfd/config.bfd
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/binutils/dist/ld/configure.tgt

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

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.27 src/external/gpl3/binutils/dist/bfd/config.bfd:1.28
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.27	Wed Nov  7 21:30:06 2018
+++ src/external/gpl3/binutils/dist/bfd/config.bfd	Fri Dec 28 10:28:36 2018
@@ -1313,14 +1313,8 @@ case "${targ}" in
 
   sparc-*-netbsdelf*)
 targ_defvec=sparc_elf32_vec
-targ_selvecs=sparc_aout_nbsd_vec
 want64=true
 ;;
-  sparc-*-netbsdaout* | sparc-*-netbsd*)
-targ_defvec=sparc_aout_nbsd_vec
-targ_selvecs=sparc_elf32_vec
-targ_underscore=yes
-;;
   sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
 targ_defvec=sparc_elf32_sol2_vec
 ;;

Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.28 src/external/gpl3/binutils/dist/ld/configure.tgt:1.29
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.28	Tue Nov  6 20:13:54 2018
+++ src/external/gpl3/binutils/dist/ld/configure.tgt	Fri Dec 28 10:28:36 2018
@@ -755,13 +755,12 @@ sparc*-*-linux-*)	targ_emul=elf32_sparc
 			targ_extra_libpath=elf64_sparc
 			tdir_elf64_sparc=`echo ${targ_alias} | sed -e 's/32//'` ;;
 sparc64-*-netbsd*)	targ_emul=elf64_sparc
-			targ_extra_emuls="elf32_sparc sparcnbsd"
+			targ_extra_emuls="elf32_sparc"
 			;;
 sparc64-*-openbsd*)	targ_emul=elf64_sparc
 			targ_extra_emuls="elf32_sparc"
 			;;
 sparc*-*-netbsd*elf*)	targ_emul=elf32_sparc
-			targ_extra_emuls=sparcnbsd
 			;;
 sparc*-*-netbsd*)	targ_emul=sparcnbsd ;;
 sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)

CVS commit: src/sys/dev/pci

[Frank Kardel]

Module Name:src
Committed By:   kardel
Date:   Fri Dec 28 15:06:07 UTC 2018

Modified Files:
src/sys/dev/pci: mpii.c

Log Message:
fix LUN handling (byte order issue)

now ch0 on a NEOSeries FlexStor II is detected again on LUN 1
this is a regression introduced in 1.15 update and 1.8.10.3 pullup

Tested with NEOSeries FlexStor II:
mpii0 at pci1 dev 0 function 0: vendor 1000 product 00ab (rev. 0x01)
mpii0: interrupting at irq 11
mpii0: HBA 9400-8i8e, firmware 3.0.4.0, MPI 2.6
mpii0: physical disk inserted in slot 9
mpii0: physical disk inserted in slot 13
mpii0: physical disk inserted in slot 16
st0 at scsibus0 target 9 lun 0:  tape removable
st0: drive empty
st0: tagged queueing
st1 at scsibus0 target 13 lun 0:  tape removable
st1: drive empty
ch0 at scsibus0 target 13 lun 1:  changer removable
ch0: 23 slots, 2 drives, 1 picker, 1 portal
st1: tagged queueing
ch0: tagged queueing
ses0 at scsibus0 target 16 lun 0:  enclosure services fixed
ses0: SCSI-3 SES Device


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

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

Modified files:

Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.18 src/sys/dev/pci/mpii.c:1.19
--- src/sys/dev/pci/mpii.c:1.18	Wed Dec  5 10:38:22 2018
+++ src/sys/dev/pci/mpii.c	Fri Dec 28 15:06:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.18 2018/12/05 10:38:22 bouyer Exp $ */
+/* $NetBSD: mpii.c,v 1.19 2018/12/28 15:06:07 kardel Exp $ */
 /*	$OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $	*/
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.18 2018/12/05 10:38:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.19 2018/12/28 15:06:07 kardel Exp $");
 
 #include "bio.h"
 
@@ -3036,7 +3036,7 @@ mpii_scsipi_request(struct scsipi_channe
 	io->sgl_offset0 = sizeof(struct mpii_msg_scsi_io) / 4;
 	io->io_flags = htole16(xs->cmdlen);
 	io->dev_handle = htole16(ccb->ccb_dev_handle);
-	io->lun[0] = htole16(periph->periph_lun);
+	io->lun[0] = htobe16(periph->periph_lun);
 
 	switch (xs->xs_control & (XS_CTL_DATA_IN | XS_CTL_DATA_OUT)) {
 	case XS_CTL_DATA_IN:

CVS commit: src/lib/csu/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 28 13:53:17 UTC 2018

Modified Files:
src/lib/csu/common: crtbegin.c

Log Message:
Avoid duplicate definitions on arm (reported by kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/csu/common/crtbegin.c

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

Modified files:

Index: src/lib/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.15 src/lib/csu/common/crtbegin.c:1.16
--- src/lib/csu/common/crtbegin.c:1.15	Thu Dec 27 14:32:32 2018
+++ src/lib/csu/common/crtbegin.c	Fri Dec 28 08:53:17 2018
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: crtbegin.c,v 1.15 2018/12/27 19:32:32 christos Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.16 2018/12/28 13:53:17 christos Exp $");
 
 #include "crtbegin.h"
 
@@ -38,12 +38,14 @@ __dso_hidden const fptr_t __JCR_LIST__[0
 __weakref_visible void Jv_RegisterClasses(const fptr_t *)
 	__weak_reference(_Jv_RegisterClasses);
 
+#if !defined(HAVE_INITFINI_ARRAY)
 extern __dso_hidden const fptr_t __CTOR_LIST__start __asm("__CTOR_LIST__");
 
 __dso_hidden const fptr_t __aligned(sizeof(void *)) __CTOR_LIST__[] __section(".ctors") = {
 	(fptr_t) -1,
 };
 __dso_hidden extern const fptr_t __CTOR_LIST_END__[];
+#endif
 
 #ifdef SHARED
 __dso_hidden void *__dso_handle = &__dso_handle;

CVS commit: src/include

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Dec 28 13:11:46 UTC 2018

Modified Files:
src/include: wchar.h

Log Message:
Limit wcslcat, wcslcpy visibility to _NETBSD_SOURCE
wcswidth, wcwidth to POSIX.1-2001 or _NETBSD_SOURCE

Updated patch from kretschm in PR standards/39422


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/include/wchar.h

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

Modified files:

Index: src/include/wchar.h
diff -u src/include/wchar.h:1.42 src/include/wchar.h:1.43
--- src/include/wchar.h:1.42	Sat Oct 15 14:22:00 2016
+++ src/include/wchar.h	Fri Dec 28 13:11:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.42 2016/10/15 14:22:00 kamil Exp $	*/
+/*	$NetBSD: wchar.h,v 1.43 2018/12/28 13:11:46 maya Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -133,12 +133,18 @@ wchar_t	*wmemcpy(wchar_t * __restrict, c
 wchar_t	*wmemmove(wchar_t *, const wchar_t *, size_t);
 wchar_t	*wmemset(wchar_t *, wchar_t, size_t);
 
+#if defined(_NETBSD_SOURCE)
 size_t	wcslcat(wchar_t *, const wchar_t *, size_t);
 size_t	wcslcpy(wchar_t *, const wchar_t *, size_t);
+#endif
+
+#if defined(_NETBSD_SOURCE) || \
+(_POSIX_C_SOURCE - 0 >= 200112L) || (_XOPEN_SOURCE - 0) >= 600
 int	wcswidth(const wchar_t *, size_t);
-int	wctob(wint_t);
 int	wcwidth(wchar_t);
+#endif
 
+int	wctob(wint_t);
 unsigned long int wcstoul(const wchar_t * __restrict,
 	wchar_t ** __restrict, int);
 long int wcstol(const wchar_t * __restrict,

CVS commit: src/sys/dev

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Fri Dec 28 12:44:15 UTC 2018

Modified Files:
src/sys/dev: ipmi.c ipmivar.h

Log Message:
Be more verbose about the IPMI device.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ipmi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ipmivar.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/ipmi.c
diff -u src/sys/dev/ipmi.c:1.2 src/sys/dev/ipmi.c:1.3
--- src/sys/dev/ipmi.c:1.2	Wed Dec 26 06:45:58 2018
+++ src/sys/dev/ipmi.c	Fri Dec 28 12:44:15 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipmi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $ */
+/*	$NetBSD: ipmi.c,v 1.3 2018/12/28 12:44:15 mlelstv Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2 2018/12/26 06:45:58 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.3 2018/12/28 12:44:15 mlelstv Exp $");
 
 #include 
 #include 
@@ -163,6 +163,7 @@ static	int ipmi_sendcmd(struct ipmi_soft
 static	int ipmi_recvcmd(struct ipmi_softc *, int, int *, void *);
 static	void ipmi_delay(struct ipmi_softc *, int);
 
+static	int ipmi_get_device_id(struct ipmi_softc *, struct ipmi_device_id *);
 static	int ipmi_watchdog_setmode(struct sysmon_wdog *);
 static	int ipmi_watchdog_tickle(struct sysmon_wdog *);
 static	void ipmi_dotickle(struct ipmi_softc *);
@@ -1877,8 +1878,6 @@ ipmi_match(device_t parent, cfdata_t cf,
 {
 	struct ipmi_softc sc;
 	struct ipmi_attach_args *ia = aux;
-	uint8_t		cmd[32];
-	int			len;
 	int			rv = 0;
 
 	memset(, 0, sizeof(sc));
@@ -1891,25 +1890,10 @@ ipmi_match(device_t parent, cfdata_t cf,
 
 	mutex_init(_cmd_mtx, MUTEX_DEFAULT, IPL_SOFTCLOCK);
 	cv_init(_cmd_sleep, "ipmimtch");
-	mutex_enter(_cmd_mtx);
-	/* Identify BMC device early to detect lying bios */
-	if (ipmi_sendcmd(, BMC_SA, 0, APP_NETFN, APP_GET_DEVICE_ID,
-	0, NULL)) {
-		mutex_exit(_cmd_mtx);
-		dbg_printf(1, ": unable to send get device id "
-		"command\n");
-		goto unmap;
-	}
-	if (ipmi_recvcmd(, sizeof(cmd), , cmd)) {
-		mutex_exit(_cmd_mtx);
-		dbg_printf(1, ": unable to retrieve device id\n");
-		goto unmap;
-	}
-	mutex_exit(_cmd_mtx);
 
-	dbg_dump(1, __func__, len, cmd);
-	rv = 1; /* GETID worked, we got IPMI */
-unmap:
+	if (ipmi_get_device_id(, NULL) == 0)
+		rv = 1;
+
 	cv_destroy(_cmd_sleep);
 	mutex_destroy(_cmd_mtx);
 	ipmi_unmap_regs();
@@ -1925,6 +1909,7 @@ ipmi_thread(void *cookie)
 	struct ipmi_attach_args *ia = >sc_ia;
 	uint16_t		rec;
 	struct ipmi_sensor *ipmi_s;
+	struct ipmi_device_id	id;
 	int i;
 
 	sc->sc_thread_running = true;
@@ -1935,6 +1920,10 @@ ipmi_thread(void *cookie)
 	/* Map registers */
 	ipmi_map_regs(sc, ia);
 
+	memset(, 0, sizeof(id));
+	if (ipmi_get_device_id(sc, ))
+		aprint_error_dev(self, "Failed to re-query device ID\n");
+
 	/* Scan SDRs, add sensors to list */
 	for (rec = 0; rec != 0x;)
 		if (get_sdr(sc, rec, ))
@@ -2006,6 +1995,32 @@ ipmi_thread(void *cookie)
 	if (ia->iaa_if_irq != -1)
 		aprint_verbose_dev(self, " irq %d\n", ia->iaa_if_irq);
 
+	if (id.deviceid != 0) {
+		aprint_normal_dev(self, "ID %u.%u IPMI %x.%x%s%s\n",
+			id.deviceid, (id.revision & 0xf),
+			(id.version & 0xf), (id.version >> 4) & 0xf,
+			(id.fwrev1 & 0x80) ? " Initializing" : " Available",
+			(id.revision & 0x80) ? " +SDRs" : "");
+		if (id.additional != 0)
+			aprint_verbose_dev(self, "Additional%s%s%s%s%s%s%s%s\n",
+(id.additional & 0x80) ? " Chassis" : "",
+(id.additional & 0x40) ? " Bridge" : "",
+(id.additional & 0x20) ? " IPMBGen" : "",
+(id.additional & 0x10) ? " IPMBRcv" : "",
+(id.additional & 0x08) ? " FRU" : "",
+(id.additional & 0x04) ? " SEL" : "",
+(id.additional & 0x02) ? " SDR" : "",
+(id.additional & 0x01) ? " Sensor" : "");
+		aprint_verbose_dev(self, "Manufacturer %05x Product %04x\n",
+			(id.manufacturer[2] & 0xf) << 16
+			| id.manufacturer[1] << 8
+			| id.manufacturer[0],
+			id.product[1] << 8
+			| id.manufacturer[0]);
+		aprint_verbose_dev(self, "Firmware %u.%x\n",
+			(id.fwrev1 & 0x7f), id.fwrev2);
+	}
+
 	/* setup flag to exclude iic */
 	ipmi_enabled = 1;
 
@@ -2116,6 +2131,34 @@ ipmi_detach(device_t self, int flags)
 }
 
 static int
+ipmi_get_device_id(struct ipmi_softc *sc, struct ipmi_device_id *res)
+{
+	uint8_t		buf[32];
+	int		len;
+	int		rc;
+
+	mutex_enter(>sc_cmd_mtx);
+	/* Identify BMC device early to detect lying bios */
+	rc = ipmi_sendcmd(sc, BMC_SA, 0, APP_NETFN, APP_GET_DEVICE_ID, 0, NULL);
+	if (rc) {
+		dbg_printf(1, ": unable to send get device id "
+		"command\n");
+		goto done;
+	}
+	rc = ipmi_recvcmd(sc, sizeof(buf), , buf);
+	if (rc) {
+		dbg_printf(1, ": unable to retrieve device id\n");
+	}
+done:
+	mutex_exit(>sc_cmd_mtx);
+
+	if (rc == 0 && res != NULL)
+		memcpy(res, buf, MIN(sizeof(*res), len));
+
+	return rc;
+}
+
+static int
 ipmi_watchdog_setmode(struct sysmon_wdog *smwdog)
 {
 	

CVS commit: src/usr.bin/systat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Dec 28 12:21:53 UTC 2018

Modified Files:
src/usr.bin/systat: systat.1

Log Message:
Fix some macro usage. Fix a typo.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/systat/systat.1

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

Modified files:

Index: src/usr.bin/systat/systat.1
diff -u src/usr.bin/systat/systat.1:1.50 src/usr.bin/systat/systat.1:1.51
--- src/usr.bin/systat/systat.1:1.50	Wed Dec 26 01:54:09 2018
+++ src/usr.bin/systat/systat.1	Fri Dec 28 12:21:53 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: systat.1,v 1.50 2018/12/26 01:54:09 sevan Exp $
+.\"	$NetBSD: systat.1,v 1.51 2018/12/28 12:21:53 wiz Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,9 +67,7 @@ Other displays show more detailed proces
 swap space usage,
 disk usage statistics (a la
 .Xr df 1 ) ,
-disk
-.Tn I/O
-statistics (a la
+disk I/O statistics (a la
 .Xr iostat 8 ) ,
 virtual memory statistics (a la
 .Xr vmstat 1 ) ,
@@ -276,7 +274,6 @@ interfaces, all
 .Ic bge
 interfaces and the loopback interface.
 .El
-.Pp
 .It Ic inet.icmp
 Display ICMP statistics.
 .It Ic inet.ip
@@ -284,9 +281,7 @@ Display IPv4 and UDP statistics.
 .It Ic inet.tcp
 Display TCP statistics.
 .It Ic inet.tcpsyn
-Display statistics about the
-.Tn TCP
-``syncache''.
+Display statistics about the TCP ``syncache''.
 .It Ic inet6.ip6
 Display IPv6 statistics.
 .It Ic iostat
@@ -309,15 +304,11 @@ display; the minimum unambiguous prefix 
 .Pp
 .Bl -tag -width Fl -compact
 .It Cm numbers
-Show the disk
-.Tn I/O
-statistics in numeric form.
+Show the disk I/O statistics in numeric form.
 Values are
 displayed in numeric columns which scroll downward.
 .It Cm bars
-Show the disk
-.Tn I/O
-statistics in bar graph form (default).
+Show the disk I/O statistics in bar graph form (default).
 .It Cm secs
 Toggle the display of time in disk activity (the default is to
 not display time).
@@ -447,9 +438,7 @@ the syscall.
 .It Ic vmstat
 Take over the entire display and show a (rather crowded) compendium
 of statistics related to virtual memory usage, process scheduling,
-device interrupts, system name translation caching, disk
-.Tn I/O
-etc.
+device interrupts, system name translation caching, disk I/O etc.
 .Pp
 The upper left quadrant of the screen shows the number
 of users logged in and the load average over the last one, five,
@@ -527,40 +516,50 @@ Below the paging statistics is another c
 From top to bottom, these represent:
 .Pp
 .Bl -tag -width Fl -compact
-.It Ic Sq forks
-number of fork() calls
-.It Ic Sq fkppw
-number of fork() calls where parent waits
-.It Ic Sq fksvm
-number of fork() calls where vmspace is shared
-.It Ic Sq pwait
+.It Sq Ic forks
+number of
+.Fn fork
+calls
+.It Sq Ic fkppw
+number of
+.Fn fork
+calls where parent waits
+.It Sq Ic fksvm
+number of
+.Fn fork
+calls where vmspace is shared
+.It Sq Ic pwait
 number of times fault had to wait on a page
-.It Ic Sq relck
-number of times uvmfault_relock() is called
-.It Ic Sq rlkok
-number of times uvmfault_relock() is a success
-.It Ic Sq noram
+.It Sq Ic relck
+number of times
+.Fn uvmfault_relock
+is called
+.It Sq Ic rlkok
+number of times
+.Fn uvmfault_relock
+is a success
+.It Sq Ic noram
 number of times fault was out of RAM
-.It Ic Sq ndcpy
+.It Sq Ic ndcpy
 number of times fault clears ``needs copy''
-.It Ic Sq fltcp
+.It Sq Ic fltcp
 number of times fault promotes with copy (2b)
-.It Ic Sq zfod
+.It Sq Ic zfod
 number of times fault promotes with zerofill (2b)
-.It Ic Sq cow
+.It Sq Ic cow
 number of times faulted for anonymous for Copy-On-Write (case 1b)
-.It Ic Sq fmin
+.It Sq Ic fmin
 min number of free pages
-.It Ic Sq ftarg
+.It Sq Ic ftarg
 target number of free pages
-.It Ic Sq itarg
+.It Sq Ic itarg
 target number of inactive pages
-.It Ic Sq flnan
+.It Sq Ic flnan
 number of times fault was out of anonymous pages
-.It Ic Sq pdfre
+.It Sq Ic pdfre
 number of pages daemon freed since boot
-.It Ic Sq pdscn
-number of pages daemon scaned since boot
+.It Sq Ic pdscn
+number of pages daemon scanned since boot
 .El
 .Pp
 Note that the `%zfod' percentage is usually less than 100%,

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 08:59:06 UTC 2018

Modified Files:
xsrc/external/mit/xtrap/dist: xtrapin.c xtrapinfo.c xtrapout.c
xtrapproto.c xtrapreset.c xtrapstats.c
Removed Files:
xsrc/external/mit/xtrap/dist: AUTHORS INSTALL NEWS

Log Message:
merge xtrap 1.0.3.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xtrap/dist/AUTHORS \
xsrc/external/mit/xtrap/dist/INSTALL xsrc/external/mit/xtrap/dist/NEWS
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xtrap/dist/xtrapin.c \
xsrc/external/mit/xtrap/dist/xtrapinfo.c \
xsrc/external/mit/xtrap/dist/xtrapproto.c \
xsrc/external/mit/xtrap/dist/xtrapreset.c \
xsrc/external/mit/xtrap/dist/xtrapstats.c
cvs rdiff -u -r1.4 -r1.5 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/xtrapin.c
diff -u xsrc/external/mit/xtrap/dist/xtrapin.c:1.2 xsrc/external/mit/xtrap/dist/xtrapin.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapin.c:1.2	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapin.c	Fri Dec 28 08:59:06 2018
@@ -102,8 +102,8 @@ extern int opterr; 
 
 static Boolean grabFlag = False;
 
-FILE *ifp;
-XrmOptionDescRec optionTable [] = 
+static FILE *ifp;
+static XrmOptionDescRec optionTable [] = 
 {
 {"-f", "*script",XrmoptionSepArg,  (caddr_t) NULL},
 {"-g", "*grabServer",XrmoptionSkipArg, (caddr_t) NULL},
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
 
 appW = XtAppInitialize(,"XTrap",optionTable,(Cardinal)1L,
 (int *), (String *)argv, (String *)NULL,(ArgList),
-(Cardinal)0);
+0);
 
 dpy = XtDisplay(appW);
 #ifdef DEBUG
@@ -181,7 +181,7 @@ main(int argc, char *argv[])
 #endif
 printf("Display:  %s \n", DisplayString(dpy));
 
-if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
 {
 fprintf(stderr,"%s: could not initialize XTrap extension\n", ProgName);
 exit (1L);
Index: xsrc/external/mit/xtrap/dist/xtrapinfo.c
diff -u xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.2 xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.2	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapinfo.c	Fri Dec 28 08:59:06 2018
@@ -68,13 +68,13 @@ main(int argc, char *argv[])
 /* Connect to Server */
 appW = XtAppInitialize(,"XTrap",NULL,(Cardinal)0L,
 (int *), (String *)argv, (String *)NULL, (ArgList),
-(Cardinal)0);
+0);
 dpy = XtDisplay(appW);
 #ifdef DEBUG
 XSynchronize(dpy, True);
 #endif
 printf("Display:  %s \n", DisplayString(dpy));
-if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
 {
 fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
 exit(1L);
Index: xsrc/external/mit/xtrap/dist/xtrapproto.c
diff -u xsrc/external/mit/xtrap/dist/xtrapproto.c:1.2 xsrc/external/mit/xtrap/dist/xtrapproto.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapproto.c:1.2	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapproto.c	Fri Dec 28 08:59:06 2018
@@ -72,10 +72,10 @@ main(int argc, char *argv[])
 /* Connect to Server */
 appW = XtAppInitialize(,"XTrap",NULL,(Cardinal)0L,
 (int *), (String *)argv, (String *)NULL,(ArgList),
-(Cardinal)0);
+0);
 dpy = XtDisplay(appW);
 printf("Display:  %s \n", DisplayString(dpy));
-if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
 {
 fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
 exit(1L);
Index: xsrc/external/mit/xtrap/dist/xtrapreset.c
diff -u xsrc/external/mit/xtrap/dist/xtrapreset.c:1.2 xsrc/external/mit/xtrap/dist/xtrapreset.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapreset.c:1.2	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapreset.c	Fri Dec 28 08:59:06 2018
@@ -67,14 +67,14 @@ main(int argc, char *argv[])
 /* Connect to Server */
 appW = XtAppInitialize(,"XTrap",NULL,(Cardinal)0L,
 (int *), (String *)argv, (String *)NULL,(ArgList),
-(Cardinal)0);
+0);
 dpy = XtDisplay(appW);
 #ifdef DEBUG
 XSynchronize(dpy, True);
 #endif
 printf("Resetting Display:  %s \n", DisplayString(dpy));
 
-if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
 {
 fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
 exit (1L);
Index: xsrc/external/mit/xtrap/dist/xtrapstats.c
diff -u xsrc/external/mit/xtrap/dist/xtrapstats.c:1.2 xsrc/external/mit/xtrap/dist/xtrapstats.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapstats.c:1.2	Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapstats.c	Fri Dec 28 08:59:06 2018
@@ -75,13 +75,13 @@ main(int argc, 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 08:56:33 UTC 2018

Update of /cvsroot/xsrc/external/mit/xtrap/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2385

Log Message:
initial import of xtrap-1.0.3

Status:

Vendor Tag: xorg
Release Tags:   xtrap-1-0-3

U xsrc/external/mit/xtrap/dist/aclocal.m4
U xsrc/external/mit/xtrap/dist/xtrapchar.c
C xsrc/external/mit/xtrap/dist/xtrapout.c
U xsrc/external/mit/xtrap/dist/chparse.h
U xsrc/external/mit/xtrap/dist/config.sub
U xsrc/external/mit/xtrap/dist/XEKeybCtrl.c
C xsrc/external/mit/xtrap/dist/xtrapproto.c
U xsrc/external/mit/xtrap/dist/chparse.c
U xsrc/external/mit/xtrap/dist/Makefile.am
U xsrc/external/mit/xtrap/dist/configure.ac
U xsrc/external/mit/xtrap/dist/Makefile.in
U xsrc/external/mit/xtrap/dist/xtrap.man
C xsrc/external/mit/xtrap/dist/xtrapinfo.c
U xsrc/external/mit/xtrap/dist/compile
U xsrc/external/mit/xtrap/dist/README
C xsrc/external/mit/xtrap/dist/xtrapreset.c
C xsrc/external/mit/xtrap/dist/xtrapin.c
U xsrc/external/mit/xtrap/dist/configure
U xsrc/external/mit/xtrap/dist/XEKeybCtrl.h
U xsrc/external/mit/xtrap/dist/config.h.in
U xsrc/external/mit/xtrap/dist/missing
U xsrc/external/mit/xtrap/dist/config.guess
U xsrc/external/mit/xtrap/dist/install-sh
U xsrc/external/mit/xtrap/dist/COPYING
C xsrc/external/mit/xtrap/dist/xtrapstats.c
U xsrc/external/mit/xtrap/dist/ChangeLog
U xsrc/external/mit/xtrap/dist/depcomp

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

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xtrap/dist

CVS import: xsrc/external/mit/xkbcomp/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 08:56:31 UTC 2018

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23071

Log Message:
initial import of xkbcomp-1.4.2

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-4-2

U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/compile
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/libSM/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Dec 28 08:56:28 UTC 2018

Update of /cvsroot/xsrc/external/mit/libSM/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12976

Log Message:
initial import of libSM-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   libSM-1-2-3

U xsrc/external/mit/libSM/dist/docbook.am
U xsrc/external/mit/libSM/dist/INSTALL
U xsrc/external/mit/libSM/dist/configure
U xsrc/external/mit/libSM/dist/Makefile.in
U xsrc/external/mit/libSM/dist/ltmain.sh
U xsrc/external/mit/libSM/dist/config.guess
U xsrc/external/mit/libSM/dist/missing
U xsrc/external/mit/libSM/dist/depcomp
U xsrc/external/mit/libSM/dist/install-sh
U xsrc/external/mit/libSM/dist/configure.ac
U xsrc/external/mit/libSM/dist/aclocal.m4
U xsrc/external/mit/libSM/dist/Makefile.am
U xsrc/external/mit/libSM/dist/COPYING
U xsrc/external/mit/libSM/dist/config.sub
U xsrc/external/mit/libSM/dist/sm.pc.in
U xsrc/external/mit/libSM/dist/README
U xsrc/external/mit/libSM/dist/config.h.in
U xsrc/external/mit/libSM/dist/AUTHORS
U xsrc/external/mit/libSM/dist/ChangeLog
U xsrc/external/mit/libSM/dist/compile
U xsrc/external/mit/libSM/dist/src/sm_error.c
U xsrc/external/mit/libSM/dist/src/Makefile.in
U xsrc/external/mit/libSM/dist/src/sm_auth.c
U xsrc/external/mit/libSM/dist/src/Makefile.am
U xsrc/external/mit/libSM/dist/src/sm_client.c
U xsrc/external/mit/libSM/dist/src/sm_process.c
U xsrc/external/mit/libSM/dist/src/sm_genid.c
U xsrc/external/mit/libSM/dist/src/sm_manager.c
U xsrc/external/mit/libSM/dist/src/sm_misc.c
U xsrc/external/mit/libSM/dist/src/SMlibint.h
U xsrc/external/mit/libSM/dist/include/X11/SM/SMproto.h
U xsrc/external/mit/libSM/dist/include/X11/SM/SM.h
U xsrc/external/mit/libSM/dist/include/X11/SM/SMlib.h
U xsrc/external/mit/libSM/dist/doc/Makefile.in
U xsrc/external/mit/libSM/dist/doc/xsmp.xml
U xsrc/external/mit/libSM/dist/doc/SMlib.xml
U xsrc/external/mit/libSM/dist/doc/Makefile.am

No conflicts created by this import