CVS commit: src/sys/rump/librump/rumpkern

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Sun Sep 17 05:47:19 UTC 2017

Modified Files:
src/sys/rump/librump/rumpkern: locks.c

Log Message:
As if rump wasn't constipated enough...

Add some more blockages, hopefully allow the build to find a
path all the way to the other end...


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/rump/librump/rumpkern/locks.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/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.74 src/sys/rump/librump/rumpkern/locks.c:1.75
--- src/sys/rump/librump/rumpkern/locks.c:1.74	Mon May  1 21:35:26 2017
+++ src/sys/rump/librump/rumpkern/locks.c	Sun Sep 17 05:47:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: locks.c,v 1.74 2017/05/01 21:35:26 pgoyette Exp $	*/
+/*	$NetBSD: locks.c,v 1.75 2017/09/17 05:47:19 kre Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.74 2017/05/01 21:35:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.75 2017/09/17 05:47:19 kre Exp $");
 
 #include 
 #include 
@@ -98,7 +98,7 @@ static lockops_t rw_lockops = {
  * penalty.
  */
 
-#define RUMPMTX(mtx) (*(struct rumpuser_mtx **)(mtx))
+#define RUMPMTX(mtx) (*(struct rumpuser_mtx *const*)(mtx))
 
 void
 mutex_init(kmutex_t *mtx, kmutex_type_t type, int ipl)
@@ -183,7 +183,7 @@ mutex_exit(kmutex_t *mtx)
 __strong_alias(mutex_spin_exit,mutex_exit);
 
 int
-mutex_ownable(kmutex_t *mtx)
+mutex_ownable(const kmutex_t *mtx)
 {
 
 #ifdef LOCKDEBUG
@@ -193,14 +193,14 @@ mutex_ownable(kmutex_t *mtx)
 }
 
 int
-mutex_owned(kmutex_t *mtx)
+mutex_owned(const kmutex_t *mtx)
 {
 
 	return mutex_owner(mtx) == curlwp;
 }
 
-struct lwp *
-mutex_owner(kmutex_t *mtx)
+lwp_t *
+mutex_owner(const kmutex_t *mtx)
 {
 	struct lwp *l;
 

CVS commit: src/sys/rump/librump/rumpkern

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Sun Sep 17 05:47:19 UTC 2017

Modified Files:
src/sys/rump/librump/rumpkern: locks.c

Log Message:
As if rump wasn't constipated enough...

Add some more blockages, hopefully allow the build to find a
path all the way to the other end...


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/rump/librump/rumpkern/locks.c

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

CVS commit: src/share/misc

[Brian Ginsbach]

Module Name:src
Committed By:   ginsbach
Date:   Sun Sep 17 00:54:16 UTC 2017

Modified Files:
src/share/misc: acronyms

Log Message:
Add IFF and IFTTT


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/share/misc/acronyms

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

CVS commit: src/share/misc

[Brian Ginsbach]

Module Name:src
Committed By:   ginsbach
Date:   Sun Sep 17 00:54:16 UTC 2017

Modified Files:
src/share/misc: acronyms

Log Message:
Add IFF and IFTTT


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/share/misc/acronyms

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

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.258 src/share/misc/acronyms:1.259
--- src/share/misc/acronyms:1.258	Fri Sep 15 23:08:11 2017
+++ src/share/misc/acronyms	Sun Sep 17 00:54:16 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.258 2017/09/15 23:08:11 ginsbach Exp $
+$NetBSD: acronyms,v 1.259 2017/09/17 00:54:16 ginsbach Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -232,6 +232,8 @@ IDK	I don't know
 IDRC	I don't really care
 IDTS	I don't think so
 IDTT	I drink to that
+IFF	if and only if
+IFTTT	if this then that
 IHBW	I have been wrong
 IIANM	if I am not mistaken
 IIRC	if I {recall,remember} correctly

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 17 00:01:08 UTC 2017

Modified Files:
src/sys/arch/alpha/include: lock.h
src/sys/arch/arm/include: lock.h
src/sys/arch/hppa/include: lock.h
src/sys/arch/ia64/include: lock.h
src/sys/arch/m68k/include: lock.h
src/sys/arch/mips/include: lock.h
src/sys/arch/or1k/include: lock.h
src/sys/arch/powerpc/include: lock.h
src/sys/arch/sh3/include: lock.h
src/sys/arch/sparc/include: lock.h
src/sys/arch/usermode/include: lock.h
src/sys/arch/vax/include: lock.h

Log Message:
more const.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/include/lock.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/lock.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/include/lock.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/lock.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/lock.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/include/lock.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/lock.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/lock.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sh3/include/lock.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/include/lock.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/lock.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/include/lock.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/arch/alpha/include/lock.h
diff -u src/sys/arch/alpha/include/lock.h:1.28 src/sys/arch/alpha/include/lock.h:1.29
--- src/sys/arch/alpha/include/lock.h:1.28	Wed Nov 25 09:28:50 2009
+++ src/sys/arch/alpha/include/lock.h	Sat Sep 16 20:01:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.28 2009/11/25 14:28:50 rmind Exp $ */
+/* $NetBSD: lock.h,v 1.29 2017/09/17 00:01:07 christos Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -42,13 +42,13 @@
 #endif
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_LOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_UNLOCKED;
 }

Index: src/sys/arch/arm/include/lock.h
diff -u src/sys/arch/arm/include/lock.h:1.32 src/sys/arch/arm/include/lock.h:1.33
--- src/sys/arch/arm/include/lock.h:1.32	Wed Feb 25 08:52:42 2015
+++ src/sys/arch/arm/include/lock.h	Sat Sep 16 20:01:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.32 2015/02/25 13:52:42 joerg Exp $	*/
+/*	$NetBSD: lock.h,v 1.33 2017/09/17 00:01:07 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,13 +42,13 @@
 #define	_ARM_LOCK_H_
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_LOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_UNLOCKED;
 }

Index: src/sys/arch/hppa/include/lock.h
diff -u src/sys/arch/hppa/include/lock.h:1.19 src/sys/arch/hppa/include/lock.h:1.20
--- src/sys/arch/hppa/include/lock.h:1.19	Sun Jan 15 13:03:12 2017
+++ src/sys/arch/hppa/include/lock.h	Sat Sep 16 20:01:07 2017
@@ -1,4 +1,4 @@
-/* 	$NetBSD: lock.h,v 1.19 2017/01/15 18:03:12 christos Exp $	*/
+/* 	$NetBSD: lock.h,v 1.20 2017/09/17 00:01:07 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -49,13 +49,13 @@
 #define __SIMPLELOCK_RAW_UNLOCKED	1UL
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__SIMPLELOCK_ALIGN(__ptr) == __SIMPLELOCK_RAW_LOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__SIMPLELOCK_ALIGN(__ptr) == __SIMPLELOCK_RAW_UNLOCKED;
 }

Index: src/sys/arch/ia64/include/lock.h
diff -u src/sys/arch/ia64/include/lock.h:1.5 src/sys/arch/ia64/include/lock.h:1.6
--- src/sys/arch/ia64/include/lock.h:1.5	Fri Aug  5 12:59:26 2016
+++ src/sys/arch/ia64/include/lock.h	Sat Sep 16 20:01:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.5 2016/08/05 16:59:26 scole Exp $	*/
+/*	$NetBSD: lock.h,v 1.6 2017/09/17 00:01:07 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
 #define	_IA64_LOCK_H_
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_LOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 17 00:01:08 UTC 2017

Modified Files:
src/sys/arch/alpha/include: lock.h
src/sys/arch/arm/include: lock.h
src/sys/arch/hppa/include: lock.h
src/sys/arch/ia64/include: lock.h
src/sys/arch/m68k/include: lock.h
src/sys/arch/mips/include: lock.h
src/sys/arch/or1k/include: lock.h
src/sys/arch/powerpc/include: lock.h
src/sys/arch/sh3/include: lock.h
src/sys/arch/sparc/include: lock.h
src/sys/arch/usermode/include: lock.h
src/sys/arch/vax/include: lock.h

Log Message:
more const.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/include/lock.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/lock.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/include/lock.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/lock.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/lock.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/include/lock.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/lock.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/lock.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sh3/include/lock.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/include/lock.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/lock.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/include/lock.h

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

CVS commit: src

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Sep 17 00:00:39 UTC 2017

Modified Files:
src/distrib/sets/lists/base: mi
src/external/cddl: Makefile
Added Files:
src/external/cddl/dtracetoolkit: Makefile
src/external/cddl/dtracetoolkit/dist: Makefile

Log Message:
Include scripts from the DTrace Toolkit if DTrace support is enabled.
The following scripts are installed:
dtruss- a DTrace version of truss.
execsnoop - snoop process execution as it occurs.
opensnoop - snoop file opens as they occur.
procsystime - print process system call time details.

ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1160 -r1.1161 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/dtracetoolkit/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/dtracetoolkit/dist/Makefile

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1160 src/distrib/sets/lists/base/mi:1.1161
--- src/distrib/sets/lists/base/mi:1.1160	Thu Aug 10 15:31:49 2017
+++ src/distrib/sets/lists/base/mi	Sun Sep 17 00:00:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1160 2017/08/10 15:31:49 nat Exp $
+# $NetBSD: mi,v 1.1161 2017/09/17 00:00:39 sevan Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1649,6 +1649,7 @@
 ./usr/sbin/download-vulnerability-list		base-pkgutil-bin
 ./usr/sbin/dtmfdecodebase-isdn-bin
 ./usr/sbin/dtracebase-debug-bin		dtrace
+./usr/sbin/dtrussbase-debug-bin		dtrace
 ./usr/sbin/dumpfsbase-sysutil-bin
 ./usr/sbin/dumplfsbase-sysutil-bin
 ./usr/sbin/eaytestbase-obsolete		obsolete
@@ -1658,6 +1659,7 @@
 ./usr/sbin/eshconfigbase-sysutil-bin
 ./usr/sbin/etcupdatebase-sysutil-bin
 ./usr/sbin/extattrctlbase-sysutil-bin
+./usr/sbin/execsnoopbase-debug-bin		dtrace
 ./usr/sbin/faithdbase-router-bin		inet6
 ./usr/sbin/fixmountbase-nfsclient-bin
 ./usr/sbin/flashctlbase-sysutil-bin
@@ -1806,6 +1808,7 @@
 ./usr/sbin/ntptimesetbase-obsolete		obsolete
 ./usr/sbin/ntptracebase-ntp-bin
 ./usr/sbin/omshellbase-dhcpd-bin
+./usr/sbin/opensnoopbase-debug-bin		dtrace
 ./usr/sbin/pac	base-sysutil-bin
 ./usr/sbin/paxctlbase-sysutil-bin
 ./usr/sbin/pcictlbase-sysutil-bin
@@ -1841,6 +1844,7 @@
 ./usr/sbin/pppoectlbase-obsolete		obsolete
 ./usr/sbin/pppstatsbase-ppp-bin
 ./usr/sbin/praliasesbase-obsolete		obsolete
+./usr/sbin/procsystimebase-debug-bin		dtrace
 ./usr/sbin/psrsetbase-sysutil-bin
 ./usr/sbin/pstatbase-sysutil-bin
 ./usr/sbin/pvcsifbase-netutil-bin

Index: src/external/cddl/Makefile
diff -u src/external/cddl/Makefile:1.3 src/external/cddl/Makefile:1.4
--- src/external/cddl/Makefile:1.3	Tue Mar 25 09:52:55 2014
+++ src/external/cddl/Makefile	Sun Sep 17 00:00:39 2017
@@ -1,8 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 2014/03/25 09:52:55 ozaki-r Exp $
+#	$NetBSD: Makefile,v 1.4 2017/09/17 00:00:39 sevan Exp $
 .include 
 
 # We need more modular flag e.g. we can add dtrace to osnet later
 
+.if (${MKDTRACE} != "no")
+SUBDIR+= dtracetoolkit
+.endif
+
 .if ( ${MKZFS} != "no" || ${MKDTRACE} != "no" || ${MKCTF} != "no")
 SUBDIR+= osnet
 .endif

Added files:

Index: src/external/cddl/dtracetoolkit/Makefile
diff -u /dev/null src/external/cddl/dtracetoolkit/Makefile:1.1
--- /dev/null	Sun Sep 17 00:00:39 2017
+++ src/external/cddl/dtracetoolkit/Makefile	Sun Sep 17 00:00:39 2017
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2017/09/17 00:00:39 sevan Exp $
+
+SUBDIR= 	dist
+
+.include 

Index: src/external/cddl/dtracetoolkit/dist/Makefile
diff -u /dev/null src/external/cddl/dtracetoolkit/dist/Makefile:1.1
--- /dev/null	Sun Sep 17 00:00:39 2017
+++ src/external/cddl/dtracetoolkit/dist/Makefile	Sun Sep 17 00:00:39 2017
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2017/09/17 00:00:39 sevan Exp $
+
+.include 
+
+.if (${MKDTRACE} != "no")
+FILES= 	dtruss
+FILES+= 	execsnoop
+FILES+= 	opensnoop
+FILES+= 	procsystime
+
+FILESDIR= 	/usr/sbin
+FILESMODE= 	555
+.endif
+
+.include 
+.include 

CVS commit: src

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Sun Sep 17 00:00:39 UTC 2017

Modified Files:
src/distrib/sets/lists/base: mi
src/external/cddl: Makefile
Added Files:
src/external/cddl/dtracetoolkit: Makefile
src/external/cddl/dtracetoolkit/dist: Makefile

Log Message:
Include scripts from the DTrace Toolkit if DTrace support is enabled.
The following scripts are installed:
dtruss- a DTrace version of truss.
execsnoop - snoop process execution as it occurs.
opensnoop - snoop file opens as they occur.
procsystime - print process system call time details.

ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1160 -r1.1161 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/dtracetoolkit/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/dtracetoolkit/dist/Makefile

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

CVS commit: src/sys/external/bsd/drm2/linux

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:56:42 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/linux: linux_ww_mutex.c

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c

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

CVS commit: src/sys/external/bsd/drm2/linux

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:56:42 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/linux: linux_ww_mutex.c

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/linux/linux_ww_mutex.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/external/bsd/drm2/linux/linux_ww_mutex.c
diff -u src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.3 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.4
--- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.3	Fri Aug 25 10:14:44 2017
+++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c	Sat Sep 16 19:56:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ww_mutex.c,v 1.3 2017/08/25 14:14:44 riastradh Exp $	*/
+/*	$NetBSD: linux_ww_mutex.c,v 1.4 2017/09/16 23:56:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.3 2017/08/25 14:14:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.4 2017/09/16 23:56:42 christos Exp $");
 
 #include 
 #include 
@@ -122,9 +122,9 @@ ww_acquire_fini(struct ww_acquire_ctx *c
 
 #ifdef LOCKDEBUG
 static void
-ww_dump(volatile void *cookie)
+ww_dump(const volatile void *cookie)
 {
-	volatile struct ww_mutex *mutex = cookie;
+	const volatile struct ww_mutex *mutex = cookie;
 
 	printf_nolog("%-13s: ", "state");
 	switch (mutex->wwm_state) {
@@ -135,7 +135,7 @@ ww_dump(volatile void *cookie)
 		printf_nolog("owned by lwp\n");
 		printf_nolog("%-13s: %p\n", "owner", mutex->wwm_u.owner);
 		printf_nolog("%-13s: %s\n", "waiters",
-		cv_has_waiters(__UNVOLATILE(>wwm_cv))
+		cv_has_waiters((void *)(intptr_t)>wwm_cv)
 			? "yes" : "no");
 		break;
 	case WW_CTX:
@@ -144,7 +144,7 @@ ww_dump(volatile void *cookie)
 		printf_nolog("%-13s: %p\n", "lwp",
 		mutex->wwm_u.ctx->wwx_owner);
 		printf_nolog("%-13s: %s\n", "waiters",
-		cv_has_waiters(__UNVOLATILE(>wwm_cv))
+		cv_has_waiters((void *)(intptr_t)>wwm_cv)
 			? "yes" : "no");
 		break;
 	case WW_WANTOWN:

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:45 UTC 2017

Modified Files:
src/sys/arch/x86/include: lock.h

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/include/lock.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/arch/x86/include/lock.h
diff -u src/sys/arch/x86/include/lock.h:1.27 src/sys/arch/x86/include/lock.h:1.28
--- src/sys/arch/x86/include/lock.h:1.27	Tue Jan 22 17:09:44 2013
+++ src/sys/arch/x86/include/lock.h	Sat Sep 16 19:55:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.27 2013/01/22 22:09:44 christos Exp $	*/
+/*	$NetBSD: lock.h,v 1.28 2017/09/16 23:55:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -39,13 +39,13 @@
 #include 
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_LOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_UNLOCKED;
 }

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:33 UTC 2017

Modified Files:
src/sys/kern: kern_lock.c kern_mutex.c kern_rwlock.c subr_lockdebug.c

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/kern_lock.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_rwlock.c
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/subr_lockdebug.c

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:45 UTC 2017

Modified Files:
src/sys/arch/x86/include: lock.h

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/include/lock.h

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

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:16 UTC 2017

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

Log Message:
more debug info


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/kern_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/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.93 src/sys/kern/kern_event.c:1.94
--- src/sys/kern/kern_event.c:1.93	Sun Jul  2 20:53:33 2017
+++ src/sys/kern/kern_event.c	Sat Sep 16 19:55:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.93 2017/07/03 00:53:33 riastradh Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.94 2017/09/16 23:55:16 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.93 2017/07/03 00:53:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.94 2017/09/16 23:55:16 christos Exp $");
 
 #include 
 #include 
@@ -1089,12 +1089,16 @@ kqueue_register(struct kqueue *kq, struc
 }
 
 #if defined(DEBUG)
+#define KN_FMT(buf, kn) \
+(snprintb((buf), sizeof(buf), __KN_FLAG_BITS, (kn)->kn_status), buf)
+
 static void
-kq_check(struct kqueue *kq)
+kqueue_check(const char *func, size_t line, const struct kqueue *kq)
 {
 	const struct knote *kn;
 	int count;
 	int nmarker;
+	char buf[128];
 
 	KASSERT(mutex_owned(>kq_lock));
 	KASSERT(kq->kq_count >= 0);
@@ -1103,16 +1107,18 @@ kq_check(struct kqueue *kq)
 	nmarker = 0;
 	TAILQ_FOREACH(kn, >kq_head, kn_tqe) {
 		if ((kn->kn_status & (KN_MARKER | KN_QUEUED)) == 0) {
-			panic("%s: kq=%p kn=%p inconsist 1", __func__, kq, kn);
+			panic("%s,%zu: kq=%p kn=%p !(MARKER|QUEUED) %s",
+			func, line, kq, kn, KN_FMT(buf, kn));
 		}
 		if ((kn->kn_status & KN_MARKER) == 0) {
 			if (kn->kn_kq != kq) {
-panic("%s: kq=%p kn=%p inconsist 2",
-__func__, kq, kn);
+panic("%s,%zu: kq=%p kn(%p) != kn->kq(%p): %s",
+func, line, kq, kn, kn->kn_kq,
+KN_FMT(buf, kn));
 			}
 			if ((kn->kn_status & KN_ACTIVE) == 0) {
-panic("%s: kq=%p kn=%p: not active",
-__func__, kq, kn);
+panic("%s,%zu: kq=%p kn=%p: !ACTIVE %s",
+func, line, kq, kn, KN_FMT(buf, kn));
 			}
 			count++;
 			if (count > kq->kq_count) {
@@ -1122,19 +1128,21 @@ kq_check(struct kqueue *kq)
 			nmarker++;
 #if 0
 			if (nmarker > 1) {
-panic("%s: kq=%p too many markers: %d != %d, "
-"nmarker=%d",
-__func__, kq, kq->kq_count, count, nmarker);
+panic("%s,%zu: kq=%p too many markers: "
+"%d != %d, nmarker=%d",
+func, line, kq, kq->kq_count, count,
+nmarker);
 			}
 #endif
 		}
 	}
 	if (kq->kq_count != count) {
 bad:
-		panic("%s: kq=%p inconsist 3: %d != %d, nmarker=%d",
-		__func__, kq, kq->kq_count, count, nmarker);
+		panic("%s,%zu: kq=%p kq->kq_count(%d) != count(%d), nmarker=%d",
+		func, line, kq, kq->kq_count, count, nmarker);
 	}
 }
+#define kq_check(a) kqueue_check(__func__, __LINE__, (a))
 #else /* defined(DEBUG) */
 #define	kq_check(a)	/* nothing */
 #endif /* defined(DEBUG) */

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:33 UTC 2017

Modified Files:
src/sys/kern: kern_lock.c kern_mutex.c kern_rwlock.c subr_lockdebug.c

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/kern_lock.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_rwlock.c
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/subr_lockdebug.c

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

Modified files:

Index: src/sys/kern/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.158 src/sys/kern/kern_lock.c:1.159
--- src/sys/kern/kern_lock.c:1.158	Wed Jan 25 23:11:56 2017
+++ src/sys/kern/kern_lock.c	Sat Sep 16 19:55:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lock.c,v 1.158 2017/01/26 04:11:56 christos Exp $	*/
+/*	$NetBSD: kern_lock.c,v 1.159 2017/09/16 23:55:33 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.158 2017/01/26 04:11:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.159 2017/09/16 23:55:33 christos Exp $");
 
 #include 
 #include 
@@ -113,7 +113,7 @@ do {	\
 #define	_KERNEL_LOCK_ASSERT(cond)	/* nothing */
 #endif
 
-void	_kernel_lock_dump(volatile void *);
+void	_kernel_lock_dump(const volatile void *);
 
 lockops_t _kernel_lock_ops = {
 	"Kernel lock",
@@ -138,7 +138,7 @@ CTASSERT(CACHE_LINE_SIZE >= sizeof(__cpu
  * Print debugging information about the kernel lock.
  */
 void
-_kernel_lock_dump(volatile void *junk)
+_kernel_lock_dump(const volatile void *junk)
 {
 	struct cpu_info *ci = curcpu();
 

Index: src/sys/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.66 src/sys/kern/kern_mutex.c:1.67
--- src/sys/kern/kern_mutex.c:1.66	Sat Sep 16 19:25:34 2017
+++ src/sys/kern/kern_mutex.c	Sat Sep 16 19:55:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_mutex.c,v 1.66 2017/09/16 23:25:34 christos Exp $	*/
+/*	$NetBSD: kern_mutex.c,v 1.67 2017/09/16 23:55:33 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #define	__MUTEX_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.66 2017/09/16 23:25:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.67 2017/09/16 23:55:33 christos Exp $");
 
 #include 
 #include 
@@ -264,8 +264,9 @@ __strong_alias(mutex_spin_enter,mutex_ve
 __strong_alias(mutex_spin_exit,mutex_vector_exit);
 #endif
 
-static void	mutex_abort(const char *, size_t, kmutex_t *, const char *);
-static void	mutex_dump(volatile void *);
+static void	mutex_abort(const char *, size_t, const kmutex_t *,
+const char *);
+static void	mutex_dump(const volatile void *);
 
 lockops_t mutex_spin_lockops = {
 	"Mutex",
@@ -293,9 +294,9 @@ syncobj_t mutex_syncobj = {
  *	Dump the contents of a mutex structure.
  */
 void
-mutex_dump(volatile void *cookie)
+mutex_dump(const volatile void *cookie)
 {
-	volatile kmutex_t *mtx = cookie;
+	const volatile kmutex_t *mtx = cookie;
 
 	printf_nolog("owner field  : %#018lx wait/spin: %16d/%d\n",
 	(long)MUTEX_OWNER(mtx->mtx_owner), MUTEX_HAS_WAITERS(mtx),
@@ -310,7 +311,7 @@ mutex_dump(volatile void *cookie)
  *	we ask the compiler to not inline it.
  */
 void __noinline
-mutex_abort(const char *func, size_t line, kmutex_t *mtx, const char *msg)
+mutex_abort(const char *func, size_t line, const kmutex_t *mtx, const char *msg)
 {
 
 	LOCKDEBUG_ABORT(func, line, mtx, (MUTEX_SPIN_P(mtx) ?

Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.46 src/sys/kern/kern_rwlock.c:1.47
--- src/sys/kern/kern_rwlock.c:1.46	Wed Jan 25 23:11:56 2017
+++ src/sys/kern/kern_rwlock.c	Sat Sep 16 19:55:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rwlock.c,v 1.46 2017/01/26 04:11:56 christos Exp $	*/
+/*	$NetBSD: kern_rwlock.c,v 1.47 2017/09/16 23:55:33 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.46 2017/01/26 04:11:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.47 2017/09/16 23:55:33 christos Exp $");
 
 #define	__RWLOCK_PRIVATE
 
@@ -112,7 +112,7 @@ do {	\
 #endif /* defined(LOCKDEBUG) */
 
 static void	rw_abort(const char *, size_t, krwlock_t *, const char *);
-static void	rw_dump(volatile void *);
+static void	rw_dump(const volatile void *);
 static lwp_t	*rw_owner(wchan_t);
 
 static inline uintptr_t
@@ -167,9 +167,9 @@ syncobj_t rw_syncobj = {
  *	Dump the contents of a rwlock structure.
  */
 static void
-rw_dump(volatile void *cookie)
+rw_dump(const volatile void *cookie)
 {
-	volatile krwlock_t *rw = cookie;
+	const volatile krwlock_t *rw = cookie;
 
 	printf_nolog("owner/count  : %#018lx flags: %#018x\n",
 	(long)RW_OWNER(rw), (int)RW_FLAGS(rw));

Index: 

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:55:16 UTC 2017

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

Log Message:
more debug info


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/kern_event.c

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

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:54:41 UTC 2017

Modified Files:
src/sys/sys: lockdebug.h

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/lockdebug.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/sys/lockdebug.h
diff -u src/sys/sys/lockdebug.h:1.15 src/sys/sys/lockdebug.h:1.16
--- src/sys/sys/lockdebug.h:1.15	Wed Jan 25 23:11:56 2017
+++ src/sys/sys/lockdebug.h	Sat Sep 16 19:54:41 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockdebug.h,v 1.15 2017/01/26 04:11:56 christos Exp $	*/
+/*	$NetBSD: lockdebug.h,v 1.16 2017/09/16 23:54:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -47,14 +47,14 @@
 typedef	struct lockops {
 	const char	*lo_name;
 	int		lo_type;
-	void		(*lo_dump)(volatile void *);
+	void		(*lo_dump)(const volatile void *);
 } lockops_t;
 
 #define	LOCKDEBUG_ABORT(f, ln, l, o, m) \
 lockdebug_abort(f, ln, l, o, m)
 
-void	lockdebug_abort(const char *, size_t, volatile void *, lockops_t *,
-const char *);
+void	lockdebug_abort(const char *, size_t, const volatile void *,
+lockops_t *, const char *);
 
 void	lockdebug_lock_print(void *, void (*)(const char *, ...)
 __printflike(1, 2));
@@ -64,8 +64,8 @@ void	lockdebug_lock_print(void *, void (
 bool	lockdebug_alloc(const char *, size_t, volatile void *, lockops_t *,
 uintptr_t);
 void	lockdebug_free(const char *, size_t, volatile void *);
-void	lockdebug_wantlock(const char *, size_t, volatile void *, uintptr_t,
-int);
+void	lockdebug_wantlock(const char *, size_t, const volatile void *,
+uintptr_t, int);
 void	lockdebug_locked(const char *, size_t, volatile void *, void *,
 uintptr_t, int);
 void	lockdebug_unlocked(const char *, size_t, volatile void *,

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:54:41 UTC 2017

Modified Files:
src/sys/sys: lockdebug.h

Log Message:
more const


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/lockdebug.h

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

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:54:32 UTC 2017

Modified Files:
src/sys/sys: event.h

Log Message:
Add flags bits print


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/event.h

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

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:54:32 UTC 2017

Modified Files:
src/sys/sys: event.h

Log Message:
Add flags bits print


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/event.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/sys/event.h
diff -u src/sys/sys/event.h:1.30 src/sys/sys/event.h:1.31
--- src/sys/sys/event.h:1.30	Sat Jul  1 16:08:56 2017
+++ src/sys/sys/event.h	Sat Sep 16 19:54:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: event.h,v 1.30 2017/07/01 20:08:56 christos Exp $	*/
+/*	$NetBSD: event.h,v 1.31 2017/09/16 23:54:32 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon 
@@ -203,6 +203,15 @@ struct knote {
 #define	KN_MARKER	0x10U			/* is a marker */
 #define	KN_BUSY		0x20U			/* is being scanned */
 /* Toggling KN_BUSY also requires kn_kq->kq_fdp->fd_lock. */
+#define __KN_FLAG_BITS \
+"\20" \
+"\1ACTIVE" \
+"\2QUEUED" \
+"\3DISABLED" \
+"\4DETACHED" \
+"\5MARKER" \
+"\6BUSY"
+
 
 #define	kn_id		kn_kevent.ident
 #define	kn_filter	kn_kevent.filter

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:30:50 UTC 2017

Modified Files:
src/sys/sys: common_lock.h

Log Message:
more const.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/common_lock.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/sys/common_lock.h
diff -u src/sys/sys/common_lock.h:1.1 src/sys/sys/common_lock.h:1.2
--- src/sys/sys/common_lock.h:1.1	Fri Jun 26 10:27:35 2015
+++ src/sys/sys/common_lock.h	Sat Sep 16 19:30:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: common_lock.h,v 1.1 2015/06/26 14:27:35 matt Exp $ */
+/* $NetBSD: common_lock.h,v 1.2 2017/09/16 23:30:50 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,13 +38,13 @@
 #define	_SYS_COMMON_LOCK_H_
 
 static __inline int
-__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_LOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr != __SIMPLELOCK_UNLOCKED;
 }
 
 static __inline int
-__SIMPLELOCK_UNLOCKED_P(__cpu_simple_lock_t *__ptr)
+__SIMPLELOCK_UNLOCKED_P(const __cpu_simple_lock_t *__ptr)
 {
 	return *__ptr == __SIMPLELOCK_UNLOCKED;
 }

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:30:50 UTC 2017

Modified Files:
src/sys/sys: common_lock.h

Log Message:
more const.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/common_lock.h

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

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:25:35 UTC 2017

Modified Files:
src/sys/kern: kern_mutex.c
src/sys/sys: mutex.h

Log Message:
add missing const


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.21 -r1.22 src/sys/sys/mutex.h

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

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 16 23:25:35 UTC 2017

Modified Files:
src/sys/kern: kern_mutex.c
src/sys/sys: mutex.h

Log Message:
add missing const


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.21 -r1.22 src/sys/sys/mutex.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/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.65 src/sys/kern/kern_mutex.c:1.66
--- src/sys/kern/kern_mutex.c:1.65	Mon May  1 17:35:25 2017
+++ src/sys/kern/kern_mutex.c	Sat Sep 16 19:25:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_mutex.c,v 1.65 2017/05/01 21:35:25 pgoyette Exp $	*/
+/*	$NetBSD: kern_mutex.c,v 1.66 2017/09/16 23:25:34 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #define	__MUTEX_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.65 2017/05/01 21:35:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.66 2017/09/16 23:25:34 christos Exp $");
 
 #include 
 #include 
@@ -805,7 +805,7 @@ mutex_wakeup(kmutex_t *mtx)
  *	holds the mutex.
  */
 int
-mutex_owned(kmutex_t *mtx)
+mutex_owned(const kmutex_t *mtx)
 {
 
 	if (mtx == NULL)
@@ -826,7 +826,7 @@ mutex_owned(kmutex_t *mtx)
  *	priority inheritance.
  */
 lwp_t *
-mutex_owner(kmutex_t *mtx)
+mutex_owner(const kmutex_t *mtx)
 {
 
 	MUTEX_ASSERT(mtx, MUTEX_ADAPTIVE_P(mtx));
@@ -841,7 +841,7 @@ mutex_owner(kmutex_t *mtx)
  *	that won't work correctly for spin mutexes.
  */
 int
-mutex_ownable(kmutex_t *mtx)
+mutex_ownable(const kmutex_t *mtx)
 {
 
 #ifdef LOCKDEBUG

Index: src/sys/sys/mutex.h
diff -u src/sys/sys/mutex.h:1.21 src/sys/sys/mutex.h:1.22
--- src/sys/sys/mutex.h:1.21	Mon May  1 17:35:26 2017
+++ src/sys/sys/mutex.h	Sat Sep 16 19:25:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.21 2017/05/01 21:35:26 pgoyette Exp $	*/
+/*	$NetBSD: mutex.h,v 1.22 2017/09/16 23:25:35 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -203,9 +203,9 @@ void	mutex_spin_exit(kmutex_t *);
 
 int	mutex_tryenter(kmutex_t *);
 
-int	mutex_owned(kmutex_t *);
-int	mutex_ownable(kmutex_t *);
-lwp_t	*mutex_owner(kmutex_t *);
+int	mutex_owned(const kmutex_t *);
+int	mutex_ownable(const kmutex_t *);
+lwp_t	*mutex_owner(const kmutex_t *);
 
 void	mutex_obj_init(void);
 kmutex_t *mutex_obj_alloc(kmutex_type_t, int);

Re: CVS commit: src/distrib

[maya]

On Fri, Sep 08, 2017 at 09:50:45AM +, Martin Husemann wrote:
> Introduce CDRELEASE_NODEBUG - if set, avoids putting debug sets in the
> ISO image.
> 
> Set this for sparc64 install CDs - many of the supported machines have
> SCSI CD drives and it is impossible to get DVD replacements for those.
> 
> This is a pitty, but in the end a working install medium is more worth
> than debug sets (which can be downloaded later).

this isn't just a sparc64 issue. I think we should set this for most
archs, possibly all.

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat Sep 16 21:47:02 UTC 2017

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

Log Message:
add ephy clk gate


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c

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

Modified files:

Index: src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
diff -u src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.11 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.12
--- src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.11	Sun Aug 13 19:18:08 2017
+++ src/sys/arch/arm/sunxi/sun8i_h3_ccu.c	Sat Sep 16 21:47:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_h3_ccu.c,v 1.11 2017/08/13 19:18:08 jmcneill Exp $ */
+/* $NetBSD: sun8i_h3_ccu.c,v 1.12 2017/09/16 21:47:02 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,7 +29,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.11 2017/08/13 19:18:08 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.12 2017/09/16 21:47:02 jmcneill Exp $");
 
 #include 
 #include 
@@ -52,6 +52,7 @@ __KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu
 #define	BUS_CLK_GATING_REG0	0x060
 #define	BUS_CLK_GATING_REG2	0x068
 #define	BUS_CLK_GATING_REG3	0x06c
+#define	BUS_CLK_GATING_REG4	0x070
 #define	SDMMC0_CLK_REG		0x088
 #define	SDMMC1_CLK_REG		0x08c
 #define	SDMMC2_CLK_REG		0x090
@@ -359,6 +360,9 @@ static struct sunxi_ccu_clk sun8i_h3_ccu
 	SUNXI_CCU_GATE(H3_CLK_BUS_UART3, "bus-uart3", "apb2",
 	BUS_CLK_GATING_REG3, 19),
 
+	SUNXI_CCU_GATE(H3_CLK_BUS_EPHY, "bus-ephy", "ahb1",
+	BUS_CLK_GATING_REG4, 0),
+
 	SUNXI_CCU_GATE(H3_CLK_USBPHY0, "usb-phy0", "hosc",
 	USBPHY_CFG_REG, 8),
 	SUNXI_CCU_GATE(H3_CLK_USBPHY1, "usb-phy1", "hosc",

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sat Sep 16 21:47:02 UTC 2017

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

Log Message:
add ephy clk gate


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c

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

CVS commit: src/lib/libedit

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Sat Sep 16 20:40:35 UTC 2017

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

Log Message:
Fix indentation (convert spaces to tab)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/filecomplete.c

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

Modified files:

Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.45 src/lib/libedit/filecomplete.c:1.46
--- src/lib/libedit/filecomplete.c:1.45	Fri Apr 21 05:38:03 2017
+++ src/lib/libedit/filecomplete.c	Sat Sep 16 20:40:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.45 2017/04/21 05:38:03 abhinav Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.46 2017/09/16 20:40:34 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.45 2017/04/21 05:38:03 abhinav Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.46 2017/09/16 20:40:34 abhinav Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -420,7 +420,7 @@ fn_complete(EditLine *el,
 {
 	const LineInfoW *li;
 	wchar_t *temp;
-char **matches;
+	char **matches;
 	const wchar_t *ctemp;
 	size_t len;
 	int what_to_do = '\t';

CVS commit: src/lib/libedit

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Sat Sep 16 20:40:35 UTC 2017

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

Log Message:
Fix indentation (convert spaces to tab)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/filecomplete.c

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

CVS commit: src/sys/arch

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Sep 16 09:28:38 UTC 2017

Modified Files:
src/sys/arch/x86/include: cpu.h
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
Move xpq_idx into cpu_info, to prevent false sharing between CPUs. Saves
10s when doing a './build.sh -j 3 kernel=GENERIC' on xen-amd64-domU.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/xen/x86/x86_xpmap.c

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

CVS commit: src/sys/arch

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Sep 16 09:28:38 UTC 2017

Modified Files:
src/sys/arch/x86/include: cpu.h
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
Move xpq_idx into cpu_info, to prevent false sharing between CPUs. Saves
10s when doing a './build.sh -j 3 kernel=GENERIC' on xen-amd64-domU.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/xen/x86/x86_xpmap.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/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.78 src/sys/arch/x86/include/cpu.h:1.79
--- src/sys/arch/x86/include/cpu.h:1.78	Sun Aug 27 09:32:13 2017
+++ src/sys/arch/x86/include/cpu.h	Sat Sep 16 09:28:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.78 2017/08/27 09:32:13 maxv Exp $	*/
+/*	$NetBSD: cpu.h,v 1.79 2017/09/16 09:28:38 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -205,6 +205,10 @@ struct cpu_info {
 #endif /* __x86_64__ */
 #endif /* XEN et.al */
 
+#ifdef XEN
+	size_t		ci_xpq_idx;
+#endif
+
 #ifndef XEN
 	struct evcnt ci_ipi_events[X86_NIPI];
 #else   /* XEN */

Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.73 src/sys/arch/xen/x86/x86_xpmap.c:1.74
--- src/sys/arch/xen/x86/x86_xpmap.c:1.73	Sat Mar 18 13:35:57 2017
+++ src/sys/arch/xen/x86/x86_xpmap.c	Sat Sep 16 09:28:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_xpmap.c,v 1.73 2017/03/18 13:35:57 maxv Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.74 2017/09/16 09:28:38 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.73 2017/03/18 13:35:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.74 2017/09/16 09:28:38 maxv Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -134,7 +134,6 @@ pt_entry_t xpmap_pg_nx __read_mostly;
 
 #define XPQUEUE_SIZE 2048
 static mmu_update_t xpq_queue_array[MAXCPUS][XPQUEUE_SIZE];
-static int xpq_idx_array[MAXCPUS];
 
 void xen_failsafe_handler(void);
 
@@ -196,16 +195,17 @@ void
 xpq_flush_queue(void)
 {
 	mmu_update_t *xpq_queue;
-	int done = 0, ret, xpq_idx;
+	int done = 0, ret;
+	size_t xpq_idx;
 
-	xpq_idx = xpq_idx_array[curcpu()->ci_cpuid];
+	xpq_idx = curcpu()->ci_xpq_idx;
 	xpq_queue = xpq_queue_array[curcpu()->ci_cpuid];
 
 retry:
 	ret = HYPERVISOR_mmu_update(xpq_queue, xpq_idx, , DOMID_SELF);
 
 	if (ret < 0 && xpq_idx != 0) {
-		printf("xpq_flush_queue: %d entries (%d successful) on "
+		printf("xpq_flush_queue: %zu entries (%d successful) on "
 		"cpu%d (%ld)\n",
 		xpq_idx, done, curcpu()->ci_index, curcpu()->ci_cpuid);
 
@@ -218,14 +218,14 @@ retry:
 
 		panic("HYPERVISOR_mmu_update failed, ret: %d\n", ret);
 	}
-	xpq_idx_array[curcpu()->ci_cpuid] = 0;
+	curcpu()->ci_xpq_idx = 0;
 }
 
 static inline void
 xpq_increment_idx(void)
 {
 
-	if (__predict_false(++xpq_idx_array[curcpu()->ci_cpuid] == XPQUEUE_SIZE))
+	if (__predict_false(++curcpu()->ci_xpq_idx == XPQUEUE_SIZE))
 		xpq_flush_queue();
 }
 
@@ -233,7 +233,7 @@ void
 xpq_queue_machphys_update(paddr_t ma, paddr_t pa)
 {
 	mmu_update_t *xpq_queue = xpq_queue_array[curcpu()->ci_cpuid];
-	int xpq_idx = xpq_idx_array[curcpu()->ci_cpuid];
+	size_t xpq_idx = curcpu()->ci_xpq_idx;
 
 	xpq_queue[xpq_idx].ptr = ma | MMU_MACHPHYS_UPDATE;
 	xpq_queue[xpq_idx].val = pa >> PAGE_SHIFT;
@@ -244,7 +244,7 @@ void
 xpq_queue_pte_update(paddr_t ptr, pt_entry_t val)
 {
 	mmu_update_t *xpq_queue = xpq_queue_array[curcpu()->ci_cpuid];
-	int xpq_idx = xpq_idx_array[curcpu()->ci_cpuid];
+	size_t xpq_idx = curcpu()->ci_xpq_idx;
 
 	xpq_queue[xpq_idx].ptr = ptr | MMU_NORMAL_PT_UPDATE;
 	xpq_queue[xpq_idx].val = val;
@@ -490,8 +490,6 @@ xen_locore(void)
 
 	xen_init_features();
 
-	memset(xpq_idx_array, 0, sizeof(xpq_idx_array));
-
 	xpmap_phys_to_machine_mapping =
 	(unsigned long *)xen_start_info.mfn_list;
 

CVS commit: src/sys/compat/svr4

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:05:29 UTC 2017

Modified Files:
src/sys/compat/svr4: svr4_stream.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/compat/svr4/svr4_stream.c

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

CVS commit: src/sys/compat/svr4

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:05:29 UTC 2017

Modified Files:
src/sys/compat/svr4: svr4_stream.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/compat/svr4/svr4_stream.c

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

Modified files:

Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.91 src/sys/compat/svr4/svr4_stream.c:1.92
--- src/sys/compat/svr4/svr4_stream.c:1.91	Fri Jul 28 17:52:47 2017
+++ src/sys/compat/svr4/svr4_stream.c	Sat Sep 16 09:05:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_stream.c,v 1.91 2017/07/28 17:52:47 riastradh Exp $	 */
+/*	$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.91 2017/07/28 17:52:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $");
 
 #include 
 #include 
@@ -201,9 +201,10 @@ show_ioc(const char *str, struct svr4_st
 
 	ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
 	uprintf("%s cmd = %ld, timeout = %d, len = %d, buf = %p { ",
-	str, ioc->cmd, ioc->timeout, ioc->len, ioc->buf);
+	str, (long)ioc->cmd, ioc->timeout, ioc->len,
+	NETBSD32PTR(ioc->buf));
 
-	if ((error = copyin(ioc->buf, ptr, len)) != 0) {
+	if ((error = copyin(NETBSD32PTR(ioc->buf), ptr, len)) != 0) {
 		free((char *) ptr, M_TEMP);
 		return error;
 	}
@@ -237,13 +238,14 @@ show_strbuf(struct svr4_strbuf *str)
 	if (len > 0) {
 	ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
 
-	if ((error = copyin(str->buf, ptr, len)) != 0) {
+	if ((error = copyin(NETBSD32PTR(str->buf), ptr, len)) != 0) {
 		free((char *) ptr, M_TEMP);
 		return error;
 	}
 	}
 
-	uprintf(", { %d, %d, %p=[ ", str->maxlen, str->len, str->buf);
+	uprintf(", { %d, %d, %p=[ ", str->maxlen, str->len,
+	NETBSD32PTR(str->buf));
 
 	if (ptr)
 		bufprint(ptr, len);
@@ -353,7 +355,7 @@ sockaddr_to_netaddr_in(struct svr4_strmc
 	na->port = sain->sin_port;
 	na->addr = sain->sin_addr.s_addr;
 	DPRINTF(("sockaddr_in -> netaddr %d %d %lx\n", na->family, na->port,
-		 na->addr));
+		 (unsigned long)na->addr));
 }
 
 
@@ -540,7 +542,7 @@ si_listen(file_t *fp, int fd, struct svr
 		return EINVAL;
 
 	if (lst.cmd != SVR4_TI_OLD_BIND_REQUEST) {
-		DPRINTF(("si_listen: bad request %ld\n", lst.cmd));
+		DPRINTF(("si_listen: bad request %ld\n", (long)lst.cmd));
 		return EINVAL;
 	}
 
@@ -707,7 +709,8 @@ sockmod(file_t *fp, int fd, struct svr4_
 		return si_getudata(fp, fd, ioc, l);
 
 	default:
-		DPRINTF(("Unknown sockmod ioctl %lx\n", ioc->cmd));
+		DPRINTF(("Unknown sockmod ioctl %lx\n",
+		(unsigned long)ioc->cmd));
 		return 0;
 
 	}
@@ -779,7 +782,7 @@ ti_bind(file_t *fp, int fd, struct svr4_
 		return error;
 
 	if (bnd.cmd != SVR4_TI_OLD_BIND_REQUEST) {
-		DPRINTF(("ti_bind: bad request %ld\n", bnd.cmd));
+		DPRINTF(("ti_bind: bad request %ld\n", (long)bnd.cmd));
 		return EINVAL;
 	}
 	if (bnd.offs < 0 ||
@@ -880,7 +883,7 @@ timod(file_t *fp, int fd, struct svr4_st
 		return 0;
 
 	default:
-		DPRINTF(("Unknown timod ioctl %lx\n", ioc->cmd));
+		DPRINTF(("Unknown timod ioctl %lx\n", (unsigned long)ioc->cmd));
 		return 0;
 	}
 }
@@ -1400,8 +1403,8 @@ svr4_sys_putmsg(struct lwp *l, const str
 
 
 #ifdef DEBUG_SVR4
-	show_msg(">putmsg", SCARG(uap, fd), SCARG(uap, ctl),
-		 SCARG(uap, dat), SCARG(uap, flags));
+	show_msg(">putmsg", SCARG(uap, fd), NETBSD32PTR(SCARG(uap, ctl)),
+		 NETBSD32PTR(SCARG(uap, dat)), SCARG(uap, flags));
 #endif /* DEBUG_SVR4 */
 
 	if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
@@ -1476,7 +1479,8 @@ svr4_sys_putmsg(struct lwp *l, const str
 goto out;
 			}
 #endif
-	DPRINTF(("putmsg: Invalid inet length %ld\n", sc.len));
+	DPRINTF(("putmsg: Invalid inet length %ld\n",
+			(long)sc.len));
 			error = EINVAL;
 			goto out;
 		}
@@ -1541,7 +1545,8 @@ svr4_sys_putmsg(struct lwp *l, const str
 		*retval = 0;
 		return error;
 	default:
-		DPRINTF(("putmsg: Unimplemented command %lx\n", sc.cmd));
+		DPRINTF(("putmsg: Unimplemented command %lx\n",
+		(unsigned long)sc.cmd));
 		error = ENOSYS;
 		goto out;
 	}
@@ -1571,8 +1576,8 @@ svr4_sys_getmsg(struct lwp *l, const str
 	memset(, 0, sizeof(sc));
 
 #ifdef DEBUG_SVR4
-	show_msg(">getmsg", SCARG(uap, fd), SCARG(uap, ctl),
-		 SCARG(uap, dat), 0);
+	show_msg(">getmsg", SCARG(uap, fd), NETBSD32PTR(SCARG(uap, ctl)),
+		 NETBSD32PTR(SCARG(uap, dat)), 0);
 #endif /* DEBUG_SVR4 */
 
 	if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
@@ -1869,8 +1874,8 @@ svr4_sys_getmsg(struct lwp *l, const str
 	*retval = 0;
 
 #ifdef DEBUG_SVR4
-	show_msg("

CVS commit: src/sys/arch/sparc64/sparc64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:05:07 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64: svr4_machdep.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/sparc64/svr4_machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/svr4_machdep.c
diff -u src/sys/arch/sparc64/sparc64/svr4_machdep.c:1.55 src/sys/arch/sparc64/sparc64/svr4_machdep.c:1.56
--- src/sys/arch/sparc64/sparc64/svr4_machdep.c:1.55	Fri Mar  4 22:25:29 2011
+++ src/sys/arch/sparc64/sparc64/svr4_machdep.c	Sat Sep 16 09:05:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.55 2011/03/04 22:25:29 joerg Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.56 2017/09/16 09:05:07 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.55 2011/03/04 22:25:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.56 2017/09/16 09:05:07 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -236,7 +236,7 @@ svr4_setmcontext(struct lwp *l, struct s
 #endif
 
 #ifdef DEBUG_SVR4
-	svr4_printmcontext("setmcontext", uc);
+	svr4_printmcontext("setmcontext", mc);
 #endif
 
 	write_user_windows();

CVS commit: src/sys/compat/svr4_32

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:04:50 UTC 2017

Modified Files:
src/sys/compat/svr4_32: svr4_32_ioctl.c svr4_32_misc.c svr4_32_signal.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/svr4_32/svr4_32_ioctl.c
cvs rdiff -u -r1.78 -r1.79 src/sys/compat/svr4_32/svr4_32_misc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/svr4_32/svr4_32_signal.c

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

Modified files:

Index: src/sys/compat/svr4_32/svr4_32_ioctl.c
diff -u src/sys/compat/svr4_32/svr4_32_ioctl.c:1.22 src/sys/compat/svr4_32/svr4_32_ioctl.c:1.23
--- src/sys/compat/svr4_32/svr4_32_ioctl.c:1.22	Sat Mar 14 21:04:19 2009
+++ src/sys/compat/svr4_32/svr4_32_ioctl.c	Sat Sep 16 09:04:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_ioctl.c,v 1.22 2009/03/14 21:04:19 dsl Exp $	 */
+/*	$NetBSD: svr4_32_ioctl.c,v 1.23 2017/09/16 09:04:50 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.22 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.23 2017/09/16 09:04:50 martin Exp $");
 
 #include 
 #include 
@@ -103,8 +103,8 @@ svr4_32_sys_ioctl(struct lwp *l, const s
 
 	svr4_32_decode_cmd(SCARG(uap, com), dir, , , );
 
-	uprintf("svr4_32_ioctl(%d, _IO%s(%c, %d, %d), %#x);\n", SCARG(uap, fd),
-	dir, c, num, argsiz, SCARG(uap, data));
+	uprintf("svr4_32_ioctl(%d, _IO%s(%c, %d, %d), %p);\n", SCARG(uap, fd),
+	dir, c, num, argsiz, NETBSD32PTR64(SCARG(uap, data)));
 #endif
 	cmd = SCARG(uap, com);
 

Index: src/sys/compat/svr4_32/svr4_32_misc.c
diff -u src/sys/compat/svr4_32/svr4_32_misc.c:1.78 src/sys/compat/svr4_32/svr4_32_misc.c:1.79
--- src/sys/compat/svr4_32/svr4_32_misc.c:1.78	Fri Jul 28 15:34:07 2017
+++ src/sys/compat/svr4_32/svr4_32_misc.c	Sat Sep 16 09:04:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_misc.c,v 1.78 2017/07/28 15:34:07 riastradh Exp $	 */
+/*	$NetBSD: svr4_32_misc.c,v 1.79 2017/09/16 09:04:50 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.78 2017/07/28 15:34:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.79 2017/09/16 09:04:50 martin Exp $");
 
 #include 
 #include 
@@ -1012,7 +1012,8 @@ svr4_32_setinfo(int pid, struct rusage *
 	}
 
 	DPRINTF(("siginfo [pid %ld signo %d code %d errno %d status %d]\n",
-		 i.si_pid, i.si_signo, i.si_code, i.si_errno, i.si_status));
+		 (long)i.si_pid, i.si_signo, i.si_code, i.si_errno,
+		 i.si_status));
 
 	return copyout(, s, sizeof(i));
 }
@@ -1043,7 +1044,7 @@ svr4_32_sys_waitsys(struct lwp *l, const
 
 	DPRINTF(("waitsys(%d, %d, %p, %x)\n",
 	 SCARG(uap, grp), id,
-		 SCARG(uap, info), SCARG(uap, options)));
+		 NETBSD32PTR64(SCARG(uap, info)), SCARG(uap, options)));
 
 	/* Translate options */
 	options = 0;

Index: src/sys/compat/svr4_32/svr4_32_signal.c
diff -u src/sys/compat/svr4_32/svr4_32_signal.c:1.30 src/sys/compat/svr4_32/svr4_32_signal.c:1.31
--- src/sys/compat/svr4_32/svr4_32_signal.c:1.30	Sun Jul 30 12:31:46 2017
+++ src/sys/compat/svr4_32/svr4_32_signal.c	Sat Sep 16 09:04:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.30 2017/07/30 12:31:46 christos Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.31 2017/09/16 09:04:50 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.30 2017/07/30 12:31:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.31 2017/09/16 09:04:50 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_svr4.h"
@@ -651,12 +651,12 @@ svr4_32_sys_context(struct lwp *l, const
 
 	switch (SCARG(uap, func)) {
 	case SVR4_GETCONTEXT:
-		DPRINTF(("getcontext(%p)\n", SCARG(uap, uc)));
+		DPRINTF(("getcontext(%p)\n", NETBSD32PTR64(SCARG(uap, uc;
 		svr4_32_getcontext(l, , >l_sigmask);
 		return copyout(, SCARG_P32(uap, uc), sizeof(uc));
 
 	case SVR4_SETCONTEXT:
-		DPRINTF(("setcontext(%p)\n", SCARG(uap, uc)));
+		DPRINTF(("setcontext(%p)\n", NETBSD32PTR64(SCARG(uap, uc;
 		if (!SCARG_P32(uap, uc))
 			exit1(l, 0, 0);
 		else if ((error = copyin(SCARG_P32(uap, uc),
@@ -667,7 +667,7 @@ svr4_32_sys_context(struct lwp *l, const
 
 	default:
 		DPRINTF(("context(%d, %p)\n", SCARG(uap, func),
-		SCARG(uap, uc)));
+		NETBSD32PTR64(SCARG(uap, uc;
 		return ENOSYS;
 	}
 	return 0;

CVS commit: src/sys/arch/sparc64/sparc64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:05:07 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64: svr4_machdep.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/sparc64/svr4_machdep.c

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

CVS commit: src/sys/compat/svr4_32

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 09:04:50 UTC 2017

Modified Files:
src/sys/compat/svr4_32: svr4_32_ioctl.c svr4_32_misc.c svr4_32_signal.c

Log Message:
Make debug code compile


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/svr4_32/svr4_32_ioctl.c
cvs rdiff -u -r1.78 -r1.79 src/sys/compat/svr4_32/svr4_32_misc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/svr4_32/svr4_32_signal.c

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

CVS commit: src/sys/arch/sparc64/sparc64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 08:46:06 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64: svr4_32_machdep.c

Log Message:
Redo previous with the proper macros


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc64/sparc64/svr4_32_machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/svr4_32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/svr4_32_machdep.c:1.40 src/sys/arch/sparc64/sparc64/svr4_32_machdep.c:1.41
--- src/sys/arch/sparc64/sparc64/svr4_32_machdep.c:1.40	Fri Sep 15 18:28:53 2017
+++ src/sys/arch/sparc64/sparc64/svr4_32_machdep.c	Sat Sep 16 08:46:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_machdep.c,v 1.40 2017/09/15 18:28:53 martin Exp $	 */
+/*	$NetBSD: svr4_32_machdep.c,v 1.41 2017/09/16 08:46:06 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.40 2017/09/15 18:28:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.41 2017/09/16 08:46:06 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -503,9 +503,9 @@ svr4_32_sendsig(const ksiginfo_t *ksi, c
 	NETBSD32PTR32(frame.sf_ucp, >sf_uc);
 	frame.sf_handler = catcher;
 
-	DPRINTF(("svr4_32_sendsig signum=%d si = %x uc = %x handler = %p\n",
-	 frame.sf_signum, frame.sf_sip.i32,
-		 frame.sf_ucp.i32, frame.sf_handler));
+	DPRINTF(("svr4_32_sendsig signum=%d si = %p uc = %p handler = %p\n",
+	 frame.sf_signum, NETBSD32PTR64(frame.sf_sip),
+		 NETBSD32PTR64(frame.sf_ucp), frame.sf_handler));
 	/*
 	 * Modify the signal context to be used by sigreturn.
 	 */

CVS commit: src/sys/arch/sparc64/sparc64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Sep 16 08:46:06 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64: svr4_32_machdep.c

Log Message:
Redo previous with the proper macros


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc64/sparc64/svr4_32_machdep.c

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