CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Sun May 26 05:41:45 UTC 2019

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

Log Message:
Drop no longer available macros KCOV_STORE() KCOV_LOAD() in kcov(4)

Recently KCOV_STORE() and KCOV_LOAD() were equivalent to x=y.

Obtained from 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kcov.c

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

CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Sun May 26 05:41:45 UTC 2019

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

Log Message:
Drop no longer available macros KCOV_STORE() KCOV_LOAD() in kcov(4)

Recently KCOV_STORE() and KCOV_LOAD() were equivalent to x=y.

Obtained from 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kcov.c

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

Modified files:

Index: src/sys/kern/subr_kcov.c
diff -u src/sys/kern/subr_kcov.c:1.7 src/sys/kern/subr_kcov.c:1.8
--- src/sys/kern/subr_kcov.c:1.7	Sun Apr  7 21:01:43 2019
+++ src/sys/kern/subr_kcov.c	Sun May 26 05:41:45 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_kcov.c,v 1.7 2019/04/07 21:01:43 kamil Exp $	*/
+/*	$NetBSD: subr_kcov.c,v 1.8 2019/05/26 05:41:45 kamil Exp $	*/
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -380,11 +380,11 @@ __sanitizer_cov_trace_pc(void)
 		return;
 	}
 
-	idx = KCOV_LOAD(kd->buf[0]);
+	idx = kd->buf[0];
 	if (idx < kd->bufnent) {
-		KCOV_STORE(kd->buf[idx+1],
-		(intptr_t)__builtin_return_address(0));
-		KCOV_STORE(kd->buf[0], idx + 1);
+		kd->buf[idx+1] =
+		(intptr_t)__builtin_return_address(0);
+		kd->buf[0] = idx + 1;
 	}
 }
 
@@ -421,13 +421,13 @@ trace_cmp(uint64_t type, uint64_t arg1, 
 		return;
 	}
 
-	idx = KCOV_LOAD(kd->buf[0]);
+	idx = kd->buf[0];
 	if ((idx * 4 + 4) <= kd->bufnent) {
-		KCOV_STORE(kd->buf[idx * 4 + 1], type);
-		KCOV_STORE(kd->buf[idx * 4 + 2], arg1);
-		KCOV_STORE(kd->buf[idx * 4 + 3], arg2);
-		KCOV_STORE(kd->buf[idx * 4 + 4], pc);
-		KCOV_STORE(kd->buf[0], idx + 1);
+		kd->buf[idx * 4 + 1] = type;
+		kd->buf[idx * 4 + 2] = arg1;
+		kd->buf[idx * 4 + 3] = arg2;
+		kd->buf[idx * 4 + 4] = pc;
+		kd->buf[0] = idx + 1;
 	}
 }
 

CVS commit: src/sys/dev/usb

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Sun May 26 04:52:07 UTC 2019

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

Log Message:
usbd_transfer may sleep, add a mutex to prevent a race in mue_start.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_muevar.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/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.45 src/sys/dev/usb/if_mue.c:1.46
--- src/sys/dev/usb/if_mue.c:1.45	Thu May 23 13:10:52 2019
+++ src/sys/dev/usb/if_mue.c	Sun May 26 04:52:07 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mue.c,v 1.45 2019/05/23 13:10:52 msaitoh Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.46 2019/05/26 04:52:07 mlelstv Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $	*/
 
 /*
@@ -20,7 +20,7 @@
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.45 2019/05/23 13:10:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.46 2019/05/26 04:52:07 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -958,6 +958,7 @@ mue_attach(device_t parent, device_t sel
 		sc->mue_tx_list_cnt = MUE_TX_LIST_CNT;
 	}
 	sc->mue_txbufsz = MUE_TX_BUFSIZE;
+	mutex_init(>mue_usb_lock, MUTEX_DEFAULT, IPL_NET);
 
 	/* Find endpoints. */
 	id = usbd_get_interface_descriptor(sc->mue_iface);
@@ -1819,6 +1820,8 @@ mue_start(struct ifnet *ifp)
 		return;
 	}
 
+	mutex_enter(>mue_usb_lock);
+
 	idx = cd->mue_tx_prod;
 	while (cd->mue_tx_cnt < (int)sc->mue_tx_list_cnt) {
 		IFQ_POLL(>if_snd, m);
@@ -1834,15 +1837,16 @@ mue_start(struct ifnet *ifp)
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		m_freem(m);
 
-		idx = (idx + 1) % sc->mue_tx_list_cnt;
 		cd->mue_tx_cnt++;
-
+		idx = (idx + 1) % sc->mue_tx_list_cnt;
 	}
 	cd->mue_tx_prod = idx;
 
 	if (cd->mue_tx_cnt >= (int)sc->mue_tx_list_cnt)
 		ifp->if_flags |= IFF_OACTIVE;
 
+	mutex_exit(>mue_usb_lock);
+
 	/* Set a timeout in case the chip goes out to lunch. */
 	ifp->if_timer = 5;
 }

Index: src/sys/dev/usb/if_muevar.h
diff -u src/sys/dev/usb/if_muevar.h:1.7 src/sys/dev/usb/if_muevar.h:1.8
--- src/sys/dev/usb/if_muevar.h:1.7	Wed Feb  6 08:28:11 2019
+++ src/sys/dev/usb/if_muevar.h	Sun May 26 04:52:07 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_muevar.h,v 1.7 2019/02/06 08:28:11 rin Exp $	*/
+/*	$NetBSD: if_muevar.h,v 1.8 2019/05/26 04:52:07 mlelstv Exp $	*/
 /*	$OpenBSD: if_muereg.h,v 1.1 2018/08/03 01:50:15 kevlo Exp $	*/
 
 /*
@@ -121,6 +121,8 @@ struct mue_softc {
 
 	unsigned		mue_rx_list_cnt;
 	unsigned		mue_tx_list_cnt;
+
+	kmutex_t		mue_usb_lock;
 };
 
 #endif /* _IF_MUEVAR_H_ */

CVS commit: src/sys/dev/usb

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Sun May 26 04:52:07 UTC 2019

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

Log Message:
usbd_transfer may sleep, add a mutex to prevent a race in mue_start.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_muevar.h

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

CVS commit: src/external/bsd/unbound/dist/util

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 02:49:34 UTC 2019

Modified Files:
src/external/bsd/unbound/dist/util: mini_event.c

Log Message:
fix include order.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/unbound/dist/util/mini_event.c

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

CVS commit: src/external/bsd/unbound/dist/util

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 02:49:34 UTC 2019

Modified Files:
src/external/bsd/unbound/dist/util: mini_event.c

Log Message:
fix include order.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/unbound/dist/util/mini_event.c

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

Modified files:

Index: src/external/bsd/unbound/dist/util/mini_event.c
diff -u src/external/bsd/unbound/dist/util/mini_event.c:1.1.1.3 src/external/bsd/unbound/dist/util/mini_event.c:1.2
--- src/external/bsd/unbound/dist/util/mini_event.c:1.1.1.3	Sat May 25 17:18:03 2019
+++ src/external/bsd/unbound/dist/util/mini_event.c	Sat May 25 22:49:34 2019
@@ -41,11 +41,11 @@
  */
 
 #include "config.h"
-#include "util/mini_event.h"
 #ifdef HAVE_TIME_H
 #include 
 #endif
 #include 
+#include "util/mini_event.h"
 
 #if defined(USE_MINI_EVENT) && !defined(USE_WINSOCK)
 #include 

CVS commit: src/external/bsd/unbound/lib/libunbound

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 02:49:12 UTC 2019

Modified Files:
src/external/bsd/unbound/lib/libunbound: Makefile

Log Message:
new files


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/unbound/lib/libunbound/Makefile

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

Modified files:

Index: src/external/bsd/unbound/lib/libunbound/Makefile
diff -u src/external/bsd/unbound/lib/libunbound/Makefile:1.3 src/external/bsd/unbound/lib/libunbound/Makefile:1.4
--- src/external/bsd/unbound/lib/libunbound/Makefile:1.3	Mon Feb  5 22:05:48 2018
+++ src/external/bsd/unbound/lib/libunbound/Makefile	Sat May 25 22:49:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/02/06 03:05:48 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/26 02:49:12 christos Exp $
 
 .include 
 
@@ -33,6 +33,7 @@ dname.c \
 dns.c \
 dns64.c \
 dnstree.c \
+edns.c \
 fptr_wlist.c \
 infra.c \
 iter_delegpt.c \
@@ -77,6 +78,7 @@ rtt.c \
 sbuffer.c \
 slabhash.c \
 str2wire.c \
+tcp_conn_limit.c \
 timehist.c \
 tube.c \
 ub_event_pluggable.c \

CVS commit: src/external/bsd/unbound/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 02:42:00 UTC 2019

Modified Files:
src/external/bsd/unbound/include: config.h

Log Message:
use explicit_memset()
XXX: fix in autoconf


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/unbound/include/config.h

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

CVS commit: src/external/bsd/unbound/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 02:42:00 UTC 2019

Modified Files:
src/external/bsd/unbound/include: config.h

Log Message:
use explicit_memset()
XXX: fix in autoconf


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/unbound/include/config.h

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

Modified files:

Index: src/external/bsd/unbound/include/config.h
diff -u src/external/bsd/unbound/include/config.h:1.5 src/external/bsd/unbound/include/config.h:1.6
--- src/external/bsd/unbound/include/config.h:1.5	Sat May 25 17:31:28 2019
+++ src/external/bsd/unbound/include/config.h	Sat May 25 22:42:00 2019
@@ -1183,8 +1183,9 @@ int isblank(int c);
 #endif
 
 #ifndef HAVE_EXPLICIT_BZERO
-#define explicit_bzero unbound_explicit_bzero
-void explicit_bzero(void* buf, size_t len);
+// #define explicit_bzero unbound_explicit_bzero
+// void explicit_bzero(void* buf, size_t len);
+#define explicit_bzero(a, b) explicit_memset(a, 0, b) 
 #endif
 
 #if defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP
@@ -1219,7 +1220,6 @@ void *reallocarray(void *ptr, size_t nme
 #  endif
 #endif /* HAVE_LIBRESSL */
 #ifndef HAVE_ARC4RANDOM
-void explicit_bzero(void* buf, size_t len);
 int getentropy(void* buf, size_t len);
 uint32_t arc4random(void);
 void arc4random_buf(void* buf, size_t n);

CVS commit: src

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Sun May 26 01:44:34 UTC 2019

Modified Files:
src/share/man/man4: kcov.4
src/sys/sys: kcov.h
src/tests/modules: t_kcov.c

Log Message:
Drop no longer needed macros KCOV_STORE() KCOV_LOAD() in kcov(4)

Corrently KCOV_STORE() and KCOV_LOAD() are equivalent to x=y.

Obtained from 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/kcov.4
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/kcov.h
cvs rdiff -u -r1.9 -r1.10 src/tests/modules/t_kcov.c

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

CVS commit: src

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Sun May 26 01:44:34 UTC 2019

Modified Files:
src/share/man/man4: kcov.4
src/sys/sys: kcov.h
src/tests/modules: t_kcov.c

Log Message:
Drop no longer needed macros KCOV_STORE() KCOV_LOAD() in kcov(4)

Corrently KCOV_STORE() and KCOV_LOAD() are equivalent to x=y.

Obtained from 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/kcov.4
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/kcov.h
cvs rdiff -u -r1.9 -r1.10 src/tests/modules/t_kcov.c

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/man4/kcov.4
diff -u src/share/man/man4/kcov.4:1.4 src/share/man/man4/kcov.4:1.5
--- src/share/man/man4/kcov.4:1.4	Sun Mar 10 17:51:00 2019
+++ src/share/man/man4/kcov.4	Sun May 26 01:44:34 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kcov.4,v 1.4 2019/03/10 17:51:00 kamil Exp $
+.\"	$NetBSD: kcov.4,v 1.5 2019/05/26 01:44:34 kamil Exp $
 .\"
 .\" Copyright (c) 2018 Anton Lindqvist 
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd March 10, 2019
+.Dd May 26, 2019
 .Dt KCOV 4
 .Os
 .Sh NAME
@@ -171,12 +171,12 @@ main(void)
 	mode = KCOV_MODE_TRACE_PC;
 	if (ioctl(fd, KCOV_IOC_ENABLE, ) == -1)
 		err(1, "ioctl: KCOV_IOC_ENABLE");
-	KCOV_STORE(cover[0], 0);
+	cover[0] = 0;
 	read(-1, NULL, 0); /* syscall paths to be traced */
-	n = KCOV_LOAD(cover[0]);
+	n = cover[0];
 	if (ioctl(fd, KCOV_IOC_DISABLE) == -1)
 		err(1, "ioctl: KCOV_IOC_DISABLE");
-	for (i = 0; i < cover[0]; i++)
+	for (i = 0; i < n; i++)
 		printf("%p\en", (void *)cover[i + 1]);
 	if (munmap(cover, size * KCOV_ENTRY_SIZE) == -1)
 		err(1, "munmap");

Index: src/sys/sys/kcov.h
diff -u src/sys/sys/kcov.h:1.5 src/sys/sys/kcov.h:1.6
--- src/sys/sys/kcov.h:1.5	Thu Apr 11 11:20:46 2019
+++ src/sys/sys/kcov.h	Sun May 26 01:44:34 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: kcov.h,v 1.5 2019/04/11 11:20:46 kamil Exp $*/
+/*  $NetBSD: kcov.h,v 1.6 2019/05/26 01:44:34 kamil Exp $*/
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -47,7 +47,4 @@
 typedef volatile uint64_t kcov_int_t;
 #define KCOV_ENTRY_SIZE sizeof(kcov_int_t)
 
-#define KCOV_STORE(x,v)	(x) = (v)
-#define KCOV_LOAD(x)	(x)
-
 #endif /* !_SYS_KCOV_H_ */

Index: src/tests/modules/t_kcov.c
diff -u src/tests/modules/t_kcov.c:1.9 src/tests/modules/t_kcov.c:1.10
--- src/tests/modules/t_kcov.c:1.9	Thu Apr  4 10:53:20 2019
+++ src/tests/modules/t_kcov.c	Sun May 26 01:44:34 2019
@@ -339,10 +339,10 @@ kcov_basic(bool fd_dup, int mode)
 	ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_ENABLE, ) == 0,
 	"Unable to enable kcov ");
 
-	KCOV_STORE(buf[0], 0);
+	buf[0] = 0;
 
 	sleep(0); /* XXX: Is it enough for all trace types? */
-	ATF_REQUIRE_MSG(KCOV_LOAD(buf[0]) != 0, "No records found");
+	ATF_REQUIRE_MSG(buf[0] != 0, "No records found");
 
 	ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_DISABLE) == 0,
 	"Unable to disable kcov");
@@ -409,7 +409,7 @@ thread_buffer_access_test_helper(void *p
 	kcov_int_t *buf = ptr;
 
 	/* Test mapped buffer access from a custom thread */
-	KCOV_STORE(buf[0], KCOV_LOAD(buf[0]));
+	buf[0] = buf[0];
 
 	return NULL;
 }
@@ -470,10 +470,10 @@ ATF_TC_BODY(kcov_thread, tc)
 	/* The thread does something, does not matter what exactly. */
 	pthread_create(, NULL, thread_test_helper, __UNVOLATILE(buf));
 
-	KCOV_STORE(buf[0], 0);
+	buf[0] = 0;
 	for (i = 0; i < 1; i++)
 		continue;
-	ATF_REQUIRE_EQ_MSG(KCOV_LOAD(buf[0]), 0,
+	ATF_REQUIRE_EQ_MSG(buf[0], 0,
 	"Records changed in blocked thread");
 
 	pthread_join(thread, NULL);
@@ -496,10 +496,10 @@ multiple_threads_helper(void *ptr __unus
 	ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_ENABLE, ) == 0,
 	"Unable to enable kcov ");
 
-	KCOV_STORE(buf[0], 0);
+	buf[0] = 0;
 
 	sleep(0);
-	ATF_REQUIRE_MSG(KCOV_LOAD(buf[0]) != 0, "No records found");
+	ATF_REQUIRE_MSG(buf[0] != 0, "No records found");
 
 	ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_DISABLE) == 0,
 	"Unable to disable kcov");

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 00:30:35 UTC 2019

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

Log Message:
tuck in include inside ifdef, from Ryosuke Moro


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/x86/consinit.c

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

Modified files:

Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.29 src/sys/arch/x86/x86/consinit.c:1.30
--- src/sys/arch/x86/x86/consinit.c:1.29	Fri May 24 10:28:48 2019
+++ src/sys/arch/x86/x86/consinit.c	Sat May 25 20:30:35 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.29 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.29 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
 #endif
 
 #ifndef XEN
-#include "hvkbd.h"
 #if NHVKBD > 0
+#include "hvkbd.h"
 #include 
 #endif
 #endif

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun May 26 00:30:35 UTC 2019

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

Log Message:
tuck in include inside ifdef, from Ryosuke Moro


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/x86/consinit.c

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

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:32:35 UTC 2019

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new unbound


To generate a diff of this commit:
cvs rdiff -u -r1.1623 -r1.1624 src/doc/3RDPARTY
cvs rdiff -u -r1.2542 -r1.2543 src/doc/CHANGES

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

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:32:35 UTC 2019

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new unbound


To generate a diff of this commit:
cvs rdiff -u -r1.1623 -r1.1624 src/doc/3RDPARTY
cvs rdiff -u -r1.2542 -r1.2543 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1623 src/doc/3RDPARTY:1.1624
--- src/doc/3RDPARTY:1.1623	Sat May 25 17:11:13 2019
+++ src/doc/3RDPARTY	Sat May 25 17:32:35 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1623 2019/05/25 21:11:13 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1624 2019/05/25 21:32:35 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -139,12 +139,12 @@ Then binclude4netbsd script to import in
 The libc and include parts of the resolver are now part of libbind.
 
 Package:	unbound
-Version:	1.7.3
+Version:	1.9.1
 Current Vers:	1.9.1
 Maintainer:	Nlnetlabs
 Archive Site:	https://www.unbound.net/downloads/unbound-latest.tar.gz
 Home Page:	https://www.unbound.net/
-Date:		2019-03-17
+Date:		2019-05-23
 Mailing List:	https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users
 Responsible:	christos
 License:	BSD-like

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2542 src/doc/CHANGES:1.2543
--- src/doc/CHANGES:1.2542	Sat May 25 17:11:13 2019
+++ src/doc/CHANGES	Sat May 25 17:32:35 2019
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2542 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2543 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -386,3 +386,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 		start of line, or after whitespace (start word) [kre 20190523]
 	dts: Import dts files from Linux 5.1.4. [jmcneill 20190525]
 	nsd: Import 4.1.27 [christos 20190525]
+	unbound(8): Import 1.9.1. [christos 20190525]

CVS commit: src/external/bsd/unbound

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:31:29 UTC 2019

Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/include: config.h
Removed Files:
src/external/bsd/unbound/dist/testdata/edns_lame.tdir: edns_lame.conf
edns_lame.dsc edns_lame.post edns_lame.pre edns_lame.test
edns_lame.testns
src/external/bsd/unbound/dist/testdata/pylib.tdir: pylib.conf pylib.py
src/external/bsd/unbound/dist/winrc: unbound16.ico unbound48.ico
unbound64.ico unbound64.png
src/external/bsd/unbound/include: config-1.0.h config-1.1.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/config.guess \
src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/unbound/dist/winrc/unbound16.ico \
src/external/bsd/unbound/dist/winrc/unbound48.ico \
src/external/bsd/unbound/dist/winrc/unbound64.ico \
src/external/bsd/unbound/dist/winrc/unbound64.png
cvs rdiff -u -r1.3 -r0 src/external/bsd/unbound/include/config-1.0.h \
src/external/bsd/unbound/include/config-1.1.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/unbound/include/config.h

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

Modified files:

Index: src/external/bsd/unbound/dist/config.guess
diff -u src/external/bsd/unbound/dist/config.guess:1.2 src/external/bsd/unbound/dist/config.guess:1.3
--- src/external/bsd/unbound/dist/config.guess:1.2	Wed Feb  1 04:26:42 2017
+++ src/external/bsd/unbound/dist/config.guess	Sat May 25 17:31:28 2019
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
Index: src/external/bsd/unbound/dist/config.sub
diff -u src/external/bsd/unbound/dist/config.sub:1.2 src/external/bsd/unbound/dist/config.sub:1.3
--- src/external/bsd/unbound/dist/config.sub:1.2	Wed Feb  1 04:26:42 2017
+++ src/external/bsd/unbound/dist/config.sub	Sat May 25 17:31:28 2019
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 

Index: src/external/bsd/unbound/include/config.h
diff -u src/external/bsd/unbound/include/config.h:1.4 src/external/bsd/unbound/include/config.h:1.5
--- src/external/bsd/unbound/include/config.h:1.4	Mon Feb  5 22:29:57 2018
+++ src/external/bsd/unbound/include/config.h	Sat May 25 17:31:28 2019
@@ -1,6 +1,1302 @@
-#include 
-#if OPENSSL_VERSION_NUMBER >= 0x1010
-#include "config-1.1.h"
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* apply the noreturn attribute to a function that exits the program */
+#define ATTR_NORETURN __attribute__((__noreturn__))
+
+/* apply the weak attribute to a symbol */
+#define ATTR_WEAK __attribute__((__weak__))
+
+/* Directory to chroot to */
+#define CHROOT_DIR "/var/chroot/unbound"
+
+/* Define this to enable client subnet option. */
+/* #undef CLIENT_SUBNET */
+
+/* Do sha512 definitions in config.h */
+/* #undef COMPAT_SHA512 */
+
+/* Pathname to the Unbound configuration file */
+#define CONFIGFILE "/etc/unbound/unbound.conf"
+
+/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work
+   */
+/* #undef DARWIN_BROKEN_SETREUID */
+
+/* Whether daemon is deprecated */
+/* #undef DEPRECATED_DAEMON */
+
+/* default dnstap socket path */
+/* #undef DNSTAP_SOCKET_PATH */
+
+/* Define if you want to use debug lock checking (slow). */
+/* #undef ENABLE_LOCK_CHECKS */
+
+/* Define this if you enabled-allsymbols from libunbound to link binaries to
+   it for smaller install size, but the libunbound export table is polluted by
+   internal symbols */
+/* #undef EXPORT_ALL_SYMBOLS */
+
+/* Define to 1 if you have the `accept4' function. */
+#define HAVE_ACCEPT4 1
+
+/* Define to 1 if you have the `arc4random' function. */
+#define HAVE_ARC4RANDOM 1
+
+/* Define to 1 if you have the `arc4random_uniform' function. */
+#define HAVE_ARC4RANDOM_UNIFORM 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Whether the C compiler accepts the "format" attribute */

CVS commit: src/external/bsd/unbound

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:31:29 UTC 2019

Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/include: config.h
Removed Files:
src/external/bsd/unbound/dist/testdata/edns_lame.tdir: edns_lame.conf
edns_lame.dsc edns_lame.post edns_lame.pre edns_lame.test
edns_lame.testns
src/external/bsd/unbound/dist/testdata/pylib.tdir: pylib.conf pylib.py
src/external/bsd/unbound/dist/winrc: unbound16.ico unbound48.ico
unbound64.ico unbound64.png
src/external/bsd/unbound/include: config-1.0.h config-1.1.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/config.guess \
src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/unbound/dist/winrc/unbound16.ico \
src/external/bsd/unbound/dist/winrc/unbound48.ico \
src/external/bsd/unbound/dist/winrc/unbound64.ico \
src/external/bsd/unbound/dist/winrc/unbound64.png
cvs rdiff -u -r1.3 -r0 src/external/bsd/unbound/include/config-1.0.h \
src/external/bsd/unbound/include/config-1.1.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/unbound/include/config.h

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

CVS import: src/external/bsd/unbound/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:18:10 UTC 2019

Update of /cvsroot/src/external/bsd/unbound/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3825

Log Message:
Import 1.9.1:

1 March 2019: Wouter
- output forwarder log in ssl_req_order test.

28 February 2019: Wouter
- Remove memory leak on pythonmod python2 script file init.
- Remove swig gcc8 python function cast warnings, they are ignored.
- Print correct module that failed when module-config is wrong.

27 February 2019: Wouter
- Fix #4229: Unbound man pages lack information, about access-control
  order and local zone tags, and elements in views.
- Fix #14: contrib/unbound.init: Fix wrong comparison judgment
  before copying.
- Fix for python module on Windows, fix fopen.

25 February 2019: Wouter
- Fix #4227: pair event del and add for libevent for tcp_req_info.

21 February 2019: Wouter
- Fix the error for unknown module in module-config is understandable,
  and explains it was not compiled in and where to see the list.
- In example.conf explain where to put cachedb module in module-config.
- In man page and example config explain that most modules have to
  be listed at the start of module-config.

20 February 2019: Wouter
- Fix pythonmod include and sockaddr_un ifdefs for compile on
  Windows, and for libunbound.

18 February 2019: Wouter
- Print query name with ip_ratelimit exceeded log lines.
- Spaces instead of tabs in that log message.
- Print query name and IP address when domain rate limit exceeded.

14 February 2019: Wouter
- Fix capsforid canonical sort qsort callback.

11 February 2019: Wouter
- Note default for module-config in man page.
- Fix recursion lame test for qname minimisation asked queries,
  that were not present in the set of prepared answers.
- Fix #13: Remove left-over requirements on OpenSSL >= 1.1.0 for
  cert name matching, from man page.
- make depend, with newer gcc, nicer layout.

7 February 2019: Wouter
- Fix #4206: OpenSSL 1.0.2 hostname verification for FreeBSD 11.2.
- Fix that qname minimisation does not skip a label when missing
  nameserver targets need to be fetched.
- Fix #4225: clients seem to erroneously receive no answer with
  DNS-over-TLS and qname-minimisation.

4 February 2019: Wouter
- Fix that log-replies prints the correct name for local-alias
  names, for names that have a CNAME in local-data configuration.
  It logs the original query name, not the target of the CNAME.
- Add local-zone type inform_redirect, which logs like type inform,
  and redirects like type redirect.
- Perform canonical sort for 0x20 capsforid compare of replies,
  this sorts rrsets in the authority and additional section before
  comparison, so that out of order rrsets do not cause failure.

31 January 2019: Wouter
- Set ub_ctx_set_tls call signature in ltrace config file for
  libunbound in contrib/libunbound.so.conf.
- improve documentation for tls-service-key and forward-first.
- #10: fixed pkg-config operations, PKG_PROG_PKG_CONFIG moved out of
  conditional section, fixes systemd builds, from Enrico Scholz.
- #9: For openssl 1.0.2 use the CRYPTO_THREADID locking callbacks,
  still supports the set_id_callback previous API.  And for 1.1.0
  no locking callbacks are needed.
- #8: Fix OpenSSL without ENGINE support compilation.
- Wipe TLS session key data from memory on exit.

30 January 2019: Ralph
- Fix case in which query timeout can result in marking delegation
  as edns_lame_known.

29 January 2019: Wouter
- Fix spelling of tls-ciphers in example.conf.in.
- Fix #4224: auth_xfr_notify.rpl test broken due to typo
- Fix locking for libunbound context setup with broken port config.

28 January 2019: Wouter
- ub_ctx_set_tls call for libunbound that enables DoT for the machines
  set with ub_ctx_set_fwd.  Patch from Florian Obser.
- Set build system for added call in the libunbound API.
- List example config for root zone copy locally hosted with auth-zone
  as suggested from draft-ietf-dnsop-7706-bis-02.  But with updated
  B root address.
- set version to 1.9.0 for release.  And this was released with the
  spelling for tls-ciphers fix as 1.9.0 on Feb 5.  Trunk has 1.9.1 in
  development.

25 January 2019: Wouter
- Fix that tcp for auth zone and outgoing does not remove and
  then gets the ssl read again applied to the deleted commpoint.
- updated contrib/fastrpz.patch to cleanly diff.
- no lock when threads disabled in tcp request buffer count.
  

CVS import: src/external/bsd/unbound/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:18:10 UTC 2019

Update of /cvsroot/src/external/bsd/unbound/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3825

Log Message:
Import 1.9.1:

1 March 2019: Wouter
- output forwarder log in ssl_req_order test.

28 February 2019: Wouter
- Remove memory leak on pythonmod python2 script file init.
- Remove swig gcc8 python function cast warnings, they are ignored.
- Print correct module that failed when module-config is wrong.

27 February 2019: Wouter
- Fix #4229: Unbound man pages lack information, about access-control
  order and local zone tags, and elements in views.
- Fix #14: contrib/unbound.init: Fix wrong comparison judgment
  before copying.
- Fix for python module on Windows, fix fopen.

25 February 2019: Wouter
- Fix #4227: pair event del and add for libevent for tcp_req_info.

21 February 2019: Wouter
- Fix the error for unknown module in module-config is understandable,
  and explains it was not compiled in and where to see the list.
- In example.conf explain where to put cachedb module in module-config.
- In man page and example config explain that most modules have to
  be listed at the start of module-config.

20 February 2019: Wouter
- Fix pythonmod include and sockaddr_un ifdefs for compile on
  Windows, and for libunbound.

18 February 2019: Wouter
- Print query name with ip_ratelimit exceeded log lines.
- Spaces instead of tabs in that log message.
- Print query name and IP address when domain rate limit exceeded.

14 February 2019: Wouter
- Fix capsforid canonical sort qsort callback.

11 February 2019: Wouter
- Note default for module-config in man page.
- Fix recursion lame test for qname minimisation asked queries,
  that were not present in the set of prepared answers.
- Fix #13: Remove left-over requirements on OpenSSL >= 1.1.0 for
  cert name matching, from man page.
- make depend, with newer gcc, nicer layout.

7 February 2019: Wouter
- Fix #4206: OpenSSL 1.0.2 hostname verification for FreeBSD 11.2.
- Fix that qname minimisation does not skip a label when missing
  nameserver targets need to be fetched.
- Fix #4225: clients seem to erroneously receive no answer with
  DNS-over-TLS and qname-minimisation.

4 February 2019: Wouter
- Fix that log-replies prints the correct name for local-alias
  names, for names that have a CNAME in local-data configuration.
  It logs the original query name, not the target of the CNAME.
- Add local-zone type inform_redirect, which logs like type inform,
  and redirects like type redirect.
- Perform canonical sort for 0x20 capsforid compare of replies,
  this sorts rrsets in the authority and additional section before
  comparison, so that out of order rrsets do not cause failure.

31 January 2019: Wouter
- Set ub_ctx_set_tls call signature in ltrace config file for
  libunbound in contrib/libunbound.so.conf.
- improve documentation for tls-service-key and forward-first.
- #10: fixed pkg-config operations, PKG_PROG_PKG_CONFIG moved out of
  conditional section, fixes systemd builds, from Enrico Scholz.
- #9: For openssl 1.0.2 use the CRYPTO_THREADID locking callbacks,
  still supports the set_id_callback previous API.  And for 1.1.0
  no locking callbacks are needed.
- #8: Fix OpenSSL without ENGINE support compilation.
- Wipe TLS session key data from memory on exit.

30 January 2019: Ralph
- Fix case in which query timeout can result in marking delegation
  as edns_lame_known.

29 January 2019: Wouter
- Fix spelling of tls-ciphers in example.conf.in.
- Fix #4224: auth_xfr_notify.rpl test broken due to typo
- Fix locking for libunbound context setup with broken port config.

28 January 2019: Wouter
- ub_ctx_set_tls call for libunbound that enables DoT for the machines
  set with ub_ctx_set_fwd.  Patch from Florian Obser.
- Set build system for added call in the libunbound API.
- List example config for root zone copy locally hosted with auth-zone
  as suggested from draft-ietf-dnsop-7706-bis-02.  But with updated
  B root address.
- set version to 1.9.0 for release.  And this was released with the
  spelling for tls-ciphers fix as 1.9.0 on Feb 5.  Trunk has 1.9.1 in
  development.

25 January 2019: Wouter
- Fix that tcp for auth zone and outgoing does not remove and
  then gets the ssl read again applied to the deleted commpoint.
- updated contrib/fastrpz.patch to cleanly diff.
- no lock when threads disabled in tcp request buffer count.
  

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:11:13 UTC 2019

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new nsd


To generate a diff of this commit:
cvs rdiff -u -r1.1622 -r1.1623 src/doc/3RDPARTY
cvs rdiff -u -r1.2541 -r1.2542 src/doc/CHANGES

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

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 21:11:13 UTC 2019

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new nsd


To generate a diff of this commit:
cvs rdiff -u -r1.1622 -r1.1623 src/doc/3RDPARTY
cvs rdiff -u -r1.2541 -r1.2542 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1622 src/doc/3RDPARTY:1.1623
--- src/doc/3RDPARTY:1.1622	Sat May 25 07:48:48 2019
+++ src/doc/3RDPARTY	Sat May 25 17:11:13 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1622 2019/05/25 11:48:48 jmcneill Exp $
+#	$NetBSD: 3RDPARTY,v 1.1623 2019/05/25 21:11:13 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -154,12 +154,12 @@ Use cleantags to import
 run configure and update config files in include
 
 Package:	nsd
-Version:	4.1.26
-Current Vers:	4.1.26
+Version:	4.1.27
+Current Vers:	4.1.27
 Maintainer:	Nlnetlabs
 Archive Site:	https://www.nlnetlabs.nl/svn/nsd/
 Home Page:	https://www.nlnetlabs.nl/projects/nsd/
-Date:		2019-03-17
+Date:		2019-05-25
 Mailing List:	https://open.nlnetlabs.nl/mailman/listinfo/nsd-users/
 Responsible:	christos
 License:	BSD-like

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2541 src/doc/CHANGES:1.2542
--- src/doc/CHANGES:1.2541	Sat May 25 07:49:56 2019
+++ src/doc/CHANGES	Sat May 25 17:11:13 2019
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2541 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2542 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -385,3 +385,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	mount_portal(8): in portal.conf # only introduces a comment at
 		start of line, or after whitespace (start word) [kre 20190523]
 	dts: Import dts files from Linux 5.1.4. [jmcneill 20190525]
+	nsd: Import 4.1.27 [christos 20190525]

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat May 25 21:02:33 UTC 2019

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

Log Message:
Fix bug. We must fetch the whole FPU state, otherwise XSTATE_BV could be
outdated, and we could be filling the AVX registers with garbage.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/x86/fpu.c

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

Modified files:

Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.52 src/sys/arch/x86/x86/fpu.c:1.53
--- src/sys/arch/x86/x86/fpu.c:1.52	Sun May 19 08:46:15 2019
+++ src/sys/arch/x86/x86/fpu.c	Sat May 25 21:02:32 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.52 2019/05/19 08:46:15 maxv Exp $	*/
+/*	$NetBSD: fpu.c,v 1.53 2019/05/25 21:02:32 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.52 2019/05/19 08:46:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.53 2019/05/25 21:02:32 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -827,7 +827,7 @@ process_write_fpregs_xmm(struct lwp *l, 
 {
 	union savefpu *fpu_save;
 
-	fpusave_lwp(l, false);
+	fpusave_lwp(l, true);
 	fpu_save = lwp_fpuarea(l);
 
 	if (i386_use_fxsave) {

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat May 25 21:02:33 UTC 2019

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

Log Message:
Fix bug. We must fetch the whole FPU state, otherwise XSTATE_BV could be
outdated, and we could be filling the AVX registers with garbage.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/x86/fpu.c

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

CVS commit: src/external/bsd/nsd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 20:10:22 UTC 2019

Modified Files:
src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
configure.ac server.c zlexer.c zparser.c zparser.h
src/external/bsd/nsd/include: config.h
Added Files:
src/external/bsd/nsd/dist: config.guess config.sub

Log Message:
- resolve conflicts
- Fix autoconf issues
1. Check for login_cap.h
2. Link with -Wl,-R
3. On NetBSD define -D_OPENBSD_SOURCE


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/dist/config.guess \
src/external/bsd/nsd/dist/config.sub
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/configlexer.c \
src/external/bsd/nsd/dist/configparser.c \
src/external/bsd/nsd/dist/configparser.h \
src/external/bsd/nsd/dist/zparser.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/nsd/dist/configure.ac
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/dist/server.c \
src/external/bsd/nsd/dist/zlexer.c src/external/bsd/nsd/dist/zparser.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/include/config.h

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

CVS import: src/external/bsd/nsd/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 19:44:45 UTC 2019

Update of /cvsroot/src/external/bsd/nsd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv749

Log Message:
19 March 2019: Wouter
- tag 4.1.27rc1

18 March 2019: Wouter
- Fix unit test bug013_truncate for new truncation with EDNS size,
  it is one RR smaller for the truncated response in the test.

14 March 2019: Wouter
- Fixed radtree_insert memory leak.
- Fixed access recycled variable.

11 March 2019: Wouter
- Fix #6: nsd-control-setup: Change validity time to a shorter
  period (<2038).
- Fix unused definition in header remote.h.
- Fix #4236: IPV4_MINIMAL_RESPONSE_SIZE=1480 is slightly too big.
- Fix #4235: IP_PMTUDISC_OMIT on IPv4/UDP sockets.

18 February 2019: Wouter
- Fix to remove unused code.

15 February 2019: Wouter
- tentative robustness, delete stats items from list twice if needed.

14 February 2019: Wouter
- Fix #4: setusercontext() is in libutil on NetBSD, and also
  include login_cap.h only if it exists.
- Fix #4215: fixup for state update for TSIG information in server
  processes, nicer printout for tsig_print, tsig_print without
  arguments and no leaks.
- nicer logging for update_tsig.

1 February 2019: Wouter
- Fix for tsig assoc_tsig command on acl with nokey elements.

29 January 2019: Wouter
- Fix #4215: on-the-fly change of TSIG keys with patch from Igor, adds
  nsd-control print_tsig, update_tsig, add_tsig, assoc_tsig
  and del_tsig.  These changes are gone after reload, edit the
  config file (or a file included from it) to make changes that
  last after restart.
- documentation for tsig nsd-control options.

24 January 2019: Wouter
- Deny ANY with only one RR in response, by default.  Patch from
  Daisuke Higashi.  The deny-any statement in nsd.conf sets ANY
  queries over UDP to be further moved to TCP as well.
  Also no additional section processig for type ANY, reducing
  the response size.
- assertions for clang analysis.

10 December 2018: Wouter
- Fix for FreeBSD port with dnstap enabled.

6 December 2018: Wouter
- Fix to reduce region_log_stats if condition, this removes a
  debug statement.

5 December 2018: Wouter
- Fix #4213: disable-ipv6 and dnstap compile error.

3 December 2018: Wouter
- Note that the content_list member is unused; and could be removed
  if the database format is modified or updated.
- Fix that dnstap logs CQ and CR like BIND does.
- Revert that, it looks wrong, AQ and AR are for the authoritative.
 

Status:

Vendor Tag: NLNETLABS
Release Tags:   nsd-4-1-27

U src/external/bsd/nsd/dist/udbzone.c
U src/external/bsd/nsd/dist/nsec3.h
U src/external/bsd/nsd/dist/udbradtree.c
U src/external/bsd/nsd/dist/rbtree.h
U src/external/bsd/nsd/dist/configyyrename.h
U src/external/bsd/nsd/dist/lookup3.h
C src/external/bsd/nsd/dist/configparser.h
U src/external/bsd/nsd/dist/tsig.h
U src/external/bsd/nsd/dist/edns.h
U src/external/bsd/nsd/dist/iterated_hash.c
U src/external/bsd/nsd/dist/nsd.conf.5.in
U src/external/bsd/nsd/dist/namedb.c
U src/external/bsd/nsd/dist/answer.h
U src/external/bsd/nsd/dist/difffile.h
U src/external/bsd/nsd/dist/region-allocator.c
U src/external/bsd/nsd/dist/nsd-checkzone.c
C src/external/bsd/nsd/dist/zparser.h
U src/external/bsd/nsd/dist/dbaccess.c
U src/external/bsd/nsd/dist/dbcreate.c
U src/external/bsd/nsd/dist/nsd-control-setup.sh.in
U src/external/bsd/nsd/dist/dns.c
C src/external/bsd/nsd/dist/zparser.c
U src/external/bsd/nsd/dist/xfrd.c
U src/external/bsd/nsd/dist/zonec.c
U src/external/bsd/nsd/dist/axfr.c
U src/external/bsd/nsd/dist/nsec3.c
U src/external/bsd/nsd/dist/query.h
U src/external/bsd/nsd/dist/nsd.h
U src/external/bsd/nsd/dist/lookup3.c
U src/external/bsd/nsd/dist/config.h.in
U src/external/bsd/nsd/dist/edns.c
C src/external/bsd/nsd/dist/server.c
U src/external/bsd/nsd/dist/util.h
U src/external/bsd/nsd/dist/xfrd-disk.h
U src/external/bsd/nsd/dist/configparser.y
U src/external/bsd/nsd/dist/rbtree.c
U src/external/bsd/nsd/dist/rrl.c
U src/external/bsd/nsd/dist/xfrd-tcp.h
U src/external/bsd/nsd/dist/zlexer.lex
U src/external/bsd/nsd/dist/zonec.h
U src/external/bsd/nsd/dist/namedb.h
U src/external/bsd/nsd/dist/rdata.h
U src/external/bsd/nsd/dist/configure.ac
U src/external/bsd/nsd/dist/ipc.h
U src/external/bsd/nsd/dist/remote.c
U src/external/bsd/nsd/dist/rrl.h
U src/external/bsd/nsd/dist/acx_nlnetlabs.m4
U src/external/bsd/nsd/dist/options.c
U src/external/bsd/nsd/dist/Makefile.in
U src/external/bsd/nsd/dist/mkinstalldirs
U src/external/bsd/nsd/dist/nsd-mem.c
U src/external/bsd/nsd/dist/nsd-checkconf.c
U src/external/bsd/nsd/dist/dns.h
U src/external/bsd/nsd/dist/xfr-inspect.c
U 

CVS import: src/external/bsd/nsd/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 19:44:45 UTC 2019

Update of /cvsroot/src/external/bsd/nsd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv749

Log Message:
19 March 2019: Wouter
- tag 4.1.27rc1

18 March 2019: Wouter
- Fix unit test bug013_truncate for new truncation with EDNS size,
  it is one RR smaller for the truncated response in the test.

14 March 2019: Wouter
- Fixed radtree_insert memory leak.
- Fixed access recycled variable.

11 March 2019: Wouter
- Fix #6: nsd-control-setup: Change validity time to a shorter
  period (<2038).
- Fix unused definition in header remote.h.
- Fix #4236: IPV4_MINIMAL_RESPONSE_SIZE=1480 is slightly too big.
- Fix #4235: IP_PMTUDISC_OMIT on IPv4/UDP sockets.

18 February 2019: Wouter
- Fix to remove unused code.

15 February 2019: Wouter
- tentative robustness, delete stats items from list twice if needed.

14 February 2019: Wouter
- Fix #4: setusercontext() is in libutil on NetBSD, and also
  include login_cap.h only if it exists.
- Fix #4215: fixup for state update for TSIG information in server
  processes, nicer printout for tsig_print, tsig_print without
  arguments and no leaks.
- nicer logging for update_tsig.

1 February 2019: Wouter
- Fix for tsig assoc_tsig command on acl with nokey elements.

29 January 2019: Wouter
- Fix #4215: on-the-fly change of TSIG keys with patch from Igor, adds
  nsd-control print_tsig, update_tsig, add_tsig, assoc_tsig
  and del_tsig.  These changes are gone after reload, edit the
  config file (or a file included from it) to make changes that
  last after restart.
- documentation for tsig nsd-control options.

24 January 2019: Wouter
- Deny ANY with only one RR in response, by default.  Patch from
  Daisuke Higashi.  The deny-any statement in nsd.conf sets ANY
  queries over UDP to be further moved to TCP as well.
  Also no additional section processig for type ANY, reducing
  the response size.
- assertions for clang analysis.

10 December 2018: Wouter
- Fix for FreeBSD port with dnstap enabled.

6 December 2018: Wouter
- Fix to reduce region_log_stats if condition, this removes a
  debug statement.

5 December 2018: Wouter
- Fix #4213: disable-ipv6 and dnstap compile error.

3 December 2018: Wouter
- Note that the content_list member is unused; and could be removed
  if the database format is modified or updated.
- Fix that dnstap logs CQ and CR like BIND does.
- Revert that, it looks wrong, AQ and AR are for the authoritative.
 

Status:

Vendor Tag: NLNETLABS
Release Tags:   nsd-4-1-27

U src/external/bsd/nsd/dist/udbzone.c
U src/external/bsd/nsd/dist/nsec3.h
U src/external/bsd/nsd/dist/udbradtree.c
U src/external/bsd/nsd/dist/rbtree.h
U src/external/bsd/nsd/dist/configyyrename.h
U src/external/bsd/nsd/dist/lookup3.h
C src/external/bsd/nsd/dist/configparser.h
U src/external/bsd/nsd/dist/tsig.h
U src/external/bsd/nsd/dist/edns.h
U src/external/bsd/nsd/dist/iterated_hash.c
U src/external/bsd/nsd/dist/nsd.conf.5.in
U src/external/bsd/nsd/dist/namedb.c
U src/external/bsd/nsd/dist/answer.h
U src/external/bsd/nsd/dist/difffile.h
U src/external/bsd/nsd/dist/region-allocator.c
U src/external/bsd/nsd/dist/nsd-checkzone.c
C src/external/bsd/nsd/dist/zparser.h
U src/external/bsd/nsd/dist/dbaccess.c
U src/external/bsd/nsd/dist/dbcreate.c
U src/external/bsd/nsd/dist/nsd-control-setup.sh.in
U src/external/bsd/nsd/dist/dns.c
C src/external/bsd/nsd/dist/zparser.c
U src/external/bsd/nsd/dist/xfrd.c
U src/external/bsd/nsd/dist/zonec.c
U src/external/bsd/nsd/dist/axfr.c
U src/external/bsd/nsd/dist/nsec3.c
U src/external/bsd/nsd/dist/query.h
U src/external/bsd/nsd/dist/nsd.h
U src/external/bsd/nsd/dist/lookup3.c
U src/external/bsd/nsd/dist/config.h.in
U src/external/bsd/nsd/dist/edns.c
C src/external/bsd/nsd/dist/server.c
U src/external/bsd/nsd/dist/util.h
U src/external/bsd/nsd/dist/xfrd-disk.h
U src/external/bsd/nsd/dist/configparser.y
U src/external/bsd/nsd/dist/rbtree.c
U src/external/bsd/nsd/dist/rrl.c
U src/external/bsd/nsd/dist/xfrd-tcp.h
U src/external/bsd/nsd/dist/zlexer.lex
U src/external/bsd/nsd/dist/zonec.h
U src/external/bsd/nsd/dist/namedb.h
U src/external/bsd/nsd/dist/rdata.h
U src/external/bsd/nsd/dist/configure.ac
U src/external/bsd/nsd/dist/ipc.h
U src/external/bsd/nsd/dist/remote.c
U src/external/bsd/nsd/dist/rrl.h
U src/external/bsd/nsd/dist/acx_nlnetlabs.m4
U src/external/bsd/nsd/dist/options.c
U src/external/bsd/nsd/dist/Makefile.in
U src/external/bsd/nsd/dist/mkinstalldirs
U src/external/bsd/nsd/dist/nsd-mem.c
U src/external/bsd/nsd/dist/nsd-checkconf.c
U src/external/bsd/nsd/dist/dns.h
U src/external/bsd/nsd/dist/xfr-inspect.c
U 

CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 19:21:34 UTC 2019

Modified Files:
src/sys/dev/fdt: fdtbus.c

Log Message:
Restore "not configured" autoconfiguration prints by using config_found_sm_loc 
on the default pass


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/fdt/fdtbus.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/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.28 src/sys/dev/fdt/fdtbus.c:1.29
--- src/sys/dev/fdt/fdtbus.c:1.28	Mon May 20 11:12:10 2019
+++ src/sys/dev/fdt/fdtbus.c	Sat May 25 19:21:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.28 2019/05/20 11:12:10 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.29 2019/05/25 19:21:34 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.28 2019/05/20 11:12:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.29 2019/05/25 19:21:34 jmcneill Exp $");
 
 #include 
 #include 
@@ -290,24 +290,39 @@ fdt_scan(struct fdt_softc *sc, int pass)
 	char buf[FDT_MAX_PATH];
 
 	TAILQ_FOREACH(node, _nodes, n_nodes) {
-		if (node->n_dev != NULL || node->n_cf == NULL)
+		if (node->n_dev != NULL)
 			continue;
 
 		fdt_init_attach_args(>sc_faa, node, quiet, );
 
-		/*
-		 * Make sure we don't attach before a better match in a later pass.
-		 */
-		cfdata_t cf_pass =
-		config_search_loc(fdt_scan_submatch, node->n_bus, "fdt", locs, );
-		if (node->n_cf != cf_pass)
-			continue;
+		if (quiet) {
+			/*
+			 * No match for this device, skip it.
+			 */
+			if (node->n_cf == NULL)
+continue;
+
+			/*
+			 * Make sure we don't attach before a better match in a later pass.
+			 */
+			cfdata_t cf_pass =
+			config_search_loc(fdt_scan_submatch, node->n_bus, "fdt", locs, );
+			if (node->n_cf != cf_pass)
+continue;
+
+			/*
+			 * Attach the device.
+			 */
+			node->n_dev = config_attach_loc(node->n_bus, cf_pass, locs,
+			, fdtbus_print);
+		} else {
+			/*
+			 * Default pass.
+			 */
+			node->n_dev = config_found_sm_loc(node->n_bus, "fdt", locs,
+			, fdtbus_print, fdt_scan_submatch);
+		}
 
-		/*
-		 * Attach the device.
-		 */
-		node->n_dev = config_attach_loc(node->n_bus, cf_pass, locs,
-		, fdtbus_print);
 		if (node->n_dev) {
 			dict = device_properties(node->n_dev);
 			if (fdtbus_get_path(node->n_phandle, buf, sizeof(buf)))

CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 19:21:34 UTC 2019

Modified Files:
src/sys/dev/fdt: fdtbus.c

Log Message:
Restore "not configured" autoconfiguration prints by using config_found_sm_loc 
on the default pass


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/fdt/fdtbus.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/ata

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 16:30:18 UTC 2019

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

Log Message:
use PR_ZERO


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/dev/ata/ata.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/ata

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 16:30:18 UTC 2019

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

Log Message:
use PR_ZERO


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/dev/ata/ata.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.148 src/sys/dev/ata/ata.c:1.149
--- src/sys/dev/ata/ata.c:1.148	Fri Apr  5 20:35:25 2019
+++ src/sys/dev/ata/ata.c	Sat May 25 12:30:18 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.148 2019/04/06 00:35:25 uwe Exp $	*/
+/*	$NetBSD: ata.c,v 1.149 2019/05/25 16:30:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.148 2019/04/06 00:35:25 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.149 2019/05/25 16:30:18 christos Exp $");
 
 #include "opt_ata.h"
 
@@ -1278,17 +1278,8 @@ ata_activate_xfer_locked(struct ata_chan
 struct ata_xfer *
 ata_get_xfer(struct ata_channel *chp, bool waitok)
 {
-	struct ata_xfer *xfer;
-
-	xfer = pool_get(_xfer_pool, waitok ? PR_WAITOK : PR_NOWAIT);
-	KASSERT(!waitok || xfer != NULL);
-
-	if (xfer != NULL) {
-		/* zero everything */
-		memset(xfer, 0, sizeof(*xfer));
-	}
-
-	return xfer;
+	return pool_get(_xfer_pool,
+	PR_ZERO | (waitok ? PR_WAITOK : PR_NOWAIT));
 }
 
 /*

CVS commit: src/external/gpl3/gcc/dist/libsanitizer

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 15:18:52 UTC 2019

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_common.h
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_stoptheworld_linux_libcdep.cc

Log Message:
Undo previous (disable lsan), and instead fix it by passing 1 instead of 0
to the address argument in detach. Apparently linux ignores the address
argument for detach (or treats 0 as 'do not set').


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h
cvs rdiff -u -r1.6 -r1.7 \

src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.4 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.5
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.4	Sat May 25 09:54:37 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h	Sat May 25 11:18:52 2019
@@ -20,7 +20,7 @@
 #include "sanitizer_common/sanitizer_stoptheworld.h"
 #include "sanitizer_common/sanitizer_symbolizer.h"
 
-#if (SANITIZER_LINUX) && !SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64) \
+#if (SANITIZER_NETBSD || SANITIZER_LINUX) && !SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64) \
  && (defined(__x86_64__) ||  defined(__mips64) ||  defined(__aarch64__))
 #define CAN_SANITIZE_LEAKS 1
 #else

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.6 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.7
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.6	Thu Jan 31 03:44:14 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc	Sat May 25 11:18:52 2019
@@ -164,7 +164,7 @@ bool ThreadSuspender::SuspendThread(Susp
 // doesn't hurt to report it.
 VReport(1, "Waiting on thread %d failed, detaching (errno %d).\n",
 tid, wperrno);
-internal_ptrace(PTRACE_DETACH, tid, nullptr, nullptr);
+internal_ptrace(PTRACE_DETACH, tid, (void*)(uptr)1, nullptr);
 return false;
   }
   if (WIFSTOPPED(status) && WSTOPSIG(status) != SIGSTOP) {
@@ -183,7 +183,7 @@ void ThreadSuspender::ResumeAllThreads()
   for (uptr i = 0; i < suspended_threads_list_.thread_count(); i++) {
 pid_t tid = suspended_threads_list_.GetThreadID(i);
 int pterrno;
-if (!internal_iserror(internal_ptrace(PTRACE_DETACH, tid, nullptr, nullptr),
+if (!internal_iserror(internal_ptrace(PTRACE_DETACH, tid, (void*)(uptr)1, nullptr),
   )) {
   VReport(2, "Detached from thread %d.\n", tid);
 } else {

CVS commit: src/external/gpl3/gcc/dist/libsanitizer

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May 25 15:18:52 UTC 2019

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_common.h
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_stoptheworld_linux_libcdep.cc

Log Message:
Undo previous (disable lsan), and instead fix it by passing 1 instead of 0
to the address argument in detach. Apparently linux ignores the address
argument for detach (or treats 0 as 'do not set').


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h
cvs rdiff -u -r1.6 -r1.7 \

src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc

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

Re: audio2

[Valery Ushakov]

On Fri, May 24, 2019 at 21:51:35 +0900, Tetsuya Isaki wrote:

> At Thu, 23 May 2019 17:08:42 +0300,
> Valery Ushakov wrote:
> > > +#if defined(__GNUC__)
> > > +/* gcc defines '>>' as ASR. */
> > > +#define AUDIO_ASR(value, shift)  ((value) >> (shift))
> > > +#else
> > > +#define AUDIO_ASR(value, shift)  ((value) / (1 << (shift)))
> > > +#endif
> > 
> > This feels inverted.  The mathematically correct operation required
> > here is symmetric division (that rounds towards zero).  Arithmetic
> > shift is flooring division (that rounds towards minus infinity).
> 
> Both are not correct but are acceptable.
> 
> # I also used to feel that division is the correct operation.
> # But I don't think so now.
> 
> For example, let's consider to convert 16bits to 15bits.
> In case of round-to-zero,
>  32767, 32766   => 16383
>   :
>  3, 2   => 1
>  1, 0   => 0   < *1
>  -1 => 0   < *1
>  -2, -3 => -1
>   :
>  -32766, -32767 => -16383
>  -32768 => -16384  < *2
> 
> In case of round-to-minus-inf,
>  32767, 32766   => 16383
>   :
>  3, 2   => 1
>  1, 0   => 0
>  -1, -2 => -1
>   :
>  -32767, -32768 => -16384
> 
> As above, in round-to-zero, there are three inputs that output 0
> (*1) and there are only one input that output -16384 (*2).
> In contrast, in round-to-minus-inf, all outputs correspond to two
> input values.
> 
> Which is "correct"?

Speaking in the abstract: The operation that happens here is
rescaling, as far as I understand.  Yes, the two-complement ranges are
lopsided with an extra value on the negative side, but that is far
less important, I think, than commuting with negation.  If you negate
all samples, you have basically the same audio
https://manual.audacityteam.org/man/invert.html ("invert" is a bit
unfortuante as a name b/c of the confusion with the bitwise
operation), so it's nice to have:

-scaleN(sample) = scaleN(-sample)


> The correct operation is not exist whenever rounding to integer
> occurs.
>
> And in audio area, we need to understand that both rounding
> are not correct but are acceptable.

I think you are confusing correctness and precision here.


> Furthermore, we have to consider that this operation is performed
> in the bottom of loop in realtime mixing.  If both rounding are
> acceptable, I'd like to use faster one.  Of course, unless it is
> "undefined".
>  
> > So it feels confusing and wrong to *name* the operation the
> > opposite of what it really is.
> 
> What I want to do here is arithmetic right shift operation and 2nd
> argument in this macro indicates shift count.  So I named it ASR.

My point is exactly that you are confusing implementation detail that
uses right shift as a good enough implementation (which, I reiterate,
I don't object to here) and what is the meaning of the operation that
you are implementing/approximating (see my first paragraph above).


-uwe

CVS commit: src/external/gpl3/gcc/dist/libsanitizer/lsan

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat May 25 13:54:37 UTC 2019

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_common.h

Log Message:
don't claim lsan support on netbsd.

PR toolchain/54226: address sanitizer doesn't work


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h

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

CVS commit: src/external/gpl3/gcc/dist/libsanitizer/lsan

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat May 25 13:54:37 UTC 2019

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_common.h

Log Message:
don't claim lsan support on netbsd.

PR toolchain/54226: address sanitizer doesn't work


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.3 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.4
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.3	Sat Jan 19 12:10:11 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h	Sat May 25 13:54:37 2019
@@ -20,7 +20,7 @@
 #include "sanitizer_common/sanitizer_stoptheworld.h"
 #include "sanitizer_common/sanitizer_symbolizer.h"
 
-#if (SANITIZER_NETBSD || SANITIZER_LINUX) && !SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64) \
+#if (SANITIZER_LINUX) && !SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64) \
  && (defined(__x86_64__) ||  defined(__mips64) ||  defined(__aarch64__))
 #define CAN_SANITIZE_LEAKS 1
 #else

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 12:14:28 UTC 2019

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

Log Message:
Add bcm2837-rpi-3-a-plus.dts, meson-gxl-s805x-libretech-ac.dts,
meson-gxl-s905d-phicomm-n1.dts, rk3399-gru-scarlet-inx.dts,
rk3399-gru-scarlet-kd.dts, rk3399-nanopc-t4.dts, rk3399-nanopi-m4.dts,
rk3399-rock-pi-4.dts, sun50i-a64-amarula-relic.dts,
sun50i-a64-pine64-lts.dts, sun50i-h5-emlid-neutis-n5-devboard.dts,
sun50i-h6-orangepi-lite2.dts, tegra210-p2894-0050-a08.dts.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/conf/GENERIC64

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/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.92 src/sys/arch/evbarm/conf/GENERIC64:1.93
--- src/sys/arch/evbarm/conf/GENERIC64:1.92	Wed May  1 10:41:54 2019
+++ src/sys/arch/evbarm/conf/GENERIC64	Sat May 25 12:14:28 2019
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC64,v 1.92 2019/05/01 10:41:54 jmcneill Exp $
+#	$NetBSD: GENERIC64,v 1.93 2019/05/25 12:14:28 jmcneill Exp $
 #
 #	GENERIC ARM (aarch64) kernel
 #
@@ -16,6 +16,7 @@ makeoptions 	DTSARCH="arm aarch64"
 makeoptions	DTSGNUARCH="arm arm64"
 makeoptions	DTSSUBDIR="allwinner amlogic broadcom nvidia rockchip"
 makeoptions	DTS="
+	bcm2837-rpi-3-a-plus.dts
 	bcm2837-rpi-3-b.dts
 	bcm2837-rpi-3-b-plus.dts
 	bcm2837-rpi-cm3-io3.dts
@@ -31,9 +32,11 @@ makeoptions	DTS="
 	meson-gxbb-wetek-hub.dts
 	meson-gxbb-wetek-play2.dts
 
+	meson-gxl-s805x-libretech-ac.dts
 	meson-gxl-s805x-p241.dts
 	meson-gxl-s905d-p230.dts
 	meson-gxl-s905d-p231.dts
+	meson-gxl-s905d-phicomm-n1.dts
 	meson-gxl-s905w-p281.dts
 	meson-gxl-s905w-tx3-mini.dts
 	meson-gxl-s905x-hwacom-amazetv.dts
@@ -51,17 +54,24 @@ makeoptions	DTS="
 	rk3399-firefly.dts
 	rk3399-gru-bob.dts
 	rk3399-gru-kevin.dts
+	rk3399-gru-scarlet-inx.dts
+	rk3399-gru-scarlet-kd.dts
+	rk3399-nanopc-t4.dts
+	rk3399-nanopi-m4.dts
 	rk3399-puma-haikou.dts
 	rk3399-roc-pc.dts
+	rk3399-rock-pi-4.dts
 	rk3399-rock960.dts
 	rk3399-rockpro64.dts
 	rk3399-sapphire-excavator.dts
 	rk3399-sapphire.dts
 
+	sun50i-a64-amarula-relic.dts
 	sun50i-a64-bananapi-m64.dts
 	sun50i-a64-nanopi-a64.dts
 	sun50i-a64-olinuxino.dts
 	sun50i-a64-orangepi-win.dts
+	sun50i-a64-pine64-lts.dts
 	sun50i-a64-pine64-plus.dts
 	sun50i-a64-pine64.dts
 	sun50i-a64-pinebook.dts
@@ -70,6 +80,7 @@ makeoptions	DTS="
 
 	sun50i-h5-bananapi-m2-plus-v1.2.dts
 	sun50i-h5-bananapi-m2-plus.dts
+	sun50i-h5-emlid-neutis-n5-devboard.dts
 	sun50i-h5-libretech-all-h3-cc.dts
 	sun50i-h5-nanopi-neo-plus2.dts
 	sun50i-h5-nanopi-neo2.dts
@@ -78,12 +89,14 @@ makeoptions	DTS="
 	sun50i-h5-orangepi-zero-plus.dts
 	sun50i-h5-orangepi-zero-plus2.dts
 
+	sun50i-h6-orangepi-lite2.dts
 	sun50i-h6-orangepi-one-plus.dts
 	sun50i-h6-pine-h64.dts
 
 	tegra210-p2371-.dts
 	tegra210-p2371-2180.dts
 	tegra210-p2571.dts
+	tegra210-p2894-0050-a08.dts
 	tegra210-smaug.dts
 "
 options 	CPU_CORTEXA53

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 12:14:28 UTC 2019

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

Log Message:
Add bcm2837-rpi-3-a-plus.dts, meson-gxl-s805x-libretech-ac.dts,
meson-gxl-s905d-phicomm-n1.dts, rk3399-gru-scarlet-inx.dts,
rk3399-gru-scarlet-kd.dts, rk3399-nanopc-t4.dts, rk3399-nanopi-m4.dts,
rk3399-rock-pi-4.dts, sun50i-a64-amarula-relic.dts,
sun50i-a64-pine64-lts.dts, sun50i-h5-emlid-neutis-n5-devboard.dts,
sun50i-h6-orangepi-lite2.dts, tegra210-p2894-0050-a08.dts.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/conf/GENERIC64

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:   Sat May 25 12:06:59 UTC 2019

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

Log Message:
Add bcm2837-rpi-3-a-plus.dts, sun8i-h3-mapleboard-mp130.dts


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/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/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.31 src/sys/arch/evbarm/conf/GENERIC:1.32
--- src/sys/arch/evbarm/conf/GENERIC:1.31	Sun Apr 28 19:26:48 2019
+++ src/sys/arch/evbarm/conf/GENERIC	Sat May 25 12:06:59 2019
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.31 2019/04/28 19:26:48 jmcneill Exp $
+#	$NetBSD: GENERIC,v 1.32 2019/05/25 12:06:59 jmcneill Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -17,6 +17,7 @@ makeoptions	DTSGNUARCH="arm arm64"
 makeoptions	DTSSUBDIR="allwinner broadcom nvidia rockchip socfpga"
 makeoptions	DTS="
 	bcm2836-rpi-2-b.dts
+	bcm2837-rpi-3-a-plus.dts
 	bcm2837-rpi-3-b.dts
 	bcm2837-rpi-3-b-plus.dts
 	bcm2837-rpi-cm3-io3.dts
@@ -120,6 +121,7 @@ makeoptions	DTS="
 	sun8i-h3-bananapi-m2-plus.dts
 	sun8i-h3-beelink-x2.dts
 	sun8i-h3-libretech-all-h3-cc.dts
+	sun8i-h3-mapleboard-mp130.dts
 	sun8i-h3-nanopi-m1-plus.dts
 	sun8i-h3-nanopi-m1.dts
 	sun8i-h3-nanopi-neo.dts

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 12:06:59 UTC 2019

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

Log Message:
Add bcm2837-rpi-3-a-plus.dts, sun8i-h3-mapleboard-mp130.dts


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/GENERIC

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

CVS commit: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 12:04:27 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm283x.dtsi

Log Message:
Remove duplicate vchiq node


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi

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

CVS commit: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 12:04:27 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm283x.dtsi

Log Message:
Remove duplicate vchiq node


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi

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

Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.7 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.8
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.7	Sat May 25 11:48:05 2019
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Sat May 25 12:04:27 2019
@@ -651,20 +651,10 @@
 			compatible = "brcm,bcm2835-vc4";
 		};
 
-
 		fb: fb {
 			compatible = "brcm,bcm2835-fb";
 			status = "ok";
 		};
-
-		vchiq: vchiq {
-			compatible = "brcm,bcm2835-vchiq";
-			reg = <0x7e00b840 0xf>;
-			interrupts = <0 2>;
-			cache-line-size = <32>;
-		};
-
-
 	};
 
 	clocks {

CVS commit: src/doc

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:49:56 UTC 2019

Modified Files:
src/doc: CHANGES

Log Message:
dts: Import dts files from Linux 5.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.2540 -r1.2541 src/doc/CHANGES

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

CVS commit: src/doc

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:49:56 UTC 2019

Modified Files:
src/doc: CHANGES

Log Message:
dts: Import dts files from Linux 5.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.2540 -r1.2541 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2540 src/doc/CHANGES:1.2541
--- src/doc/CHANGES:1.2540	Thu May 23 04:37:31 2019
+++ src/doc/CHANGES	Sat May 25 11:49:56 2019
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2540 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2541 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -384,3 +384,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	file(1): Upgraded to 5.37. [christos 20190522]
 	mount_portal(8): in portal.conf # only introduces a comment at
 		start of line, or after whitespace (start word) [kre 20190523]
+	dts: Import dts files from Linux 5.1.4. [jmcneill 20190525]

CVS commit: src/doc

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:48:48 UTC 2019

Modified Files:
src/doc: 3RDPARTY

Log Message:
dts updated to 5.1.4


To generate a diff of this commit:
cvs rdiff -u -r1.1621 -r1.1622 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1621 src/doc/3RDPARTY:1.1622
--- src/doc/3RDPARTY:1.1621	Wed May 22 17:27:41 2019
+++ src/doc/3RDPARTY	Sat May 25 11:48:48 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1621 2019/05/22 17:27:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1622 2019/05/25 11:48:48 jmcneill Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1704,8 +1704,8 @@ Notes:
 external/gpl2/dtc/dtc2netbsd should be used to create directories to import
 
 Package:	dts
-Version:	4.20.3
-Current Vers:	4.20.3
+Version:	5.1.4
+Current Vers:	5.1.4
 Maintainer:	https://www.kernel.org/
 Archive Site:	https://cdn.kernel.org/pub/linux/kernel/v4.x/
 Home Page:	https://www.kernel.org/

CVS commit: src/sys/external/gpl2/dts/dist

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:48:05 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
bcm283x.dtsi sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-gx.dtsi meson-gxbb.dtsi meson-gxl.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
rk3328-rock64.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
qcom-apq8064-arrow-sd-600eval-pins.dtsi
qcom-apq8064-arrow-sd-600eval.dts skeleton.dtsi skeleton64.dtsi

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton64.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
cvs rdiff -u -r1.4 -r1.5 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.2 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.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/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.4 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.5
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.4	Wed Jun 27 16:32:14 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi	Sat May 25 11:48:05 2019
@@ -1,7 +1,7 @@
 #include 
 
 / {
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0 0x1000>;
 	};
@@ -19,8 +19,6 @@
 	soc {
 		firmware: firmware {
 			compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
-			#address-cells = <0>;
-			#size-cells = <0>;
 			mboxes = <>;
 		};
 
@@ -30,9 +28,9 @@
 			#power-domain-cells = <1>;
 		};
 
-		mailbox@7e00b840 {
+		vchiq: mailbox@7e00b840 {
 			compatible = "brcm,bcm2835-vchiq";
-			reg = <0x7e00b840 0xf>;
+			reg = <0x7e00b840 0x3c>;
 			interrupts = <0 2>;
 		};
 	};
@@ -87,10 +85,6 @@
 	power-domains = < RPI_POWER_DOMAIN_USB>;
 };
 
- {
-	power-domains = < RPI_POWER_DOMAIN_V3D>;
-};
-
  {
 	power-domains = < RPI_POWER_DOMAIN_HDMI>;
 	status = "okay";

Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.6 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.7
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.6	Tue Jan 22 15:13:22 2019
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi	Sat May 25 11:48:05 2019
@@ -3,6 +3,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /* firmware-provided startup stubs live here, where the secondary CPUs are
  * spinning.
@@ -120,9 +121,18 @@
 			#interrupt-cells = <2>;
 		};
 
-		watchdog@7e10 {
-			compatible = "brcm,bcm2835-pm-wdt";
-			reg = <0x7e10 0x28>;
+		pm: watchdog@7e10 {
+			compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
+			#power-domain-cells = <1>;
+			#reset-cells = <1>;
+			reg = <0x7e10 0x114>,
+			  <0x7e00a000 0x24>;
+			clocks = < BCM2835_CLOCK_V3D>,
+ < BCM2835_CLOCK_PERI_IMAGE>,
+ < BCM2835_CLOCK_H264>,
+ < BCM2835_CLOCK_ISP>;
+			clock-names = "v3d", "peri_image", "h264", "isp";
+		

CVS commit: src/doc

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:48:48 UTC 2019

Modified Files:
src/doc: 3RDPARTY

Log Message:
dts updated to 5.1.4


To generate a diff of this commit:
cvs rdiff -u -r1.1621 -r1.1622 src/doc/3RDPARTY

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

CVS commit: src/sys/external/gpl2/dts/dist

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat May 25 11:48:05 UTC 2019

Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
bcm283x.dtsi sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-gx.dtsi meson-gxbb.dtsi meson-gxl.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
rk3328-rock64.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
qcom-apq8064-arrow-sd-600eval-pins.dtsi
qcom-apq8064-arrow-sd-600eval.dts skeleton.dtsi skeleton64.dtsi

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton64.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
cvs rdiff -u -r1.4 -r1.5 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.2 -r1.3 \

src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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