CVS commit: src/lib/libc/arch/aarch64/sys

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Thu Oct 12 05:51:51 UTC 2017

Modified Files:
src/lib/libc/arch/aarch64/sys: cerror.S

Log Message:
return 0x (= -1). not 0x.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/sys/cerror.S

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

Modified files:

Index: src/lib/libc/arch/aarch64/sys/cerror.S
diff -u src/lib/libc/arch/aarch64/sys/cerror.S:1.1 src/lib/libc/arch/aarch64/sys/cerror.S:1.2
--- src/lib/libc/arch/aarch64/sys/cerror.S:1.1	Sun Aug 10 05:47:37 2014
+++ src/lib/libc/arch/aarch64/sys/cerror.S	Thu Oct 12 05:51:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
+/* $NetBSD: cerror.S,v 1.2 2017/10/12 05:51:51 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@ ENTRY_NP(__cerror)
 	bl	_C_LABEL(__errno)
 	str	w19, [x0]
 	ldp	x19, x30, [sp], #16
-	mvn	w0,wzr
+	mvn	x0, xzr
 	ret
 	.cfi_endproc
 END(__cerror)

CVS commit: src/usr.bin/passwd

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Thu Oct 12 05:00:23 UTC 2017

Modified Files:
src/usr.bin/passwd: passwd.c

Log Message:
fix compile error without USE_PAM (-Werror,-Wmissing-noreturn)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/passwd/passwd.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.bin/passwd/passwd.c
diff -u src/usr.bin/passwd/passwd.c:1.31 src/usr.bin/passwd/passwd.c:1.32
--- src/usr.bin/passwd/passwd.c:1.31	Sat Sep  3 02:24:04 2016
+++ src/usr.bin/passwd/passwd.c	Thu Oct 12 05:00:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: passwd.c,v 1.31 2016/09/03 02:24:04 sevan Exp $	*/
+/*	$NetBSD: passwd.c,v 1.32 2017/10/12 05:00:23 ryo Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "from: @(#)passwd.c8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: passwd.c,v 1.31 2016/09/03 02:24:04 sevan Exp $");
+__RCSID("$NetBSD: passwd.c,v 1.32 2017/10/12 05:00:23 ryo Exp $");
 #endif
 #endif /* not lint */
 
@@ -231,7 +231,7 @@ static struct pw_module_s {
 	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
  
-static void
+static void __attribute__((__noreturn__))
 usage(void)
 {
 	int i;

CVS commit: src/doc

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Oct 12 03:31:39 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
Mention NOMPSAFE


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/doc/TODO.smpnet:1.15
--- src/doc/TODO.smpnet:1.14	Thu Oct 12 03:27:00 2017
+++ src/doc/TODO.smpnet	Thu Oct 12 03:31:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.14 2017/10/12 03:27:00 knakahara Exp $
+$NetBSD: TODO.smpnet,v 1.15 2017/10/12 03:31:39 ozaki-r Exp $
 
 MP-safe components
 ==
@@ -84,6 +84,14 @@ Non MP-safe components and kernel option
 Know issues
 ===
 
+NOMPSAFE
+
+
+We use "NOMPSAFE" as a mark that indicates that the code around it isn't MP-safe
+yet.  We use it in comments and also use as part of function names, for example
+m_get_rcvif_NOMPSAFE.  Let's use "NOMPSAFE" to make it easy to find non-MP-safe
+codes by grep.
+
 bpf
 ---
 

CVS commit: src/doc

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Thu Oct 12 03:27:00 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
add opencrypto(9)'s scalability comment


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/doc/TODO.smpnet:1.14
--- src/doc/TODO.smpnet:1.13	Thu Aug 10 09:26:55 2017
+++ src/doc/TODO.smpnet	Thu Oct 12 03:27:00 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.13 2017/08/10 09:26:55 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.14 2017/10/12 03:27:00 knakahara Exp $
 
 MP-safe components
 ==
@@ -153,3 +153,5 @@ Scalability
flows per CPU
  - ipsec(4) isn't scalable on the number of SA/SP; the cost of a look-up
is O(n)
+ - opencrypto(9)'s crypto_newsession()/crypto_freesession() aren't scalable
+   as they are serialized by one mutex

CVS commit: src/doc

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Oct 12 03:07:39 UTC 2017

Modified Files:
src/doc: CHANGES.prev

Log Message:
Mention MP-ifications of bpf, vlan, opencrypto and ipsec


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/doc/CHANGES.prev

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.prev
diff -u src/doc/CHANGES.prev:1.135 src/doc/CHANGES.prev:1.136
--- src/doc/CHANGES.prev:1.135	Wed Aug 30 15:20:09 2017
+++ src/doc/CHANGES.prev	Thu Oct 12 03:07:39 2017
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.135 $>
+LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.136 $>
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -12166,6 +12166,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	bind: Import version 9.10.4-P6. [christos 20170208]
 	openldap: Import 2.4.44. [christos 20170208]
 	libc: Add accept4 function for compatibility [maya 20170208]
+	bpf(4): Make it MP-safe [ozaki-r 20170209]
 	file(1): Upgraded to 5.30. [christos 20170210]
 	byacc: update to 20170201 [christos 20170211]
 	ptrace(2): Add signal mask information accessors API:
@@ -12223,5 +12224,8 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	file(1): Upgraded to 5.31. [christos 20170524]
 	can(4): Added a socketcan implementation, a socket layer for
 		CAN busses. [bouyer 20170527]
+	vlan(4): Make it MP-safe from s-yamaguchi@IIJ [knakahara 20170607]
+	opencrypto(9): Complete MP-ification [knakahara 20170731]
+	ipsec(4): Make it MP-safe [ozaki-r 20170809]
 	evbmips: Merge sbmips port into evbmips. [mrg 20170815]
 

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Oct 12 02:40:59 UTC 2017

Modified Files:
src/sys/net: if_vlan.c

Log Message:
Set IFEF_START_MPSAFE by default

Because vlan_start is already MP-safe, there is no reason to not do so.

Acked by s-yamaguchi@IIJ


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.102 src/sys/net/if_vlan.c:1.103
--- src/sys/net/if_vlan.c:1.102	Wed Oct 11 08:29:17 2017
+++ src/sys/net/if_vlan.c	Thu Oct 12 02:40:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.102 2017/10/11 08:29:17 msaitoh Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.103 2017/10/12 02:40:59 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,11 +78,10 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.102 2017/10/11 08:29:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.103 2017/10/12 02:40:59 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
-#include "opt_net_mpsafe.h"
 #endif
 
 #include 
@@ -123,10 +122,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 
 
 #include "ioconf.h"
 
-#ifdef NET_MPSAFE
-#define VLAN_MPSAFE		1
-#endif
-
 struct vlan_mc_entry {
 	LIST_ENTRY(vlan_mc_entry)	mc_entries;
 	/*
@@ -342,9 +337,7 @@ vlan_clone_create(struct if_clone *ifc, 
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_softc = ifv;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-#ifdef VLAN_MPSAFE
 	ifp->if_extflags = IFEF_START_MPSAFE;
-#endif
 	ifp->if_start = vlan_start;
 	ifp->if_transmit = vlan_transmit;
 	ifp->if_ioctl = vlan_ioctl;
@@ -1193,10 +1186,6 @@ vlan_start(struct ifnet *ifp)
 	struct psref psref;
 	int error;
 
-#ifndef NET_MPSAFE
-	KASSERT(KERNEL_LOCKED_P());
-#endif
-
 	mib = vlan_getref_linkmib(ifv, );
 	if (mib == NULL)
 		return;

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 12 02:40:34 UTC 2017

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

Log Message:
IOMMU cap dump fixes:
- Print Capability Register's value.
- Indent output correctly.
- s/cahced/cached/
- Print MSI Message number with 0x%02x


To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.192 src/sys/dev/pci/pci_subr.c:1.193
--- src/sys/dev/pci/pci_subr.c:1.192	Tue Oct 10 03:11:01 2017
+++ src/sys/dev/pci/pci_subr.c	Thu Oct 12 02:40:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.192 2017/10/10 03:11:01 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.193 2017/10/12 02:40:34 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.192 2017/10/10 03:11:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.193 2017/10/12 02:40:34 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1538,8 +1538,9 @@ pci_conf_print_secure_cap(const pcireg_t
 
 	printf("\n  Secure Capability Register\n");
 	reg = regs[o2i(capoff + PCI_SECURE_CAP)];
+	printf("Capability Register: 0x%04x\n", reg >> 16);
 	val = __SHIFTOUT(reg, PCI_SECURE_CAP_TYPE);
-	printf("Capability block type: ");
+	printf("  Capability block type: ");
 	/* I know IOMMU Only */
 	if (val == PCI_SECURE_CAP_TYPE_IOMMU)
 		printf("IOMMU\n");
@@ -1549,9 +1550,9 @@ pci_conf_print_secure_cap(const pcireg_t
 	}
 
 	val = __SHIFTOUT(reg, PCI_SECURE_CAP_REV);
-	printf("Capability revision: 0x%02x", val);
+	printf("  Capability revision: 0x%02x ", val);
 	if (val == PCI_SECURE_CAP_REV_IOMMU)
-		printf("IOMMU\n");
+		printf("(IOMMU)\n");
 	else {
 		printf("(unknown)\n");
 		return;
@@ -1559,7 +1560,7 @@ pci_conf_print_secure_cap(const pcireg_t
 	onoff("IOTLB support", reg, PCI_SECURE_CAP_IOTLBSUP);
 	onoff("HyperTransport tunnel translation support", reg,
 	PCI_SECURE_CAP_HTTUNNEL);
-	onoff("Not present table entries cahced", reg, PCI_SECURE_CAP_NPCACHE);
+	onoff("Not present table entries cached", reg, PCI_SECURE_CAP_NPCACHE);
 	onoff("IOMMU Extended Feature Register support", reg,
 	PCI_SECURE_CAP_EFRSUP);
 	onoff("IOMMU Miscellaneous Information Register 1", reg,
@@ -1589,7 +1590,7 @@ pci_conf_print_secure_cap(const pcireg_t
 
 	reg = regs[o2i(capoff + PCI_SECURE_IOMMU_MISC0)];
 	printf("Miscellaneous Information Register 0: 0x%08x\n", reg);
-	printf("  MSI Message number: 0x%04x\n",
+	printf("  MSI Message number: 0x%02x\n",
 	(uint32_t)__SHIFTOUT(reg, PCI_SECURE_IOMMU_MISC0_MSINUM));
 	val = __SHIFTOUT(reg, PCI_SECURE_IOMMU_MISC0_GVASIZE);
 	printf("  Guest Virtual Address size: ");

CVS commit: src/share/man/man8

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Wed Oct 11 23:42:33 UTC 2017

Modified Files:
src/share/man/man8: rc.8

Log Message:
Clarify foo.sh behaviour

Improve wording of the warning for "foo.sh" behaviour,
to reduce ambiguity.
Per feedback from Sascha Wildner.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/share/man/man8/rc.8

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

Modified files:

Index: src/share/man/man8/rc.8
diff -u src/share/man/man8/rc.8:1.37 src/share/man/man8/rc.8:1.38
--- src/share/man/man8/rc.8:1.37	Sat Dec 17 07:37:24 2016
+++ src/share/man/man8/rc.8	Wed Oct 11 23:42:33 2017
@@ -1,6 +1,6 @@
-.\" 	$NetBSD: rc.8,v 1.37 2016/12/17 07:37:24 maya Exp $
+.\" 	$NetBSD: rc.8,v 1.38 2017/10/11 23:42:33 lukem Exp $
 .\"
-.\" Copyright (c) 2000-2004 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2000-2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -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 December 17, 2016
+.Dd October 12, 2017
 .Dt RC 8
 .Os
 .Sh NAME
@@ -237,7 +237,7 @@ have a
 .Sq Pa .sh
 suffix.
 Extreme care must be taken in using this, as the startup sequence will
-terminate if the script does.
+terminate if the script terminates.
 .Pa /etc/rc.d/bootconf.sh
 uses this behaviour to allow the user to select a different
 configuration (including

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Oct 11 22:55:18 UTC 2017

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

Log Message:
312, 318, 319


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.64 -r1.1.2.65 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.64 src/doc/CHANGES-8.0:1.1.2.65
--- src/doc/CHANGES-8.0:1.1.2.64	Mon Oct  9 18:09:09 2017
+++ src/doc/CHANGES-8.0	Wed Oct 11 22:55:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.64 2017/10/09 18:09:09 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.65 2017/10/11 22:55:18 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -6092,11 +6092,118 @@ sys/net/if_bridge.c1.135
 	It can be called in a thread context via tap (tap_dev_write).
 	[ozaki-r, ticket #297]
 
+external/gpl3/gcc/lib/libgcc/arch/m68000/defs.mk patch
+external/gpl3/gcc/lib/libiberty/defs.mk		patch
+external/gpl3/gcc/lib/libiberty/arch/ia64/config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/arm/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earm/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/c++config.h patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/defs.mk patch
+external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h patch

CVS commit: [netbsd-8] src/distrib/sets/lists/comp

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Oct 11 22:54:10 UTC 2017

Modified Files:
src/distrib/sets/lists/comp [netbsd-8]: mi

Log Message:
Pull up following revision(s) (requested by christos in ticket #319):
distrib/sets/lists/comp/mi: revision 1.2150
distrib/sets/lists/comp/mi: revision 1.2149
Don't install stdatomic.h if we don't have gcccmds. This is prolly the wrong
fix but only sun2 is affected. Perhaps it is better to descend into
usr.bin/include and install there because that also installs tgmath.h and
unfortunately math-68881.h...
Missed a "C"


To generate a diff of this commit:
cvs rdiff -u -r1.2138.2.2 -r1.2138.2.3 src/distrib/sets/lists/comp/mi

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2138.2.2 src/distrib/sets/lists/comp/mi:1.2138.2.3
--- src/distrib/sets/lists/comp/mi:1.2138.2.2	Mon Oct  9 18:05:11 2017
+++ src/distrib/sets/lists/comp/mi	Wed Oct 11 22:54:09 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2138.2.2 2017/10/09 18:05:11 snj Exp $
+#	$NetBSD: mi,v 1.2138.2.3 2017/10/11 22:54:09 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -1989,7 +1989,7 @@
 ./usr/include/gcc-4.8/omp.h			comp-gcc-include	gcc=48
 ./usr/include/gcc-5/omp.h			comp-gcc-include	gcc=53
 ./usr/include/gcc-5/openacc.h			comp-gcc-include	gcc=53
-./usr/include/gcc-5/stdatomic.h			comp-gcc-include	gcc=53
+./usr/include/gcc-5/stdatomic.h			comp-gcc-include	gcc=53,gcccmds
 ./usr/include/gelf.hcomp-c-include
 ./usr/include/getopt.hcomp-c-include
 ./usr/include/glob.hcomp-c-include

CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Oct 11 22:49:49 UTC 2017

Modified Files:
src/distrib/sets/lists/base [netbsd-8]: md.amd64 shl.mi
src/distrib/sets/lists/comp [netbsd-8]: shl.mi
src/distrib/sets/lists/debug [netbsd-8]: ad.arm md.amd64 shl.mi
src/distrib/sets/lists/xbase [netbsd-8]: shl.mi
src/distrib/sets/lists/xdebug [netbsd-8]: shl.mi
src/external/bsd/atf/lib/libatf-c++ [netbsd-8]: shlib_version
src/external/bsd/libproc/lib [netbsd-8]: Makefile
src/external/gpl3/gcc/lib/libasan [netbsd-8]: shlib_version
src/external/gpl3/gcc/lib/libstdc++-v3 [netbsd-8]: Makefile
src/external/gpl3/gcc/lib/libubsan [netbsd-8]: shlib_version
src/external/mit/xorg/lib/libGL [netbsd-8]: shlib_version
src/external/mit/xorg/lib/libGLU [netbsd-8]: shlib_version
src/external/mit/xorg/lib/libglapi [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by christos in ticket #318):
distrib/sets/lists/base/md.amd64: revision 1.271 via patch
distrib/sets/lists/base/shl.mi: revision 1.820, 1.821
distrib/sets/lists/comp/shl.mi: revision 1.307
distrib/sets/lists/debug/ad.arm: revision 1.75
distrib/sets/lists/debug/md.amd64: revision 1.99
distrib/sets/lists/debug/shl.mi: revision 1.182, 1.183
distrib/sets/lists/xbase/shl.mi: revision 1.78
distrib/sets/lists/xdebug/shl.mi: revision 1.41
external/bsd/atf/lib/libatf-c++/shlib_version: revision 1.3
external/bsd/libproc/lib/Makefile: revision 1.4
external/gpl3/gcc/lib/libasan/shlib_version: revision 1.3
external/gpl3/gcc/lib/libstdc++-v3/Makefile: patch
external/gpl3/gcc/lib/libubsan/shlib_version: revision 1.2
external/mit/xorg/lib/libGL/shlib_version: revision 1.3
external/mit/xorg/lib/libGLU/shlib_version: revision 1.4
external/mit/xorg/lib/libglapi/Makefile: revision 1.2
bump libstdc++ to account for disabling the "dual abi".
bump because of libstdc++
bump because of libstdc++
bump because libstdc++
bump libraries that depend on libstdc++.
bump c++ libraries because of the libstdc++ dual abi bump
bump libglapi, libGL libGLU because of the libstdc++ dual abi bump


To generate a diff of this commit:
cvs rdiff -u -r1.268.4.1 -r1.268.4.2 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.817.2.1 -r1.817.2.2 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.306 -r1.306.2.1 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.74 -r1.74.6.1 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.176.2.2 -r1.176.2.3 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.76 -r1.76.4.1 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.39 -r1.39.4.1 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.2 -r1.2.18.1 \
src/external/bsd/atf/lib/libatf-c++/shlib_version
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/libproc/lib/Makefile
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl3/gcc/lib/libasan/shlib_version
cvs rdiff -u -r1.26 -r1.26.4.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 src/external/gpl3/gcc/lib/libubsan/shlib_version
cvs rdiff -u -r1.2 -r1.2.40.1 src/external/mit/xorg/lib/libGL/shlib_version
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/mit/xorg/lib/libGLU/shlib_version
cvs rdiff -u -r1.1 -r1.1.10.1 src/external/mit/xorg/lib/libglapi/Makefile

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

Modified files:

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.268.4.1 src/distrib/sets/lists/base/md.amd64:1.268.4.2
--- src/distrib/sets/lists/base/md.amd64:1.268.4.1	Tue Aug  1 23:18:30 2017
+++ src/distrib/sets/lists/base/md.amd64	Wed Oct 11 22:49:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.268.4.1 2017/08/01 23:18:30 snj Exp $
+# $NetBSD: md.amd64,v 1.268.4.2 2017/10/11 22:49:48 snj Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -7,8 +7,8 @@
 ./usr/bin/pmc	base-util-bin
 ./usr/lib/i386/libi386.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libi386.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libproc.so.0			base-compat-shlib	compat,pic,dtrace
-./usr/lib/i386/libproc.so.0.0			base-compat-shlib	compat,pic,dtrace
+./usr/lib/i386/libproc.so.1			base-compat-shlib	compat,pic,dtrace
+./usr/lib/i386/libproc.so.1.0			base-compat-shlib	compat,pic,dtrace
 ./usr/lib/i386/librtld_db.so.0			base-compat-shlib	compat,pic,dtrace
 ./usr/lib/i386/librtld_db.so.0.0		base-compat-shlib	compat,pic,dtrace
 ./usr/lib/libx86_64.sobase-sys-shlib		pic

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.817.2.1 src/distrib/sets/lists/base/shl.mi:1.817.2.2
--- 

CVS commit: src/sys/dev/pci

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Oct 11 17:08:32 UTC 2017

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

Log Message:
add missing break;s


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/radeonfb.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/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.92 src/sys/dev/pci/radeonfb.c:1.93
--- src/sys/dev/pci/radeonfb.c:1.92	Fri Aug 25 22:45:33 2017
+++ src/sys/dev/pci/radeonfb.c	Wed Oct 11 17:08:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeonfb.c,v 1.92 2017/08/25 22:45:33 macallan Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.93 2017/10/11 17:08:32 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.92 2017/08/25 22:45:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.93 2017/10/11 17:08:32 macallan Exp $");
 
 #include 
 #include 
@@ -710,6 +710,7 @@ radeonfb_attach(device_t parent, device_
   RADEON_FP_SEL_CRTC1,
 ~RADEON_FP_SEL_MASK);
 			}
+			break;
 		case RADEON_TMDS_EXT:
 			/* point FP2 at the CRTC this port uses */
 			DPRINTF(("%s: plugging external TMDS into CRTC %d\n",
@@ -727,6 +728,7 @@ radeonfb_attach(device_t parent, device_
   RADEON_FP2_SRC_SEL_CRTC1,
 ~RADEON_FP2_SRC_SEL_CRTC2);
 			}
+			break;
 		}
 	}
 	PRINTREG(RADEON_DAC_CNTL2);

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Oct 11 16:56:26 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64: machdep.c

Log Message:
Use bootspace.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/arch/amd64/amd64/machdep.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.263 src/sys/arch/amd64/amd64/machdep.c:1.264
--- src/sys/arch/amd64/amd64/machdep.c:1.263	Sun Oct  8 09:06:50 2017
+++ src/sys/arch/amd64/amd64/machdep.c	Wed Oct 11 16:56:26 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.263 2017/10/08 09:06:50 maxv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.264 2017/10/11 16:56:26 maxv Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.263 2017/10/08 09:06:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.264 2017/10/11 16:56:26 maxv Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -1994,16 +1994,44 @@ cpu_initclocks(void)
 int
 mm_md_kernacc(void *ptr, vm_prot_t prot, bool *handled)
 {
-	extern char start, __data_start;
 	const vaddr_t v = (vaddr_t)ptr;
+	vaddr_t kva, kva_end;
 
-	if (v >= (vaddr_t) && v < (vaddr_t)kern_end) {
+	kva = bootspace.text.va;
+	kva_end = kva + bootspace.text.sz;
+	if (v >= kva && v < kva_end) {
 		*handled = true;
-		/* Either the text or rodata segment */
-		if (v < (vaddr_t)&__data_start && (prot & VM_PROT_WRITE))
+		if (prot & VM_PROT_WRITE) {
 			return EFAULT;
+		}
+		return 0;
+	}
+
+	kva = bootspace.rodata.va;
+	kva_end = kva + bootspace.rodata.sz;
+	if (v >= kva && v < kva_end) {
+		*handled = true;
+		if (prot & VM_PROT_WRITE) {
+			return EFAULT;
+		}
+		return 0;
+	}
+
+	kva = bootspace.data.va;
+	kva_end = kva + bootspace.data.sz;
+	if (v >= kva && v < kva_end) {
+		*handled = true;
+		return 0;
+	}
+
+	kva = bootspace.boot.va;
+	kva_end = kva + bootspace.boot.sz;
+	if (v >= kva && v < kva_end) {
+		*handled = true;
+		return 0;
+	}
 
-	} else if (v >= module_start && v < module_end) {
+	if (v >= module_start && v < module_end) {
 		*handled = true;
 		if (!uvm_map_checkprot(module_map, v, v + 1, prot))
 			return EFAULT;

CVS commit: src/sys/arch/amd64/stand/prekern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Oct 11 16:21:06 UTC 2017

Modified Files:
src/sys/arch/amd64/stand/prekern: elf.c

Log Message:
Make sure we're relocating a relocatable kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/stand/prekern/elf.c

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

Modified files:

Index: src/sys/arch/amd64/stand/prekern/elf.c
diff -u src/sys/arch/amd64/stand/prekern/elf.c:1.1 src/sys/arch/amd64/stand/prekern/elf.c:1.2
--- src/sys/arch/amd64/stand/prekern/elf.c:1.1	Tue Oct 10 09:29:14 2017
+++ src/sys/arch/amd64/stand/prekern/elf.c	Wed Oct 11 16:21:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf.c,v 1.1 2017/10/10 09:29:14 maxv Exp $	*/
+/*	$NetBSD: elf.c,v 1.2 2017/10/11 16:21:06 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -86,7 +86,8 @@ static int
 elf_check_header()
 {
 	if (memcmp((char *)eif.ehdr->e_ident, ELFMAG, SELFMAG) != 0 ||
-	eif.ehdr->e_ident[EI_CLASS] != ELFCLASS) {
+	eif.ehdr->e_ident[EI_CLASS] != ELFCLASS ||
+	eif.ehdr->e_type != ET_REL) {
 		return -1;
 	}
 	return 0;

CVS commit: src/sys/arch/amd64/stand/prekern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Oct 11 16:18:11 UTC 2017

Modified Files:
src/sys/arch/amd64/stand/prekern: locore.S

Log Message:
Remove this #if, these options belong to the kernel and not the prekern.
No real change since eblob is always here. And I was apparently drunk
when writing some comments.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/stand/prekern/locore.S

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

Modified files:

Index: src/sys/arch/amd64/stand/prekern/locore.S
diff -u src/sys/arch/amd64/stand/prekern/locore.S:1.1 src/sys/arch/amd64/stand/prekern/locore.S:1.2
--- src/sys/arch/amd64/stand/prekern/locore.S:1.1	Tue Oct 10 09:29:14 2017
+++ src/sys/arch/amd64/stand/prekern/locore.S	Wed Oct 11 16:18:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.1 2017/10/10 09:29:14 maxv Exp $	*/
+/*	$NetBSD: locore.S,v 1.2 2017/10/11 16:18:11 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000, 2007, 2008, 2016, 2017 The NetBSD Foundation, Inc.
@@ -366,21 +366,19 @@ no_NOX:
 	/* Find end of the prekern image; brings us on (1). */
 	movl	$_C_LABEL(__prekern_end),%edi
 
-	/* Find end of the kernel image; brind us on (2). */
+	/* Find end of the kernel image; brings us on (2). */
 	movl	_C_LABEL(kernpa_end),%eax
 	testl	%eax,%eax
 	jz	1f
 	movl	%eax,%edi
 1:
 
-	/* Find end of the kernel symbols; brinds us on (3). */
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB) /* XXX */
+	/* Find end of the kernel symbols; brings us on (3). */
 	movl	_C_LABEL(esym),%eax
 	testl	%eax,%eax
 	jz	1f
 	movl	%eax,%edi
 1:
-#endif
 
 	/* Find end of the kernel preloaded modules; brings us on (4). */
 	movl	_C_LABEL(eblob),%eax

CVS commit: src/sys/arch/amd64/stand/prekern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Oct 11 16:13:16 UTC 2017

Modified Files:
src/sys/arch/amd64/stand/prekern: prekern.ldscript

Log Message:
Add an alignment to fill strictly all of the padding; does not increase
the size of the prekern.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/stand/prekern/prekern.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/amd64/stand/prekern/prekern.ldscript
diff -u src/sys/arch/amd64/stand/prekern/prekern.ldscript:1.1 src/sys/arch/amd64/stand/prekern/prekern.ldscript:1.2
--- src/sys/arch/amd64/stand/prekern/prekern.ldscript:1.1	Tue Oct 10 09:29:14 2017
+++ src/sys/arch/amd64/stand/prekern/prekern.ldscript	Wed Oct 11 16:13:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: prekern.ldscript,v 1.1 2017/10/10 09:29:14 maxv Exp $	*/
+/*	$NetBSD: prekern.ldscript,v 1.2 2017/10/11 16:13:16 maxv Exp $	*/
 
 __PAGE_SIZE = 0x1000 ;
 
@@ -10,6 +10,7 @@ SECTIONS
 		*(.text)
 		*(.text.*)
 		*(.stub)
+		. = ALIGN(__PAGE_SIZE);
 	} =0xCC
 	_etext = . ;
 	PROVIDE (etext = .) ;

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 11 12:27:50 UTC 2017

Removed Files:
src/sys/arch/evbarm/conf: HUMMINGBIRD_A31 HUMMINGBIRD_A31_INSTALL

Log Message:
Remove HUMMINGBIRD_A31 kernel config (supported by SUNXI kernel now)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r0 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL

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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 11 10:53:26 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: SUNXI

Log Message:
Add options SOC_SUN50I_H5


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/SUNXI

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/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.41 src/sys/arch/evbarm/conf/SUNXI:1.42
--- src/sys/arch/evbarm/conf/SUNXI:1.41	Mon Oct  9 15:53:45 2017
+++ src/sys/arch/evbarm/conf/SUNXI	Wed Oct 11 10:53:25 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: SUNXI,v 1.41 2017/10/09 15:53:45 jmcneill Exp $
+#	$NetBSD: SUNXI,v 1.42 2017/10/11 10:53:25 jmcneill Exp $
 #
 #	Allwinner sunxi family
 #
@@ -72,6 +72,7 @@ options 	SOC_SUN8I_A83T
 options 	SOC_SUN8I_H3
 options 	SOC_SUN9I_A80
 options 	SOC_SUN50I_A64
+options 	SOC_SUN50I_H5
 
 pseudo-device 	openfirm	# /dev/openfirm
 

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 11 10:52:54 UTC 2017

Modified Files:
src/sys/arch/arm/sunxi: files.sunxi sun8i_h3_ccu.c sunxi_gpio.c
sunxi_platform.c

Log Message:
Add H5 (sun50i) support.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sunxi/sunxi_platform.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/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.34 src/sys/arch/arm/sunxi/files.sunxi:1.35
--- src/sys/arch/arm/sunxi/files.sunxi:1.34	Mon Oct  9 15:53:28 2017
+++ src/sys/arch/arm/sunxi/files.sunxi	Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sunxi,v 1.34 2017/10/09 15:53:28 jmcneill Exp $
+#	$NetBSD: files.sunxi,v 1.35 2017/10/11 10:52:54 jmcneill Exp $
 #
 # Configuration info for Allwinner sunxi family SoCs
 #
@@ -102,7 +102,7 @@ file	arch/arm/sunxi/sun5i_a13_gpio.c		su
 file	arch/arm/sunxi/sun6i_a31_gpio.c		sunxi_gpio & soc_sun6i_a31
 file	arch/arm/sunxi/sun7i_a20_gpio.c		sunxi_gpio & soc_sun7i_a20
 file	arch/arm/sunxi/sun8i_a83t_gpio.c	sunxi_gpio & soc_sun8i_a83t
-file	arch/arm/sunxi/sun8i_h3_gpio.c		sunxi_gpio & soc_sun8i_h3
+file	arch/arm/sunxi/sun8i_h3_gpio.c		sunxi_gpio & (soc_sun8i_h3 | soc_sun50i_h5)
 file	arch/arm/sunxi/sun9i_a80_gpio.c		sunxi_gpio & soc_sun9i_a80
 file	arch/arm/sunxi/sun50i_a64_gpio.c	sunxi_gpio & soc_sun50i_a64
 
@@ -233,3 +233,4 @@ defflag	opt_soc.h			SOC_SUN9I: SOC_SUNXI
 defflag	opt_soc.h			SOC_SUN9I_A80: SOC_SUN9I
 defflag	opt_soc.h			SOC_SUN50I: SOC_SUNXI
 defflag	opt_soc.h			SOC_SUN50I_A64: SOC_SUN50I
+defflag	opt_soc.h			SOC_SUN50I_H5: SOC_SUN50I

Index: src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
diff -u src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.13 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.14
--- src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.13	Thu Oct  5 01:29:49 2017
+++ src/sys/arch/arm/sunxi/sun8i_h3_ccu.c	Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_h3_ccu.c,v 1.13 2017/10/05 01:29:49 jmcneill Exp $ */
+/* $NetBSD: sun8i_h3_ccu.c,v 1.14 2017/10/11 10:52:54 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,7 +29,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.13 2017/10/05 01:29:49 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.14 2017/10/11 10:52:54 jmcneill Exp $");
 
 #include 
 #include 
@@ -71,6 +71,7 @@ static void sun8i_h3_ccu_attach(device_t
 
 static const char * const compatible[] = {
 	"allwinner,sun8i-h3-ccu",
+	"allwinner,sun50i-h5-ccu",
 	NULL
 };
 

Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.15 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.16
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.15	Sun Oct  8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c	Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.15 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.16 2017/10/11 10:52:54 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,7 +29,7 @@
 #include "opt_soc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.15 2017/10/08 18:00:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.16 2017/10/11 10:52:54 jmcneill Exp $");
 
 #include 
 #include 
@@ -101,6 +101,10 @@ static const struct of_compat_data compa
 	{ "allwinner,sun50i-a64-pinctrl",	(uintptr_t)_a64_padconf },
 	{ "allwinner,sun50i-a64-r-pinctrl",	(uintptr_t)_a64_r_padconf },
 #endif
+#ifdef SOC_SUN50I_H5
+	{ "allwinner,sun50i-h5-pinctrl",	(uintptr_t)_h3_padconf },
+	{ "allwinner,sun50i-h5-r-pinctrl",	(uintptr_t)_h3_r_padconf },
+#endif
 	{ NULL }
 };
 

Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.10 src/sys/arch/arm/sunxi/sunxi_platform.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.10	Sun Oct  8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sunxi_platform.c	Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.10 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -31,7 +31,7 @@
 #include "opt_fdt_arm.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.10 2017/10/08 18:00:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $");
 
 #include 
 #include 
@@ -327,3 +327,4 @@ static const struct arm_platform sun50i_
 };
 
 ARM_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", _platform);
+ARM_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", _platform);

CVS commit: src/sys/arch/i386/stand/boot

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Oct 11 09:53:14 UTC 2017

Modified Files:
src/sys/arch/i386/stand/boot: boot2.c

Log Message:
Reset has_prekern if pkboot fails. Otherwise here:
pkboot wrong_kernel_path
boot netbsd
the prekern still gets invoked in the second command.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/stand/boot/boot2.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/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.67 src/sys/arch/i386/stand/boot/boot2.c:1.68
--- src/sys/arch/i386/stand/boot/boot2.c:1.67	Sat Oct  7 10:26:38 2017
+++ src/sys/arch/i386/stand/boot/boot2.c	Wed Oct 11 09:53:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot2.c,v 1.67 2017/10/07 10:26:38 maxv Exp $	*/
+/*	$NetBSD: boot2.c,v 1.68 2017/10/11 09:53:14 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -477,6 +477,7 @@ command_pkboot(char *arg)
 	extern int has_prekern;
 	has_prekern = 1;
 	command_boot(arg);
+	has_prekern = 0;
 }
 
 void

CVS commit: src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 11 08:29:17 UTC 2017

Modified Files:
src/sys/net: if_vlan.c

Log Message:
 Remove accidentally added code (for VLAN hardware filter).


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.101 src/sys/net/if_vlan.c:1.102
--- src/sys/net/if_vlan.c:1.101	Wed Oct 11 08:10:00 2017
+++ src/sys/net/if_vlan.c	Wed Oct 11 08:29:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.101 2017/10/11 08:10:00 msaitoh Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.102 2017/10/11 08:29:17 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.101 2017/10/11 08:10:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.102 2017/10/11 08:29:17 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -420,7 +420,6 @@ vlan_config(struct ifvlan *ifv, struct i
 	case IFT_ETHER:
 	{
 		struct ethercom *ec = (void *) p;
-		struct vlanidlist *vidmem;
 		nmib->ifvm_msw = _ether_multisw;
 		nmib->ifvm_encaplen = ETHER_VLAN_ENCAP_LEN;
 		nmib->ifvm_mintu = ETHERMIN;
@@ -444,14 +443,7 @@ vlan_config(struct ifvlan *ifv, struct i
 			}
 			error = 0;
 		}
-		vidmem = kmem_alloc(sizeof(struct vlanidlist), KM_SLEEP);
-		if (vidmem == NULL){
-			ec->ec_nvlans--;
-			error = ENOMEM;
-			goto done;
-		}
-		vidmem->vid = tag;
-		SLIST_INSERT_HEAD(>ec_vids, vidmem, vid_list);
+
 		/*
 		 * If the parent interface can do hardware-assisted
 		 * VLAN encapsulation, then propagate its hardware-
@@ -573,15 +565,6 @@ vlan_unconfig_locked(struct ifvlan *ifv,
 	case IFT_ETHER:
 	{
 		struct ethercom *ec = (void *)p;
-		struct vlanidlist *vlanidp, *tmpp;
-
-		SLIST_FOREACH_SAFE(vlanidp, >ec_vids, vid_list, tmpp) {
-			if (vlanidp->vid == nmib->ifvm_tag) {
-SLIST_REMOVE(>ec_vids, vlanidp, vlanidlist,
-vid_list);
-kmem_free(vlanidp, sizeof(*vlanidp));
-			}
-		}
 		if (--ec->ec_nvlans == 0)
 			(void)ether_disable_vlan_mtu(p);
 

CVS commit: src/tests/net/if_vlan

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 11 08:10:53 UTC 2017

Modified Files:
src/tests/net/if_vlan: t_vlan.sh

Log Message:
 Add a test case for duplicated VLAN ID.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_vlan/t_vlan.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/net/if_vlan/t_vlan.sh
diff -u src/tests/net/if_vlan/t_vlan.sh:1.3 src/tests/net/if_vlan/t_vlan.sh:1.4
--- src/tests/net/if_vlan/t_vlan.sh:1.3	Wed Aug  9 06:19:56 2017
+++ src/tests/net/if_vlan/t_vlan.sh	Wed Oct 11 08:10:53 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: t_vlan.sh,v 1.3 2017/08/09 06:19:56 knakahara Exp $
+#	$NetBSD: t_vlan.sh,v 1.4 2017/10/11 08:10:53 msaitoh Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -451,6 +451,12 @@ vlan_configs_body_common()
 	atf_check -s exit:0 -e match:'Invalid argument' \
 	rump.ifconfig vlan0 mtu 41
 	atf_check -s exit:0 rump.ifconfig vlan0 -vlanif
+
+	atf_check -s exit:0 rump.ifconfig vlan1 create
+	atf_check -s exit:0 rump.ifconfig vlan0 vlan 10 vlanif shmif0
+	atf_check -s not-exit:0 -e match:'File exists' \
+	rump.ifconfig vlan1 vlan 10 vlanif shmif0
+	atf_check -s exit:0 rump.ifconfig vlan0 -vlanif
 }
 
 atf_test_case vlan_configs cleanup

CVS commit: src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 11 08:10:00 UTC 2017

Modified Files:
src/sys/net: if_vlan.c

Log Message:
 Check if VLAN ID isn't duplicated on a same parent interface and return
EEXIST if it failed.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.100 src/sys/net/if_vlan.c:1.101
--- src/sys/net/if_vlan.c:1.100	Tue Sep 26 07:42:06 2017
+++ src/sys/net/if_vlan.c	Wed Oct 11 08:10:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.100 2017/09/26 07:42:06 knakahara Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.101 2017/10/11 08:10:00 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.100 2017/09/26 07:42:06 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.101 2017/10/11 08:10:00 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -386,10 +386,12 @@ vlan_config(struct ifvlan *ifv, struct i
 	struct ifnet *ifp = >ifv_if;
 	struct ifvlan_linkmib *nmib = NULL;
 	struct ifvlan_linkmib *omib = NULL;
+	struct ifvlan_linkmib *checkmib = NULL;
 	struct psref_target *nmib_psref = NULL;
 	int error = 0;
 	int idx;
 	bool omib_cleanup = false;
+	struct psref psref;
 
 	nmib = kmem_alloc(sizeof(*nmib), KM_SLEEP);
 
@@ -401,6 +403,14 @@ vlan_config(struct ifvlan *ifv, struct i
 		goto done;
 	}
 
+	/* Duplicate check */
+	checkmib = vlan_lookup_tag_psref(p, tag, );
+	if (checkmib != NULL) {
+		vlan_putref_linkmib(checkmib, );
+		error = EEXIST;
+		goto done;
+	}
+
 	*nmib = *omib;
 	nmib_psref = >ifvm_psref;
 
@@ -410,6 +420,7 @@ vlan_config(struct ifvlan *ifv, struct i
 	case IFT_ETHER:
 	{
 		struct ethercom *ec = (void *) p;
+		struct vlanidlist *vidmem;
 		nmib->ifvm_msw = _ether_multisw;
 		nmib->ifvm_encaplen = ETHER_VLAN_ENCAP_LEN;
 		nmib->ifvm_mintu = ETHERMIN;
@@ -433,7 +444,14 @@ vlan_config(struct ifvlan *ifv, struct i
 			}
 			error = 0;
 		}
-
+		vidmem = kmem_alloc(sizeof(struct vlanidlist), KM_SLEEP);
+		if (vidmem == NULL){
+			ec->ec_nvlans--;
+			error = ENOMEM;
+			goto done;
+		}
+		vidmem->vid = tag;
+		SLIST_INSERT_HEAD(>ec_vids, vidmem, vid_list);
 		/*
 		 * If the parent interface can do hardware-assisted
 		 * VLAN encapsulation, then propagate its hardware-
@@ -555,6 +573,15 @@ vlan_unconfig_locked(struct ifvlan *ifv,
 	case IFT_ETHER:
 	{
 		struct ethercom *ec = (void *)p;
+		struct vlanidlist *vlanidp, *tmpp;
+
+		SLIST_FOREACH_SAFE(vlanidp, >ec_vids, vid_list, tmpp) {
+			if (vlanidp->vid == nmib->ifvm_tag) {
+SLIST_REMOVE(>ec_vids, vlanidp, vlanidlist,
+vid_list);
+kmem_free(vlanidp, sizeof(*vlanidp));
+			}
+		}
 		if (--ec->ec_nvlans == 0)
 			(void)ether_disable_vlan_mtu(p);
 

CVS commit: src/lib/libedit

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Wed Oct 11 06:49:03 UTC 2017

Modified Files:
src/lib/libedit: chared.c

Log Message:
Fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/lib/libedit/chared.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/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.56 src/lib/libedit/chared.c:1.57
--- src/lib/libedit/chared.c:1.56	Sun May 22 19:44:26 2016
+++ src/lib/libedit/chared.c	Wed Oct 11 06:49:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.56 2016/05/22 19:44:26 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.57 2017/10/11 06:49:03 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.56 2016/05/22 19:44:26 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.57 2017/10/11 06:49:03 abhinav Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -591,7 +591,7 @@ ch_end(EditLine *el)
 
 
 /* el_insertstr():
- *	Insert string at cursorI
+ *	Insert string at cursor
  */
 int
 el_winsertstr(EditLine *el, const wchar_t *s)