CVS commit: src/usr.bin/vndcompress

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr  7 23:29:59 UTC 2016

Modified Files:
src/usr.bin/vndcompress: utils.c

Log Message:
__diagused, not __unused -- used in an assert.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/vndcompress/utils.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/vndcompress/utils.c
diff -u src/usr.bin/vndcompress/utils.c:1.4 src/usr.bin/vndcompress/utils.c:1.5
--- src/usr.bin/vndcompress/utils.c:1.4	Wed Jan 22 06:15:31 2014
+++ src/usr.bin/vndcompress/utils.c	Thu Apr  7 23:29:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: utils.c,v 1.4 2014/01/22 06:15:31 riastradh Exp $	*/
+/*	$NetBSD: utils.c,v 1.5 2016/04/07 23:29:59 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: utils.c,v 1.4 2014/01/22 06:15:31 riastradh Exp $");
+__RCSID("$NetBSD: utils.c,v 1.5 2016/04/07 23:29:59 riastradh Exp $");
 
 #include 
 
@@ -61,7 +61,7 @@ int	vsnprintf_ss(char *restrict, size_t,
 ssize_t
 read_block(int fd, void *buffer, size_t n)
 {
-	char *p = buffer, *const end __unused = (p + n);
+	char *p = buffer, *const end __diagused = (p + n);
 	size_t total_read = 0;
 
 	while (n > 0) {
@@ -93,7 +93,7 @@ read_block(int fd, void *buffer, size_t 
 ssize_t
 pread_block(int fd, void *buffer, size_t n, off_t fdpos)
 {
-	char *p = buffer, *const end __unused = (p + n);
+	char *p = buffer, *const end __diagused = (p + n);
 	size_t total_read = 0;
 
 	assert(0 <= fdpos);

CVS commit: src/sys/net

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr  7 21:41:02 UTC 2016

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

Log Message:
Use sockaddr_dl_init


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/net/rtsock.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/rtsock.c
diff -u src/sys/net/rtsock.c:1.180 src/sys/net/rtsock.c:1.181
--- src/sys/net/rtsock.c:1.180	Wed Apr  6 13:34:33 2016
+++ src/sys/net/rtsock.c	Thu Apr  7 17:41:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.180 2016/04/06 17:34:33 christos Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.181 2016/04/07 21:41:02 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.180 2016/04/06 17:34:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.181 2016/04/07 21:41:02 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -448,16 +448,10 @@ static void
 route_get_sdl(const struct ifnet *ifp, const struct sockaddr *dst,
 struct sockaddr_dl *sdl, int *flags)
 {
-	struct llentry *la = NULL;
+	struct llentry *la;
 
 	KASSERT(ifp != NULL);
 
-	memset(sdl, 0, sizeof(*sdl));
-	sdl->sdl_family = AF_LINK;
-	sdl->sdl_len = sizeof(*sdl);
-	sdl->sdl_index = ifp->if_index;
-	sdl->sdl_type = ifp->if_type;
-
 	IF_AFDATA_RLOCK(ifp);
 	switch (dst->sa_family) {
 	case AF_INET:
@@ -467,19 +461,18 @@ route_get_sdl(const struct ifnet *ifp, c
 		la = lla_lookup(LLTABLE6(ifp), 0, dst);
 		break;
 	default:
+		la = NULL;
 		KASSERTMSG(0, "Invalid AF=%d\n", dst->sa_family);
 		break;
 	}
 	IF_AFDATA_RUNLOCK(ifp);
 
-	if (LLE_IS_VALID(la) &&
-	(la->la_flags & LLE_VALID) == LLE_VALID) {
-		sdl->sdl_alen = ifp->if_addrlen;
-		memcpy(LLADDR(sdl), >ll_addr, ifp->if_addrlen);
-	} else {
-		sdl->sdl_alen = 0;
-		memset(LLADDR(sdl), 0, ifp->if_addrlen);
-	}
+	void *a = (LLE_IS_VALID(la) && (la->la_flags & LLE_VALID) == LLE_VALID)
+	? >ll_addr : NULL;
+
+	a = sockaddr_dl_init(sdl, sizeof(*sdl), ifp->if_index, ifp->if_type,
+		NULL, 0, a, ifp->if_addrlen);
+	KASSERT(a != NULL);
 
 	if (la != NULL) {
 		*flags = la->la_flags;
@@ -1035,6 +1028,7 @@ COMPATNAME(rt_msg1)(int type, struct rt_
 	rtm->rtm_msglen = len;
 	rtm->rtm_version = RTM_XVERSION;
 	rtm->rtm_type = type;
+printf("%s: type=%#x len=%d\n", __func__, type, len);
 	return m;
 out:
 	m_freem(m);

CVS commit: src/sys/arch/sparc/sparc

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Thu Apr  7 19:46:39 UTC 2016

Modified Files:
src/sys/arch/sparc/sparc: openfirm.c

Log Message:
Rework locking mechanism introduced in rev. 1.21: use __cpu_simple_lock... 
instead of mutex_... since this causes issues when LOCKDEBUG is defined


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/sparc/openfirm.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/sparc/sparc/openfirm.c
diff -u src/sys/arch/sparc/sparc/openfirm.c:1.21 src/sys/arch/sparc/sparc/openfirm.c:1.22
--- src/sys/arch/sparc/sparc/openfirm.c:1.21	Fri Apr  1 20:21:45 2016
+++ src/sys/arch/sparc/sparc/openfirm.c	Thu Apr  7 19:46:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: openfirm.c,v 1.21 2016/04/01 20:21:45 palle Exp $	*/
+/*	$NetBSD: openfirm.c,v 1.22 2016/04/07 19:46:39 palle Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,10 +32,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.21 2016/04/01 20:21:45 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.22 2016/04/07 19:46:39 palle Exp $");
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: openfirm.c,v
  * Use a mutex to protect access to the buffer from multiple threads.
  * 
  */
-kmutex_t ofcall_mtx;
+static __cpu_simple_lock_t ofcall_lock;
 static char ofbounce[OFBOUNCE_MAXSIZE];
 #endif
 #endif
@@ -67,7 +68,7 @@ OF_init(void)
 #ifdef SUN4V
 #ifdef __arch64__
   KASSERT(((uint64_t) & 0xUL)==(uint64_t));
-  mutex_init(_mtx, MUTEX_DEFAULT, IPL_NONE);
+  __cpu_simple_lock_init(_lock);
 #endif	
 #endif
 }
@@ -542,7 +543,7 @@ OF_write(int handle, const void *addr, i
 	}
 #ifdef SUN4V
 #if __arch64__
-	mutex_enter(_mtx);
+	__cpu_simple_lock(_lock);
 	if (len > OFBOUNCE_MAXSIZE) 
 		panic("OF_write(len = %d) exceedes bounce buffer\n", len);
 	memcpy(ofbounce, addr, len);
@@ -564,7 +565,7 @@ OF_write(int handle, const void *addr, i
 	}
 #ifdef SUN4V
 #if __arch64__
-	mutex_exit(_mtx);
+	__cpu_simple_unlock(_lock);
 #endif
 #endif
 	return act;

CVS commit: src/sys/compat/sys

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Apr  7 17:48:40 UTC 2016

Modified Files:
src/sys/compat/sys: socket.h

Log Message:
include opt_compat_netbsd.h to get COMPAT_SOCKCRED70 defined.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/compat/sys/socket.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/compat/sys/socket.h
diff -u src/sys/compat/sys/socket.h:1.13 src/sys/compat/sys/socket.h:1.14
--- src/sys/compat/sys/socket.h:1.13	Wed Apr  6 19:45:45 2016
+++ src/sys/compat/sys/socket.h	Thu Apr  7 17:48:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.13 2016/04/06 19:45:45 roy Exp $	*/
+/*	$NetBSD: socket.h,v 1.14 2016/04/07 17:48:40 mrg Exp $	*/
 
 /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -36,6 +36,7 @@
 
 #ifdef _KERNEL_OPT
 
+#include "opt_compat_netbsd.h"
 #include "opt_compat_linux.h"
 #include "opt_compat_svr4.h"
 #include "opt_compat_ultrix.h"

CVS commit: src/doc

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr  7 15:36:42 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
Reminder to add RCSIDs in any future DRM update.


To generate a diff of this commit:
cvs rdiff -u -r1.1318 -r1.1319 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.1318 src/doc/3RDPARTY:1.1319
--- src/doc/3RDPARTY:1.1318	Sun Apr  3 08:21:15 2016
+++ src/doc/3RDPARTY	Thu Apr  7 15:36:42 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1318 2016/04/03 08:21:15 taca Exp $
+#	$NetBSD: 3RDPARTY,v 1.1319 2016/04/07 15:36:42 riastradh Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -342,6 +342,9 @@ the source for details.
 Vendor tag:LINUX
 Release tag:   linux-X-Y(-rcZ)-drm-bsd
 	(nouveau got reimported as linux-3-15-drm-bsd-reimport-nouveau)
+I neglected to add RCSIDs in the last import (except for nouveau, for
+which nouveau2netbsd adds them).  For the next import, remember to add
+them!
 
 Package:	gmake
 Version:	3.81

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr  7 12:06:50 UTC 2016

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

Log Message:
remove more ifdefs


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/exec_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/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.73 src/sys/kern/exec_subr.c:1.74
--- src/sys/kern/exec_subr.c:1.73	Wed Apr  6 23:31:12 2016
+++ src/sys/kern/exec_subr.c	Thu Apr  7 08:06:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.73 2016/04/07 03:31:12 christos Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.74 2016/04/07 12:06:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.73 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.74 2016/04/07 12:06:50 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -45,10 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: exec_subr.c,
 #include 
 #include 
 #include 
-
-#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include 
-#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include 
 

CVS commit: src/sys/uvm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr  7 12:07:36 UTC 2016

Modified Files:
src/sys/uvm: uvm_mmap.c uvm_unix.c

Log Message:
remove more ifdefs


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/uvm/uvm_mmap.c
cvs rdiff -u -r1.46 -r1.47 src/sys/uvm/uvm_unix.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/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.155 src/sys/uvm/uvm_mmap.c:1.156
--- src/sys/uvm/uvm_mmap.c:1.155	Wed Apr  6 23:31:12 2016
+++ src/sys/uvm/uvm_mmap.c	Thu Apr  7 08:07:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.155 2016/04/07 03:31:12 christos Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.156 2016/04/07 12:07:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.155 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.156 2016/04/07 12:07:36 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -56,10 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v
 #include 
 #include 
 #include 
-
-#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include 
-#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include 
 

Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.46 src/sys/uvm/uvm_unix.c:1.47
--- src/sys/uvm/uvm_unix.c:1.46	Wed Apr  6 23:31:12 2016
+++ src/sys/uvm/uvm_unix.c	Thu Apr  7 08:07:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_unix.c,v 1.46 2016/04/07 03:31:12 christos Exp $	*/
+/*	$NetBSD: uvm_unix.c,v 1.47 2016/04/07 12:07:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.46 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.47 2016/04/07 12:07:36 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -56,10 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v
 
 #include 
 #include 
-
-#ifdef PAX_MPROTECT
 #include 
-#endif /* PAX_MPROTECT */
 
 #include 
 

CVS commit: src/lib/libpthread

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Apr  7 06:21:48 UTC 2016

Modified Files:
src/lib/libpthread: pthread_attr_getguardsize.3

Log Message:
_SC_PAGESIZE is not the page size; it's a symbolic code for retrieving
the page size.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libpthread/pthread_attr_getguardsize.3

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

Modified files:

Index: src/lib/libpthread/pthread_attr_getguardsize.3
diff -u src/lib/libpthread/pthread_attr_getguardsize.3:1.2 src/lib/libpthread/pthread_attr_getguardsize.3:1.3
--- src/lib/libpthread/pthread_attr_getguardsize.3:1.2	Thu Jul  8 18:24:34 2010
+++ src/lib/libpthread/pthread_attr_getguardsize.3	Thu Apr  7 06:21:48 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pthread_attr_getguardsize.3,v 1.2 2010/07/08 18:24:34 wiz Exp $
+.\"	$NetBSD: pthread_attr_getguardsize.3,v 1.3 2016/04/07 06:21:48 dholland Exp $
 .\"
 .\" Copyright (c) 2010 Jukka Ruohonen 
 .\" All rights reserved.
@@ -66,9 +66,12 @@ In
 .Nx
 the default
 .Fa guardsize
-is
-.Dv _SC_PAGESIZE ,
-the system page size.
+is the system page size.
+(This value is often 4096 bytes but varies on some ports; the
+precise value can be retrieved by using
+.Xr sysconf 3
+with
+.Dv _SC_PAGESIZE . )
 .Pp
 The rationale behind
 .Fa guardsize