CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:48:55 UTC 2017

Modified Files:
src/distrib/sets/lists/comp [netbsd-8]: mi
src/include [netbsd-8]: Makefile
Added Files:
src/include [netbsd-8]: endian.h

Log Message:
Pull up following revision(s) (requested by maya in ticket #416):
distrib/sets/lists/comp/mi: revision 1.2152
include/Makefile: revision 1.144
include/endian.h: revision 1.1
Add endian.h header.  Simply includes sys/endian.h
 has been accepted by the austin group.


To generate a diff of this commit:
cvs rdiff -u -r1.2138.2.3 -r1.2138.2.4 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.143 -r1.143.6.1 src/include/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/include/endian.h

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/mi
diff -u src/distrib/sets/lists/comp/mi:1.2138.2.3 src/distrib/sets/lists/comp/mi:1.2138.2.4
--- src/distrib/sets/lists/comp/mi:1.2138.2.3	Wed Oct 11 22:54:09 2017
+++ src/distrib/sets/lists/comp/mi	Mon Dec  4 19:48:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2138.2.3 2017/10/11 22:54:09 snj Exp $
+#	$NetBSD: mi,v 1.2138.2.4 2017/12/04 19:48:55 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -775,6 +775,7 @@
 ./usr/include/dns_sd.hcomp-mdns-include	mdns
 ./usr/include/dwarf.hcomp-c-include
 ./usr/include/elf.hcomp-c-include
+./usr/include/endian.hcomp-c-include
 ./usr/include/err.hcomp-c-include
 ./usr/include/errno.hcomp-c-include
 ./usr/include/eti.hcomp-c-include

Index: src/include/Makefile
diff -u src/include/Makefile:1.143 src/include/Makefile:1.143.6.1
--- src/include/Makefile:1.143	Sun Oct  2 17:19:00 2016
+++ src/include/Makefile	Mon Dec  4 19:48:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.143 2016/10/02 17:19:00 kamil Exp $
+#	$NetBSD: Makefile,v 1.143.6.1 2017/12/04 19:48:55 snj Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -8,8 +8,8 @@ NOOBJ=		# defined
 # Missing: mp.h
 
 INCS=	a.out.h aio.h ar.h assert.h atomic.h \
-	bitstring.h bm.h cdbw.h complex.h cpio.h ctype.h \
-	db.h dirent.h disktab.h dlfcn.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \
+	bitstring.h bm.h cdbw.h complex.h cpio.h ctype.h db.h dirent.h \
+	disktab.h dlfcn.h endian.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \
 	fstab.h fts.h ftw.h getopt.h glob.h grp.h ifaddrs.h iconv.h \
 	inttypes.h iso646.h kvm.h langinfo.h libgen.h \
 	limits.h link.h link_aout.h link_elf.h locale.h \

Added files:

Index: src/include/endian.h
diff -u /dev/null src/include/endian.h:1.1.2.2
--- /dev/null	Mon Dec  4 19:48:55 2017
+++ src/include/endian.h	Mon Dec  4 19:48:55 2017
@@ -0,0 +1,34 @@
+/*	$NetBSD: endian.h,v 1.1.2.2 2017/12/04 19:48:55 snj Exp $	 */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef	_ENDIAN_H_
+#define	_ENDIAN_H_
+
+#include 
+
+#endif /* !_ENDIAN_H_ */

CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:48:55 UTC 2017

Modified Files:
src/distrib/sets/lists/comp [netbsd-8]: mi
src/include [netbsd-8]: Makefile
Added Files:
src/include [netbsd-8]: endian.h

Log Message:
Pull up following revision(s) (requested by maya in ticket #416):
distrib/sets/lists/comp/mi: revision 1.2152
include/Makefile: revision 1.144
include/endian.h: revision 1.1
Add endian.h header.  Simply includes sys/endian.h
 has been accepted by the austin group.


To generate a diff of this commit:
cvs rdiff -u -r1.2138.2.3 -r1.2138.2.4 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.143 -r1.143.6.1 src/include/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/include/endian.h

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

Re: CVS commit: src/sys/arch

[Christos Zoulas]

In article ,
Maxime Villard   wrote:
>Le 03/12/2017 à 16:55, David Holland a écrit :
>> On Sun, Dec 03, 2017 at 10:05:08AM +0100, Maxime Villard wrote:
>>   > Good, and apparently no one has noticed that some options don't compile.
>> 
>> Are you saying Christos is lying about it working after reverting your
>> commits?
>
>Why don't you read the previous emails from this thread, instead of coming
>up with random, inaccurate statements like this one? I said very clearly that
>COMPAT_20 for example does not compile. Same for COMPAT_16 and COMPAT_10,
>actually.

By "does not compile" you probably mean "does not compile for me". Can you
please post your config file? Perhaps it is easy to fix.

christos

CVS commit: [netbsd-8] src/sys/arch/i386/conf

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:47:05 UTC 2017

Modified Files:
src/sys/arch/i386/conf [netbsd-8]: GENERIC

Log Message:
Pull up following revision(s) (requested by martin in ticket #413):
sys/arch/i386/conf/GENERIC: revision 1.1171
PR port-i386/52774: vioscsi missing in i386 kernel


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

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

CVS commit: [netbsd-8] src/sys/arch/i386/conf

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:47:05 UTC 2017

Modified Files:
src/sys/arch/i386/conf [netbsd-8]: GENERIC

Log Message:
Pull up following revision(s) (requested by martin in ticket #413):
sys/arch/i386/conf/GENERIC: revision 1.1171
PR port-i386/52774: vioscsi missing in i386 kernel


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

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.6 src/sys/arch/i386/conf/GENERIC:1.1156.2.7
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.6	Mon Sep 11 05:13:45 2017
+++ src/sys/arch/i386/conf/GENERIC	Mon Dec  4 19:47:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.6 2017/09/11 05:13:45 snj Exp $
+# $NetBSD: GENERIC,v 1.1156.2.7 2017/12/04 19:47:05 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1156.2.6 $"
+#ident		"GENERIC-$Revision: 1.1156.2.7 $"
 
 maxusers	64		# estimated number of users
 
@@ -1612,10 +1612,12 @@ geodecntr* at geodegcb? 		# AMD Geode SC
 weasel* at pci?
 
 # Virtio devices
-virtio*	at pci? dev ? function ?	# Virtio PCI device
-viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-vioif*	at virtio?			# Virtio network device
+virtio* at pci? dev ? function ?	# Virtio PCI device
+viomb* at virtio?			# Virtio memory balloon device
+ld* at virtio?# Virtio disk device
+vioif* at virtio?			# Virtio network device
+viornd* at virtio?			# Virtio entropy device
+vioscsi* at virtio?			# Virtio SCSI device
 
 
 # Pull in optional local configuration

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:53:44 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
409, 410, 413, 416


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-8.0

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

Re: CVS commit: src/sys/arch

[Maxime Villard]

Le 03/12/2017 à 16:55, David Holland a écrit :

On Sun, Dec 03, 2017 at 10:05:08AM +0100, Maxime Villard wrote:
  > Good, and apparently no one has noticed that some options don't compile.

Are you saying Christos is lying about it working after reverting your
commits?


Why don't you read the previous emails from this thread, instead of coming
up with random, inaccurate statements like this one? I said very clearly that
COMPAT_20 for example does not compile. Same for COMPAT_16 and COMPAT_10,
actually.


  > As I said earlier, this "please ask core for approval" argument
  > does not work on me anymore, sorry about that. So I'm going to
  > commit right away now, on whatever directly has to do with amd64.

"sorry about that" is not the right answer. Like it or not, [...] drama etc


See the internal thread.

Maxime

CVS commit: [netbsd-8] src/usr.sbin/inetd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:46:08 UTC 2017

Modified Files:
src/usr.sbin/inetd [netbsd-8]: inetd.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #410):
usr.sbin/inetd/inetd.c: revision 1.125
Bump MAXARGV from 20 to 64 - with bozohttpd and all config on the command
line it is easy to hit the (silent) limit.


To generate a diff of this commit:
cvs rdiff -u -r1.123.4.1 -r1.123.4.2 src/usr.sbin/inetd/inetd.c

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

Modified files:

Index: src/usr.sbin/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.123.4.1 src/usr.sbin/inetd/inetd.c:1.123.4.2
--- src/usr.sbin/inetd/inetd.c:1.123.4.1	Sat Oct 21 19:56:06 2017
+++ src/usr.sbin/inetd/inetd.c	Mon Dec  4 19:46:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: inetd.c,v 1.123.4.1 2017/10/21 19:56:06 snj Exp $	*/
+/*	$NetBSD: inetd.c,v 1.123.4.2 2017/12/04 19:46:08 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)inetd.c	8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: inetd.c,v 1.123.4.1 2017/10/21 19:56:06 snj Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.123.4.2 2017/12/04 19:46:08 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@ __RCSID("$NetBSD: inetd.c,v 1.123.4.1 20
  *	wait/nowait[:max]		single-threaded/multi-threaded, max #
  *	user[:group]			user/group to run daemon as
  *	server program			full path name
- *	server program arguments	maximum of MAXARGS (20)
+ *	server program arguments	maximum of MAXARGV (64)
  *
  * For RPC services
  *  service name/versionmust be in /etc/rpc
@@ -110,7 +110,7 @@ __RCSID("$NetBSD: inetd.c,v 1.123.4.1 20
  *	wait/nowait[:max]		single-threaded/multi-threaded
  *	user[:group]			user to run daemon as
  *	server program			full path name
- *	server program arguments	maximum of MAXARGS (20)
+ *	server program arguments	maximum of MAXARGV (64)
  *
  * For non-RPC services, the "service name" can be of the form
  * hostaddress:servicename, in which case the hostaddress is used
@@ -298,7 +298,7 @@ struct	servtab {
 	char	*se_group;		/* group name to run as */
 	struct	biltin *se_bi;		/* if built-in, description */
 	char	*se_server;		/* server program */
-#define	MAXARGV 20
+#define	MAXARGV 64
 	char	*se_argv[MAXARGV+1];	/* program arguments */
 #ifdef IPSEC
 	char	*se_policy;		/* IPsec poilcy string */

CVS commit: [netbsd-8] src/usr.sbin/inetd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:46:08 UTC 2017

Modified Files:
src/usr.sbin/inetd [netbsd-8]: inetd.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #410):
usr.sbin/inetd/inetd.c: revision 1.125
Bump MAXARGV from 20 to 64 - with bozohttpd and all config on the command
line it is easy to hit the (silent) limit.


To generate a diff of this commit:
cvs rdiff -u -r1.123.4.1 -r1.123.4.2 src/usr.sbin/inetd/inetd.c

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

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:53:44 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
409, 410, 413, 416


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.89 src/doc/CHANGES-8.0:1.1.2.90
--- src/doc/CHANGES-8.0:1.1.2.89	Mon Dec  4 13:56:05 2017
+++ src/doc/CHANGES-8.0	Mon Dec  4 19:53:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.89 2017/12/04 13:56:05 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.90 2017/12/04 19:53:44 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -8245,3 +8245,28 @@ etc/rc.d/sshd	1.24
 	Don't try to generate sshv1 keys on new systems.
 	[sevan, ticket #321]
 
+libexec/httpd/cgi-bozo.c			1.39
+
+	PR bin/52194: bozohttpd fails to exec scripts via the
+	-C mechanism sometimes with EFAULT due to not NULL
+	terminated environment.
+	[martin, ticket #409]
+
+usr.sbin/inetd/inetd.c1.125
+
+	Bump MAXARGV from 20 to 64 - with bozohttpd and all config
+	on the command line it is easy to hit the (silent) limit.
+	[martin, ticket #410]
+
+sys/arch/i386/conf/GENERIC			1.1171
+
+	Add vioscsi and viornd virtio devices.  PR port-i386/52774.
+	[martin, ticket #413]
+
+distrib/sets/lists/comp/mi			1.2152
+include/Makefile1.144
+include/endian.h1.1
+
+	Add endian.h header.  Simply includes sys/endian.h
+	[maya, ticket #416]
+

CVS commit: [netbsd-8] src/libexec/httpd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:44:13 UTC 2017

Modified Files:
src/libexec/httpd [netbsd-8]: cgi-bozo.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #409):
libexec/httpd/cgi-bozo.c: revision 1.39
PR bin/52194: bozohttpd fails to exec scripts via the -C mechanism
sometimes with EFAULT due to not NULL terminated environment.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.4.1 src/libexec/httpd/cgi-bozo.c

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

Modified files:

Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.37 src/libexec/httpd/cgi-bozo.c:1.37.4.1
--- src/libexec/httpd/cgi-bozo.c:1.37	Tue Jan 31 14:36:09 2017
+++ src/libexec/httpd/cgi-bozo.c	Mon Dec  4 19:44:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgi-bozo.c,v 1.37 2017/01/31 14:36:09 mrg Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.37.4.1 2017/12/04 19:44:13 snj Exp $	*/
 
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -587,6 +587,8 @@ bozo_process_cgi(bozo_httpreq_t *request
 		bozoerr(httpd, 1, "child socketpair failed: %s",
 strerror(errno));
 
+	*curenvp = 0;
+
 	/*
 	 * We create 2 procs: one to become the CGI, one read from
 	 * the CGI and output to the network, and this parent will

CVS commit: [netbsd-8] src/libexec/httpd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 19:44:13 UTC 2017

Modified Files:
src/libexec/httpd [netbsd-8]: cgi-bozo.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #409):
libexec/httpd/cgi-bozo.c: revision 1.39
PR bin/52194: bozohttpd fails to exec scripts via the -C mechanism
sometimes with EFAULT due to not NULL terminated environment.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.4.1 src/libexec/httpd/cgi-bozo.c

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

CVS commit: src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Dec  4 22:15:52 UTC 2017

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

Log Message:
add KASSERT() just before setting sc_deferred, to ensure this does
not trigger problem in PR kern/52769


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/dksubr.c

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

CVS commit: src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Dec  4 22:15:52 UTC 2017

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

Log Message:
add KASSERT() just before setting sc_deferred, to ensure this does
not trigger problem in PR kern/52769


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.100 src/sys/dev/dksubr.c:1.101
--- src/sys/dev/dksubr.c:1.100	Sun Oct 29 09:44:17 2017
+++ src/sys/dev/dksubr.c	Mon Dec  4 22:15:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.100 2017/10/29 09:44:17 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.101 2017/12/04 22:15:52 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.100 2017/10/29 09:44:17 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.101 2017/12/04 22:15:52 jdolecek Exp $");
 
 #include 
 #include 
@@ -422,6 +422,7 @@ dk_start(struct dk_softc *dksc, struct b
 			error = dkd->d_diskstart(dksc->sc_dev, bp);
 			mutex_enter(>sc_iolock);
 			if (error == EAGAIN) {
+KASSERT(dksc->sc_deferred == NULL);
 dksc->sc_deferred = bp;
 disk_unbusy(>sc_dkdev, 0, (bp->b_flags & B_READ));
 disk_wait(>sc_dkdev);

CVS commit: src/doc

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Dec  5 03:23:29 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
Mention the limitation of enabling both NET_MPSAFE and ALTQ


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

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.smpnet
diff -u src/doc/TODO.smpnet:1.17 src/doc/TODO.smpnet:1.18
--- src/doc/TODO.smpnet:1.17	Mon Nov 20 09:01:20 2017
+++ src/doc/TODO.smpnet	Tue Dec  5 03:23:29 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.17 2017/11/20 09:01:20 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.18 2017/12/05 03:23:29 ozaki-r Exp $
 
 MP-safe components
 ==
@@ -173,3 +173,12 @@ ec_multiaddrs must be protected by ec_lo
 already MP-safe, however, device drivers that use the data should also be fixed.
 A typical change should be to protect manipulations of the data via ETHER_*
 macros such as ETHER_FIRST_MULTI by ETHER_LOCK and ETHER_UNLOCK.
+
+ALTQ
+
+
+If ALTQ is enabled in the kernel, it enforces to use just one Tx queue (if_snd)
+for packet transmissions, resulting in serializing all Tx packet processing on
+the queue.  We should probably design and implement an alternative queuing
+mechanism that deals with multi-core systems at the first place, not making the
+existing ALTQ MP-safe because it's just annoying.

CVS commit: src/doc

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Dec  5 03:23:29 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
Mention the limitation of enabling both NET_MPSAFE and ALTQ


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

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

CVS commit: src/sys/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec  5 02:57:37 UTC 2017

Modified Files:
src/sys/conf: dts.mk

Log Message:
Use similar restrictions to bsd.klinks.mk for .BEGIN rules.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/conf/dts.mk

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

Modified files:

Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.5 src/sys/conf/dts.mk:1.6
--- src/sys/conf/dts.mk:1.5	Sun Dec  3 12:07:18 2017
+++ src/sys/conf/dts.mk	Mon Dec  4 21:57:37 2017
@@ -1,14 +1,16 @@
-# $NetBSD: dts.mk,v 1.5 2017/12/03 17:07:18 christos Exp $
+# $NetBSD: dts.mk,v 1.6 2017/12/05 02:57:37 christos Exp $
 
 DTSARCH?=${MACHINE_CPU}
 DTSGNUARCH?=${DTSARCH}
 DTSPADDING?=1024
 
+.if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN:
 	@mkdir -p dts
 .for _arch in ${DTSGNUARCH}
 	@ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
 .endfor
+.endif
 
 DTSINC?=$S/external/gpl2/dts/dist/include
 .for _arch in ${DTSARCH}

CVS commit: src/sys/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec  5 02:57:37 UTC 2017

Modified Files:
src/sys/conf: dts.mk

Log Message:
Use similar restrictions to bsd.klinks.mk for .BEGIN rules.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/conf/dts.mk

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

Re: CVS commit: src/sys/arch

[Maxime Villard]

Le 04/12/2017 à 20:17, Christos Zoulas a écrit :

In article ,
Maxime Villard   wrote:

Le 03/12/2017 à 16:55, David Holland a écrit :

On Sun, Dec 03, 2017 at 10:05:08AM +0100, Maxime Villard wrote:
   > Good, and apparently no one has noticed that some options don't compile.

Are you saying Christos is lying about it working after reverting your
commits?


Why don't you read the previous emails from this thread, instead of coming
up with random, inaccurate statements like this one? I said very clearly that
COMPAT_20 for example does not compile. Same for COMPAT_16 and COMPAT_10,
actually.


By "does not compile" you probably mean "does not compile for me". Can you
please post your config file? Perhaps it is easy to fix.


Give me a few days and I'll handle that (along with reverting the things).

CVS commit: src/sys/arch/arm/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Dec  4 08:24:35 UTC 2017

Modified Files:
src/sys/arch/arm/arm32: cortex_pmc.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm32/cortex_pmc.c

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

Modified files:

Index: src/sys/arch/arm/arm32/cortex_pmc.c
diff -u src/sys/arch/arm/arm32/cortex_pmc.c:1.4 src/sys/arch/arm/arm32/cortex_pmc.c:1.5
--- src/sys/arch/arm/arm32/cortex_pmc.c:1.4	Thu Aug 13 02:25:07 2015
+++ src/sys/arch/arm/arm32/cortex_pmc.c	Mon Dec  4 08:24:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cortex_pmc.c,v 1.4 2015/08/13 02:25:07 knakahara Exp $	*/
+/*	$NetBSD: cortex_pmc.c,v 1.5 2017/12/04 08:24:35 skrll Exp $	*/
 
 /* Copyright (c) 2007 Microsoft
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.4 2015/08/13 02:25:07 knakahara Exp $"); */
+/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.5 2017/12/04 08:24:35 skrll Exp $"); */
 #include "opt_perfctrs.h"
 #include 
 #include 
@@ -97,11 +97,16 @@ delay(u_int arg)
 	while (arg > usecs) {
 		cur = armreg_pmccntr_read();
 
-		/* overflow flag is moved to a separate register
-		   and is not read from PMC Control Register */
+		/*
+		 * overflow flag is moved to a separate register
+		 * and is not read from PMC Control Register
+		 */
 		ctrl = armreg_pmovsr_read();
 		if (ctrl & CORTEX_CNTOFL_C) {
-		  /* Reset overflow flag for cycle counter in overflow register */
+			/*
+			 * Reset overflow flag for cycle counter in overflow
+			 * register
+			 */
 			armreg_pmovsr_write(CORTEX_CNTOFL_C);
 			delta += (cur + (counts_per_wrap - last));
 		} else {

CVS commit: src/sys/arch/arm/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Dec  4 08:24:35 UTC 2017

Modified Files:
src/sys/arch/arm/arm32: cortex_pmc.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm32/cortex_pmc.c

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

CVS commit: src/sys/dev/ic

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec  4 09:14:23 UTC 2017

Modified Files:
src/sys/dev/ic: comvar.h

Log Message:
Make it clear that SUNXI registers are not defined/supported in the
COM_REGMAP case


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ic/comvar.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/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.84 src/sys/dev/ic/comvar.h:1.85
--- src/sys/dev/ic/comvar.h:1.84	Sun Oct 29 14:06:08 2017
+++ src/sys/dev/ic/comvar.h	Mon Dec  4 09:14:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: comvar.h,v 1.84 2017/10/29 14:06:08 jmcneill Exp $	*/
+/*	$NetBSD: comvar.h,v 1.85 2017/12/04 09:14:23 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -92,9 +92,9 @@ int com_is_console(bus_space_tag_t, bus_
 #define	COM_REG_LSR		10
 #define	COM_REG_MSR		11
 #define	COM_REG_USR		31	/* 16750/SUNXI */
-#define	COM_REG_TFL		32	/* SUNXI */
-#define	COM_REG_RFL		33	/* SUNXI */
-#define	COM_REG_HALT		41	/* SUNXI */
+#ifdef COM_AWIN
+#error "COM_AWIN not compatible with COM_REGMAP"
+#endif
 
 struct com_regs {
 	bus_space_tag_t		cr_iot;

Re: CVS commit: src/sys

[Manuel Bouyer]

On Mon, Dec 04, 2017 at 09:48:32AM +0100, Joerg Sonnenberger wrote:
> On Fri, May 27, 2016 at 08:01:49PM +, Manuel Bouyer wrote:
> > Module Name:src
> > Committed By:   bouyer
> > Date:   Fri May 27 20:01:49 UTC 2016
> > 
> > Modified Files:
> > src/sys/arch/arm/allwinner: files.awin
> > src/sys/conf: files
> > src/sys/dev/ic: com.c comreg.h comvar.h ns16550reg.h
> > 
> > Log Message:
> > The UART in the allwiner SoCs is not full-compatible with the 16550, and
> > it's not a 16750 either. Like the 16750 it has the IIR_BUSY interrupt,
> > which is triggered when writing to LCR while the chip
> > can't accept it. But unlike the 16750, it has a specific register,
> > HALT, to allow writing to the LCR and divisor registers, and then
> > commit the changes.
> > Tested on an A20 SoC, changing the baud rate while keeping the
> > tty device open and incoming data.
> 
> Hello Manuel,
> I'm not sure how you tested this, but you are trivally accessing an array
> beyond the end. COM_REG_TFL and friends are all larger than the cr_map array.

Inded, but cr_map is used only if COM_REGMAP is defined, which is not
the case for allwinner. That's why it works ...

I'll add a #error for this case.

-- 
Manuel Bouyer 
 NetBSD: 26 ans d'experience feront toujours la difference
--

CVS commit: src/sys/dev/ic

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec  4 09:14:23 UTC 2017

Modified Files:
src/sys/dev/ic: comvar.h

Log Message:
Make it clear that SUNXI registers are not defined/supported in the
COM_REGMAP case


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ic/comvar.h

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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec  4 09:29:42 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
- Fixes two problem:
  1) RX may accesses freed area.
  2) if_init() takes long time on many core machine.
  Call ixgbe_jcl_reinit() not in ixgbe_setup_receive_ring() but in the
  biginning of ixgbe_setup_receive_structures(). It was OK for pre multiqueue,
  but it's not OK now because we support multiqueue.
- Fix comment of ixgbe_free_receive_ring().


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ixgbe/ix_txrx.c

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

CVS commit: src/sys/dev/ic

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec  4 09:55:37 UTC 2017

Modified Files:
src/sys/dev/ic: com.c comvar.h

Log Message:
Put back SUNXI definitions in the COM_REGMAP case; com.c uses them
without #ifdef COM_AWIN.
To be safe, expand the register map to 42 entries.


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/dev/ic/com.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/comvar.h

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

Re: CVS commit: src/sys

[Joerg Sonnenberger]

On Fri, May 27, 2016 at 08:01:49PM +, Manuel Bouyer wrote:
> Module Name:  src
> Committed By: bouyer
> Date: Fri May 27 20:01:49 UTC 2016
> 
> Modified Files:
>   src/sys/arch/arm/allwinner: files.awin
>   src/sys/conf: files
>   src/sys/dev/ic: com.c comreg.h comvar.h ns16550reg.h
> 
> Log Message:
> The UART in the allwiner SoCs is not full-compatible with the 16550, and
> it's not a 16750 either. Like the 16750 it has the IIR_BUSY interrupt,
> which is triggered when writing to LCR while the chip
> can't accept it. But unlike the 16750, it has a specific register,
> HALT, to allow writing to the LCR and divisor registers, and then
> commit the changes.
> Tested on an A20 SoC, changing the baud rate while keeping the
> tty device open and incoming data.

Hello Manuel,
I'm not sure how you tested this, but you are trivally accessing an array
beyond the end. COM_REG_TFL and friends are all larger than the cr_map array.

Joerg

CVS commit: src/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 09:44:33 UTC 2017

Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/conf: Makefile.kern.inc

Log Message:
We use .BEGIN for our own cleanup and won't ever need DTS support - so
avoid inclusion of dts.mk by defining _SKIP_DTS


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.260 -r1.261 src/sys/conf/Makefile.kern.inc

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/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.82 src/sys/arch/sparc64/conf/Makefile.sparc64:1.83
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.82	Sat Mar 19 18:50:25 2016
+++ src/sys/arch/sparc64/conf/Makefile.sparc64	Mon Dec  4 09:44:33 2017
@@ -1,4 +1,4 @@
-# 	$NetBSD: Makefile.sparc64,v 1.82 2016/03/19 18:50:25 martin Exp $
+# 	$NetBSD: Makefile.sparc64,v 1.83 2017/12/04 09:44:33 martin Exp $
 
 #=
 #
@@ -162,6 +162,7 @@ cpu_in_cksum.o lock_stubs.o: assym.h
 ##
 ## (9) port independent kernel machinery
 ##
+_SKIP_DTS=yes
 .include "$S/conf/Makefile.kern.inc"
 
 ##

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.260 src/sys/conf/Makefile.kern.inc:1.261
--- src/sys/conf/Makefile.kern.inc:1.260	Sat Jul 15 15:20:52 2017
+++ src/sys/conf/Makefile.kern.inc	Mon Dec  4 09:44:33 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.260 2017/07/15 15:20:52 christos Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.261 2017/12/04 09:44:33 martin Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -321,7 +321,9 @@ ${_s:T:R}.o: ${_s}
 .include "${S}/conf/cscope.mk"
 .include "${S}/conf/gdbinit.mk"
 .include "${S}/conf/ssp.mk"
+.if "${_SKIP_DTS}" != "yes"
 .include "${S}/conf/dts.mk"
+.endif
 
 ##
 ## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,

CVS commit: src/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 09:44:33 UTC 2017

Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/conf: Makefile.kern.inc

Log Message:
We use .BEGIN for our own cleanup and won't ever need DTS support - so
avoid inclusion of dts.mk by defining _SKIP_DTS


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.260 -r1.261 src/sys/conf/Makefile.kern.inc

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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec  4 09:29:42 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
- Fixes two problem:
  1) RX may accesses freed area.
  2) if_init() takes long time on many core machine.
  Call ixgbe_jcl_reinit() not in ixgbe_setup_receive_ring() but in the
  biginning of ixgbe_setup_receive_structures(). It was OK for pre multiqueue,
  but it's not OK now because we support multiqueue.
- Fix comment of ixgbe_free_receive_ring().


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ixgbe/ix_txrx.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.29 src/sys/dev/pci/ixgbe/ix_txrx.c:1.30
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.29	Tue Sep 26 07:42:06 2017
+++ src/sys/dev/pci/ixgbe/ix_txrx.c	Mon Dec  4 09:29:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.29 2017/09/26 07:42:06 knakahara Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.30 2017/12/04 09:29:42 msaitoh Exp $ */
 
 /**
 
@@ -1355,9 +1355,7 @@ fail:
 } /* ixgbe_allocate_receive_buffers */
 
 /
- * ixgbe_setup_receive_ring
- *
- *   Initialize a receive ring and its buffers.
+ * ixgbe_free_receive_ring
  /
 static void
 ixgbe_free_receive_ring(struct rx_ring *rxr)
@@ -1409,17 +1407,6 @@ ixgbe_setup_receive_ring(struct rx_ring 
 	/* Free current RX buffer structs and their mbufs */
 	ixgbe_free_receive_ring(rxr);
 
-	IXGBE_RX_UNLOCK(rxr);
-
-	/* Now reinitialize our supply of jumbo mbufs.  The number
-	 * or size of jumbo mbufs may have changed.
-	 */
-	ixgbe_jcl_reinit(>jcl_head, rxr->ptag->dt_dmat,
-	(2 * adapter->num_rx_desc) * adapter->num_queues,
-	adapter->rx_mbuf_sz);
-
-	IXGBE_RX_LOCK(rxr);
-
 	/* Now replenish the mbufs */
 	for (int j = 0; j != rxr->num_desc; ++j) {
 		struct mbuf *mp;
@@ -1526,6 +1513,15 @@ ixgbe_setup_receive_structures(struct ad
 	struct rx_ring *rxr = adapter->rx_rings;
 	intj;
 
+	/*
+	 * Now reinitialize our supply of jumbo mbufs.  The number
+	 * or size of jumbo mbufs may have changed.
+	 * Assume all of rxr->ptag are the same.
+	 */
+	ixgbe_jcl_reinit(>jcl_head, rxr->ptag->dt_dmat,
+	(2 * adapter->num_rx_desc) * adapter->num_queues,
+	adapter->rx_mbuf_sz);
+
 	for (j = 0; j < adapter->num_queues; j++, rxr++)
 		if (ixgbe_setup_receive_ring(rxr))
 			goto fail;

CVS commit: src/sys/dev/ic

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec  4 09:55:37 UTC 2017

Modified Files:
src/sys/dev/ic: com.c comvar.h

Log Message:
Put back SUNXI definitions in the COM_REGMAP case; com.c uses them
without #ifdef COM_AWIN.
To be safe, expand the register map to 42 entries.


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/dev/ic/com.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/comvar.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/ic/com.c
diff -u src/sys/dev/ic/com.c:1.345 src/sys/dev/ic/com.c:1.346
--- src/sys/dev/ic/com.c:1.345	Tue Oct 31 10:45:19 2017
+++ src/sys/dev/ic/com.c	Mon Dec  4 09:55:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.345 2017/10/31 10:45:19 martin Exp $ */
+/* $NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.345 2017/10/31 10:45:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -253,9 +253,10 @@ void	com_kgdb_putc(void *, int);
 #define	COM_REG_STD { \
 	com_data, com_data, com_dlbl, com_dlbh, com_ier, com_iir, com_fifo, \
 	com_efr, com_lcr, com_mcr, com_lsr, com_msr, 0, 0, 0, 0, 0, 0, 0, 0, \
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr }
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr, com_tfl, com_rfl, \
+	0, 0, 0, 0, 0, 0, 0, com_halt }
 
-const bus_size_t com_std_map[32] = COM_REG_STD;
+const bus_size_t com_std_map[42] = COM_REG_STD;
 #endif /* COM_REGMAP */
 
 #define	COMDIALOUT_MASK	TTDIALOUT_MASK

Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.85 src/sys/dev/ic/comvar.h:1.86
--- src/sys/dev/ic/comvar.h:1.85	Mon Dec  4 09:14:23 2017
+++ src/sys/dev/ic/comvar.h	Mon Dec  4 09:55:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: comvar.h,v 1.85 2017/12/04 09:14:23 bouyer Exp $	*/
+/*	$NetBSD: comvar.h,v 1.86 2017/12/04 09:55:37 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -92,19 +92,19 @@ int com_is_console(bus_space_tag_t, bus_
 #define	COM_REG_LSR		10
 #define	COM_REG_MSR		11
 #define	COM_REG_USR		31	/* 16750/SUNXI */
-#ifdef COM_AWIN
-#error "COM_AWIN not compatible with COM_REGMAP"
-#endif
+#define	COM_REG_TFL		com_tfl		/* SUNXI */
+#define	COM_REG_RFL		com_rfl		/* SUNXI */
+#define	COM_REG_HALT		com_halt	/* SUNXI */
 
 struct com_regs {
 	bus_space_tag_t		cr_iot;
 	bus_space_handle_t	cr_ioh;
 	bus_addr_t		cr_iobase;
 	bus_size_t		cr_nports;
-	bus_size_t		cr_map[32];
+	bus_size_t		cr_map[42];
 };
 
-extern const bus_size_t com_std_map[32];
+extern const bus_size_t com_std_map[42];
 
 #define	COM_INIT_REGS(regs, tag, hdl, addr)\
 	do {\

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 11:01:06 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
320, 321


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-8.0

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

CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 10:55:19 UTC 2017

Modified Files:
src/crypto/external/bsd/openssh [netbsd-8]: Makefile.inc
src/crypto/external/bsd/openssh/bin/ssh [netbsd-8]: Makefile
src/crypto/external/bsd/openssh/dist [netbsd-8]: LICENCE PROTOCOL
PROTOCOL.agent PROTOCOL.certkeys auth-options.c auth-options.h
auth-pam.c auth.c auth.h auth2-chall.c auth2-gss.c
auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-none.c
auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c
bitmap.c bufbn.c buffer.h channels.c channels.h cipher.c cipher.h
clientloop.c clientloop.h compat.c compat.h digest-libc.c
digest-openssl.c digest.h dispatch.c dispatch.h dns.c dns.h
gss-serv.c hostfile.c includes.h kex.c kex.h kexc25519c.c
kexc25519s.c kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c
kexgexs.c key.c key.h krl.c log.c log.h mac.c misc.c misc.h
monitor.c monitor_wrap.c monitor_wrap.h mux.c myproposal.h nchan.c
opacket.c opacket.h packet.c packet.h pathnames.h pfilter.c
readconf.c readconf.h scp.1 scp.c servconf.c servconf.h
serverloop.c serverloop.h session.c session.h sftp-client.c
sftp-common.c sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c
ssh-agent.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.1
ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
ssh-rsa.c ssh.1 ssh.c ssh.h ssh_api.c ssh_config ssh_config.5
sshbuf-getput-basic.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h
sshconnect2.c sshd.8 sshd.c sshd_config.5 ssherr.c ssherr.h
sshkey.c sshkey.h ttymodes.c ttymodes.h umac.c utf8.c version.h
xmalloc.c xmalloc.h
src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-8]:
moduli-gen.sh moduli.2048 moduli.3072 moduli.4096 moduli.6144
moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib [netbsd-8]: Makefile shlib_version
src/distrib/sets/lists/base [netbsd-8]: shl.mi
src/distrib/sets/lists/debug [netbsd-8]: shl.mi
src/doc [netbsd-8]: 3RDPARTY
Added Files:
src/crypto/external/bsd/openssh/dist [netbsd-8]: recallocarray.c
Removed Files:
src/crypto/external/bsd/openssh/dist [netbsd-8]: cipher-3des1.c
cipher-bf1.c deattack.c deattack.h rsa.c rsa.h ssh1.h sshconnect1.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #320):
distrib/sets/lists/base/shl.mi: 1.822
distrib/sets/lists/debug/shl.mi: 1.184
doc/3RDPARTY: 1.1475
crypto/external/bsd/openssh/Makefile.inc: up to 1.10
crypto/external/bsd/openssh/bin/ssh/Makefile: up to 1.12
crypto/external/bsd/openssh/dist/LICENCE: up to 1.6
crypto/external/bsd/openssh/dist/PROTOCOL: up to 1.10
crypto/external/bsd/openssh/dist/PROTOCOL.agent: up to 1.9
crypto/external/bsd/openssh/dist/PROTOCOL.certkeys: up to 1.8
crypto/external/bsd/openssh/dist/auth-options.c: up to 1.16
crypto/external/bsd/openssh/dist/auth-options.h: up to 1.9
crypto/external/bsd/openssh/dist/auth-pam.c: up to 1.12
crypto/external/bsd/openssh/dist/auth.c: up to 1.20
crypto/external/bsd/openssh/dist/auth.h: up to 1.16
crypto/external/bsd/openssh/dist/auth2-chall.c: up to 1.13
crypto/external/bsd/openssh/dist/auth2-gss.c: up to 1.11
crypto/external/bsd/openssh/dist/auth2-hostbased.c: up to 1.12
crypto/external/bsd/openssh/dist/auth2-kbdint.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-krb5.c: up to 1.7
crypto/external/bsd/openssh/dist/auth2-none.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-passwd.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-pubkey.c: up to 1.18
crypto/external/bsd/openssh/dist/auth2.c: up to 1.15
crypto/external/bsd/openssh/dist/authfd.c: up to 1.14
crypto/external/bsd/openssh/dist/authfd.h: up to 1.9
crypto/external/bsd/openssh/dist/authfile.c: up to 1.17
crypto/external/bsd/openssh/dist/bitmap.c: up to 1.6
crypto/external/bsd/openssh/dist/bufbn.c: up to 1.9
crypto/external/bsd/openssh/dist/buffer.h: up to 1.10
crypto/external/bsd/openssh/dist/channels.c: up to 1.20
crypto/external/bsd/openssh/dist/channels.h: up to 1.14
crypto/external/bsd/openssh/dist/cipher-3des1.c: delete
crypto/external/bsd/openssh/dist/cipher-bf1.c: delete
crypto/external/bsd/openssh/dist/cipher.c: up to 1.11
crypto/external/bsd/openssh/dist/cipher.h: up to 1.11
crypto/external/bsd/openssh/dist/clientloop.c: up to 1.22
crypto/external/bsd/openssh/dist/clientloop.h: up to 1.15
crypto/external/bsd/openssh/dist/compat.c: up to 1.17

CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 10:55:19 UTC 2017

Modified Files:
src/crypto/external/bsd/openssh [netbsd-8]: Makefile.inc
src/crypto/external/bsd/openssh/bin/ssh [netbsd-8]: Makefile
src/crypto/external/bsd/openssh/dist [netbsd-8]: LICENCE PROTOCOL
PROTOCOL.agent PROTOCOL.certkeys auth-options.c auth-options.h
auth-pam.c auth.c auth.h auth2-chall.c auth2-gss.c
auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-none.c
auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c
bitmap.c bufbn.c buffer.h channels.c channels.h cipher.c cipher.h
clientloop.c clientloop.h compat.c compat.h digest-libc.c
digest-openssl.c digest.h dispatch.c dispatch.h dns.c dns.h
gss-serv.c hostfile.c includes.h kex.c kex.h kexc25519c.c
kexc25519s.c kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c
kexgexs.c key.c key.h krl.c log.c log.h mac.c misc.c misc.h
monitor.c monitor_wrap.c monitor_wrap.h mux.c myproposal.h nchan.c
opacket.c opacket.h packet.c packet.h pathnames.h pfilter.c
readconf.c readconf.h scp.1 scp.c servconf.c servconf.h
serverloop.c serverloop.h session.c session.h sftp-client.c
sftp-common.c sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c
ssh-agent.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.1
ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
ssh-rsa.c ssh.1 ssh.c ssh.h ssh_api.c ssh_config ssh_config.5
sshbuf-getput-basic.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h
sshconnect2.c sshd.8 sshd.c sshd_config.5 ssherr.c ssherr.h
sshkey.c sshkey.h ttymodes.c ttymodes.h umac.c utf8.c version.h
xmalloc.c xmalloc.h
src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-8]:
moduli-gen.sh moduli.2048 moduli.3072 moduli.4096 moduli.6144
moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib [netbsd-8]: Makefile shlib_version
src/distrib/sets/lists/base [netbsd-8]: shl.mi
src/distrib/sets/lists/debug [netbsd-8]: shl.mi
src/doc [netbsd-8]: 3RDPARTY
Added Files:
src/crypto/external/bsd/openssh/dist [netbsd-8]: recallocarray.c
Removed Files:
src/crypto/external/bsd/openssh/dist [netbsd-8]: cipher-3des1.c
cipher-bf1.c deattack.c deattack.h rsa.c rsa.h ssh1.h sshconnect1.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #320):
distrib/sets/lists/base/shl.mi: 1.822
distrib/sets/lists/debug/shl.mi: 1.184
doc/3RDPARTY: 1.1475
crypto/external/bsd/openssh/Makefile.inc: up to 1.10
crypto/external/bsd/openssh/bin/ssh/Makefile: up to 1.12
crypto/external/bsd/openssh/dist/LICENCE: up to 1.6
crypto/external/bsd/openssh/dist/PROTOCOL: up to 1.10
crypto/external/bsd/openssh/dist/PROTOCOL.agent: up to 1.9
crypto/external/bsd/openssh/dist/PROTOCOL.certkeys: up to 1.8
crypto/external/bsd/openssh/dist/auth-options.c: up to 1.16
crypto/external/bsd/openssh/dist/auth-options.h: up to 1.9
crypto/external/bsd/openssh/dist/auth-pam.c: up to 1.12
crypto/external/bsd/openssh/dist/auth.c: up to 1.20
crypto/external/bsd/openssh/dist/auth.h: up to 1.16
crypto/external/bsd/openssh/dist/auth2-chall.c: up to 1.13
crypto/external/bsd/openssh/dist/auth2-gss.c: up to 1.11
crypto/external/bsd/openssh/dist/auth2-hostbased.c: up to 1.12
crypto/external/bsd/openssh/dist/auth2-kbdint.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-krb5.c: up to 1.7
crypto/external/bsd/openssh/dist/auth2-none.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-passwd.c: up to 1.8
crypto/external/bsd/openssh/dist/auth2-pubkey.c: up to 1.18
crypto/external/bsd/openssh/dist/auth2.c: up to 1.15
crypto/external/bsd/openssh/dist/authfd.c: up to 1.14
crypto/external/bsd/openssh/dist/authfd.h: up to 1.9
crypto/external/bsd/openssh/dist/authfile.c: up to 1.17
crypto/external/bsd/openssh/dist/bitmap.c: up to 1.6
crypto/external/bsd/openssh/dist/bufbn.c: up to 1.9
crypto/external/bsd/openssh/dist/buffer.h: up to 1.10
crypto/external/bsd/openssh/dist/channels.c: up to 1.20
crypto/external/bsd/openssh/dist/channels.h: up to 1.14
crypto/external/bsd/openssh/dist/cipher-3des1.c: delete
crypto/external/bsd/openssh/dist/cipher-bf1.c: delete
crypto/external/bsd/openssh/dist/cipher.c: up to 1.11
crypto/external/bsd/openssh/dist/cipher.h: up to 1.11
crypto/external/bsd/openssh/dist/clientloop.c: up to 1.22
crypto/external/bsd/openssh/dist/clientloop.h: up to 1.15
crypto/external/bsd/openssh/dist/compat.c: up to 1.17

CVS commit: [netbsd-8] src/etc/rc.d

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 10:59:46 UTC 2017

Modified Files:
src/etc/rc.d [netbsd-8]: sshd

Log Message:
Pull up following revision(s) (requested by sevan in ticket #321):
etc/rc.d/sshd: revision 1.24
Don't try to generate sshv1 keys on new systems.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/etc/rc.d/sshd

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

Modified files:

Index: src/etc/rc.d/sshd
diff -u src/etc/rc.d/sshd:1.23 src/etc/rc.d/sshd:1.23.8.1
--- src/etc/rc.d/sshd:1.23	Sun Oct 19 16:33:01 2014
+++ src/etc/rc.d/sshd	Mon Dec  4 10:59:46 2017
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.23 2014/10/19 16:33:01 christos Exp $
+# $NetBSD: sshd,v 1.23.8.1 2017/12/04 10:59:46 snj Exp $
 #
 
 # PROVIDE: sshd
@@ -35,7 +35,6 @@ sshd_keygen()
 			"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
 		fi
 	done << _EOF
-rsa1	0	ssh_host_key		1	RSA
 dsa	1024	ssh_host_dsa_key	2	DSA
 ecdsa	521	ssh_host_ecdsa_key	1	ECDSA
 ed25519	-1	ssh_host_ed25519_key	1	ED25519
@@ -46,8 +45,7 @@ _EOF
 
 sshd_precmd()
 {
-	if [ ! -f /etc/ssh/ssh_host_key -o \
-	! -f /etc/ssh/ssh_host_dsa_key -o \
+	if [ ! -f /etc/ssh/ssh_host_dsa_key -o \
 	! -f /etc/ssh/ssh_host_ecdsa_key -o \
 	! -f /etc/ssh/ssh_host_ed25519_key -o \
 	! -f /etc/ssh/ssh_host_rsa_key ]; then

CVS commit: [netbsd-8] src/etc/rc.d

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 10:59:46 UTC 2017

Modified Files:
src/etc/rc.d [netbsd-8]: sshd

Log Message:
Pull up following revision(s) (requested by sevan in ticket #321):
etc/rc.d/sshd: revision 1.24
Don't try to generate sshv1 keys on new systems.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/etc/rc.d/sshd

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

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec  4 11:01:06 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
320, 321


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.87 src/doc/CHANGES-8.0:1.1.2.88
--- src/doc/CHANGES-8.0:1.1.2.87	Fri Dec  1 09:50:35 2017
+++ src/doc/CHANGES-8.0	Mon Dec  4 11:01:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.87 2017/12/01 09:50:35 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.88 2017/12/04 11:01:06 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -8087,3 +8087,161 @@ xsrc/external/mit/libXcursor/include/con
 
 	Fixes for CVEs 2017-13722, 2017-13720, 2017-16611, and 2017-16612.
 	[mrg, #414]
+
+crypto/external/bsd/openssh/Makefile.incup to 1.10
+crypto/external/bsd/openssh/bin/ssh/Makefileup to 1.12
+crypto/external/bsd/openssh/dist/LICENCEup to 1.6
+crypto/external/bsd/openssh/dist/PROTOCOL   up to 1.10
+crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.9
+crypto/external/bsd/openssh/dist/PROTOCOL.certkeys up to 1.8
+crypto/external/bsd/openssh/dist/auth-options.c up to 1.16
+crypto/external/bsd/openssh/dist/auth-options.h up to 1.9
+crypto/external/bsd/openssh/dist/auth-pam.c up to 1.12
+crypto/external/bsd/openssh/dist/auth.c up to 1.20
+crypto/external/bsd/openssh/dist/auth.h up to 1.16
+crypto/external/bsd/openssh/dist/auth2-chall.c  up to 1.13
+crypto/external/bsd/openssh/dist/auth2-gss.cup to 1.11
+crypto/external/bsd/openssh/dist/auth2-hostbased.c up to 1.12
+crypto/external/bsd/openssh/dist/auth2-kbdint.c up to 1.8
+crypto/external/bsd/openssh/dist/auth2-krb5.c   up to 1.7
+crypto/external/bsd/openssh/dist/auth2-none.c   up to 1.8
+crypto/external/bsd/openssh/dist/auth2-passwd.c up to 1.8
+crypto/external/bsd/openssh/dist/auth2-pubkey.c up to 1.18
+crypto/external/bsd/openssh/dist/auth2.cup to 1.15
+crypto/external/bsd/openssh/dist/authfd.c   up to 1.14
+crypto/external/bsd/openssh/dist/authfd.h   up to 1.9
+crypto/external/bsd/openssh/dist/authfile.c up to 1.17
+crypto/external/bsd/openssh/dist/bitmap.c   up to 1.6
+crypto/external/bsd/openssh/dist/bufbn.cup to 1.9
+crypto/external/bsd/openssh/dist/buffer.h   up to 1.10
+crypto/external/bsd/openssh/dist/channels.c up to 1.20
+crypto/external/bsd/openssh/dist/channels.h up to 1.14
+crypto/external/bsd/openssh/dist/cipher-3des1.c delete
+crypto/external/bsd/openssh/dist/cipher-bf1.c   delete
+crypto/external/bsd/openssh/dist/cipher.c   up to 1.11
+crypto/external/bsd/openssh/dist/cipher.h   up to 1.11
+crypto/external/bsd/openssh/dist/clientloop.c   up to 1.22
+crypto/external/bsd/openssh/dist/clientloop.h   up to 1.15
+crypto/external/bsd/openssh/dist/compat.c   up to 1.17
+crypto/external/bsd/openssh/dist/compat.h   up to 1.10
+crypto/external/bsd/openssh/dist/deattack.c delete
+crypto/external/bsd/openssh/dist/deattack.h delete
+crypto/external/bsd/openssh/dist/digest-libc.c  up to 1.7
+crypto/external/bsd/openssh/dist/digest-openssl.c up to 1.6
+crypto/external/bsd/openssh/dist/digest.h   up to 1.1.1.3
+crypto/external/bsd/openssh/dist/dispatch.c up to 1.9
+crypto/external/bsd/openssh/dist/dispatch.h up to 1.7
+crypto/external/bsd/openssh/dist/dns.c  up to 1.15
+crypto/external/bsd/openssh/dist/dns.h  up to 1.10
+crypto/external/bsd/openssh/dist/gss-serv.c up to 1.11
+crypto/external/bsd/openssh/dist/hostfile.c up to 1.11
+crypto/external/bsd/openssh/dist/includes.h up to 1.7
+crypto/external/bsd/openssh/dist/kex.c  up to 1.19
+crypto/external/bsd/openssh/dist/kex.h  up to 1.16
+crypto/external/bsd/openssh/dist/kexc25519c.c   up to 1.7
+crypto/external/bsd/openssh/dist/kexc25519s.c   up to 1.9
+crypto/external/bsd/openssh/dist/kexdhc.c   up to 1.10
+crypto/external/bsd/openssh/dist/kexdhs.c   up to 1.13
+crypto/external/bsd/openssh/dist/kexecdhc.c up to 1.8
+crypto/external/bsd/openssh/dist/kexecdhs.c up to 1.9
+crypto/external/bsd/openssh/dist/kexgexc.c  up to 1.10
+crypto/external/bsd/openssh/dist/kexgexs.c  up to 1.14
+crypto/external/bsd/openssh/dist/key.c  up to 1.22
+crypto/external/bsd/openssh/dist/key.h  up to 1.14
+crypto/external/bsd/openssh/dist/krl.c  up to 1.11
+crypto/external/bsd/openssh/dist/log.c  up to 1.17
+crypto/external/bsd/openssh/dist/log.h  up to 1.13
+crypto/external/bsd/openssh/dist/mac.c  up to 1.15
+crypto/external/bsd/openssh/dist/misc.c up to 1.16
+crypto/external/bsd/openssh/dist/misc.h up to 1.13
+crypto/external/bsd/openssh/dist/moduli-gen/moduli-gen.sh up to 1.1.1.2

Re: CVS commit: src/sys

[Joerg Sonnenberger]

On Mon, Dec 04, 2017 at 10:14:33AM +0100, Manuel Bouyer wrote:
> On Mon, Dec 04, 2017 at 09:48:32AM +0100, Joerg Sonnenberger wrote:
> > On Fri, May 27, 2016 at 08:01:49PM +, Manuel Bouyer wrote:
> > > Module Name:  src
> > > Committed By: bouyer
> > > Date: Fri May 27 20:01:49 UTC 2016
> > > 
> > > Modified Files:
> > >   src/sys/arch/arm/allwinner: files.awin
> > >   src/sys/conf: files
> > >   src/sys/dev/ic: com.c comreg.h comvar.h ns16550reg.h
> > > 
> > > Log Message:
> > > The UART in the allwiner SoCs is not full-compatible with the 16550, and
> > > it's not a 16750 either. Like the 16750 it has the IIR_BUSY interrupt,
> > > which is triggered when writing to LCR while the chip
> > > can't accept it. But unlike the 16750, it has a specific register,
> > > HALT, to allow writing to the LCR and divisor registers, and then
> > > commit the changes.
> > > Tested on an A20 SoC, changing the baud rate while keeping the
> > > tty device open and incoming data.
> > 
> > Hello Manuel,
> > I'm not sure how you tested this, but you are trivally accessing an array
> > beyond the end. COM_REG_TFL and friends are all larger than the cr_map 
> > array.
> 
> Inded, but cr_map is used only if COM_REGMAP is defined, which is not
> the case for allwinner. That's why it works ...
> 
> I'll add a #error for this case.

That doesn't help since the code in com.c is compiled into the ARMADAXP
kernel.

Joerg

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Mon Dec  4 12:53:46 UTC 2017

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Temporarily disable t_ptrace_wait*::resume1 in ATF tests

It hangs forever on releng machines.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/sys/t_ptrace_wait.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/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.10 src/tests/lib/libc/sys/t_ptrace_wait.c:1.11
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.10	Sat Nov 18 17:00:00 2017
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Mon Dec  4 12:53:46 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.10 2017/11/18 17:00:00 martin Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.11 2017/12/04 12:53:46 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.10 2017/11/18 17:00:00 martin Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.11 2017/12/04 12:53:46 kamil Exp $");
 
 #include 
 #include 
@@ -7256,7 +7256,13 @@ ATF_TC_BODY(resume1, tc)
 	struct ptrace_lwpinfo pl;
 	struct ptrace_siginfo psi;
 
+#if 0
 	atf_tc_expect_timeout("PR kern/51995");
+#else
+	/* This tests hangs forever on releng machines now */
+	atf_tc_expect_fail("PR kern/51995");
+	ATF_REQUIRE(0 && "In order to get reliable failure, abort");
+#endif
 
 	ATF_REQUIRE(msg_open() == 0);
 

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Mon Dec  4 12:53:46 UTC 2017

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Temporarily disable t_ptrace_wait*::resume1 in ATF tests

It hangs forever on releng machines.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/sys/t_ptrace_wait.c

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

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 13:56:05 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Ammend revision list for #407


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-8.0

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

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 13:56:05 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Ammend revision list for #407


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.88 src/doc/CHANGES-8.0:1.1.2.89
--- src/doc/CHANGES-8.0:1.1.2.88	Mon Dec  4 11:01:06 2017
+++ src/doc/CHANGES-8.0	Mon Dec  4 13:56:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.88 2017/12/04 11:01:06 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.89 2017/12/04 13:56:05 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -8002,7 +8002,7 @@ sys/netipsec/key.h1.33
 	softint.
 	[ozaki-r, ticket #406]
 
-sys/compat/common/uipc_syscalls_40.c		1.14
+sys/compat/common/uipc_syscalls_40.c		1.14-1.15
 sys/compat/linux/common/linux_socket.c		1.139
 sys/compat/linux32/common/linux32_socket.c	1.28
 sys/net/if.c	1.400

CVS commit: src/etc/rc.d

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Dec  4 14:50:33 UTC 2017

Modified Files:
src/etc/rc.d: sshd

Log Message:
Do away with (not well specified, even if it happens to work) absurd
15 arg test ([ ]) expression, and replace it with several well defined
2 arg tests, combined with (also well defined) sh syntax.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/etc/rc.d/sshd

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

Modified files:

Index: src/etc/rc.d/sshd
diff -u src/etc/rc.d/sshd:1.24 src/etc/rc.d/sshd:1.25
--- src/etc/rc.d/sshd:1.24	Sat Oct  7 21:41:51 2017
+++ src/etc/rc.d/sshd	Mon Dec  4 14:50:33 2017
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.24 2017/10/07 21:41:51 sevan Exp $
+# $NetBSD: sshd,v 1.25 2017/12/04 14:50:33 kre Exp $
 #
 
 # PROVIDE: sshd
@@ -45,10 +45,10 @@ _EOF
 
 sshd_precmd()
 {
-	if [ ! -f /etc/ssh/ssh_host_dsa_key -o \
-	! -f /etc/ssh/ssh_host_ecdsa_key -o \
-	! -f /etc/ssh/ssh_host_ed25519_key -o \
-	! -f /etc/ssh/ssh_host_rsa_key ]; then
+	if ! [ -f /etc/ssh/ssh_host_dsa_key ]	  ||
+	   ! [ -f /etc/ssh/ssh_host_ecdsa_key ]	  ||
+	   ! [ -f /etc/ssh/ssh_host_ed25519_key ] ||
+	   ! [ -f /etc/ssh/ssh_host_rsa_key ];	then
 		run_rc_command keygen
 	fi
 }

CVS commit: src/etc/rc.d

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Dec  4 14:50:33 UTC 2017

Modified Files:
src/etc/rc.d: sshd

Log Message:
Do away with (not well specified, even if it happens to work) absurd
15 arg test ([ ]) expression, and replace it with several well defined
2 arg tests, combined with (also well defined) sh syntax.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/etc/rc.d/sshd

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

CVS commit: [netbsd-8] src/sys/compat/common

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 13:55:00 UTC 2017

Modified Files:
src/sys/compat/common [netbsd-8]: uipc_syscalls_40.c

Log Message:
Additionaly pull up rev 1.15 for ticket #407, requested by ozaki-r:
#idef the label next_ifa: just like the only goto using it.


To generate a diff of this commit:
cvs rdiff -u -r1.13.6.1 -r1.13.6.2 src/sys/compat/common/uipc_syscalls_40.c

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

Modified files:

Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.13.6.1 src/sys/compat/common/uipc_syscalls_40.c:1.13.6.2
--- src/sys/compat/common/uipc_syscalls_40.c:1.13.6.1	Thu Nov 30 15:57:37 2017
+++ src/sys/compat/common/uipc_syscalls_40.c	Mon Dec  4 13:55:00 2017
@@ -1,9 +1,9 @@
-/*	$NetBSD: uipc_syscalls_40.c,v 1.13.6.1 2017/11/30 15:57:37 martin Exp $	*/
+/*	$NetBSD: uipc_syscalls_40.c,v 1.13.6.2 2017/12/04 13:55:00 martin Exp $	*/
 
 /* written by Pavel Cahyna, 2006. Public domain. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.13.6.1 2017/11/30 15:57:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.13.6.2 2017/12/04 13:55:00 martin Exp $");
 
 /*
  * System call interface to the socket abstraction.
@@ -124,7 +124,9 @@ compat_ifconf(u_long cmd, void *data)
 			}
 			space -= sz;
 
+#ifdef COMPAT_OSOCK
 		next_ifa:
+#endif
 			s = pserialize_read_enter();
 			ifa_release(ifa, _ifa);
 		}

CVS commit: [netbsd-8] src/sys/compat/common

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Dec  4 13:55:00 UTC 2017

Modified Files:
src/sys/compat/common [netbsd-8]: uipc_syscalls_40.c

Log Message:
Additionaly pull up rev 1.15 for ticket #407, requested by ozaki-r:
#idef the label next_ifa: just like the only goto using it.


To generate a diff of this commit:
cvs rdiff -u -r1.13.6.1 -r1.13.6.2 src/sys/compat/common/uipc_syscalls_40.c

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