CVS commit: src/tools/xz-include

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Sep 25 17:57:33 UTC 2018

Modified Files:
src/tools/xz-include: Makefile.inc

Log Message:
Add CPPFLAGS+= -std=c99 so tools can build on systems where the
system compiler doesn't default to C99 (eg, NetBSD 6.1).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/xz-include/Makefile.inc

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

CVS commit: src/tools/xz-include

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Sep 25 17:57:33 UTC 2018

Modified Files:
src/tools/xz-include: Makefile.inc

Log Message:
Add CPPFLAGS+= -std=c99 so tools can build on systems where the
system compiler doesn't default to C99 (eg, NetBSD 6.1).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/xz-include/Makefile.inc

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

Modified files:

Index: src/tools/xz-include/Makefile.inc
diff -u src/tools/xz-include/Makefile.inc:1.1 src/tools/xz-include/Makefile.inc:1.2
--- src/tools/xz-include/Makefile.inc:1.1	Tue Sep 25 08:54:58 2018
+++ src/tools/xz-include/Makefile.inc	Tue Sep 25 17:57:33 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 2018/09/25 08:54:58 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2018/09/25 17:57:33 riz Exp $
 
 XZ_TOPLEVEL:=	${.PARSEDIR}/../../external/public-domain/xz
 
@@ -6,4 +6,6 @@ NOMAN=  # defined
 MKREPRO=no	# Native toolchain might be unable to do it
 MKNLS=no
 
+CPPFLAGS+=	-std=c99
+
 .include "${XZ_TOPLEVEL}/Makefile.inc"

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Feb  6 16:56:23 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Don't test dtrace-related variables until after they've been set.


To generate a diff of this commit:
cvs rdiff -u -r1.896 -r1.897 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.896 src/share/mk/bsd.own.mk:1.897
--- src/share/mk/bsd.own.mk:1.896	Wed Feb  3 15:28:02 2016
+++ src/share/mk/bsd.own.mk	Sat Feb  6 16:56:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.896 2016/02/03 15:28:02 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.897 2016/02/06 16:56:23 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -351,6 +351,7 @@ TOOL_CONFIG=		${TOOLDIR}/bin/${_TOOL_PRE
 TOOL_CRUNCHGEN=		MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
 TOOL_CTAGS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
 TOOL_CTFCONVERT=	${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
+TOOL_CTFDUMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfdump
 TOOL_CTFMERGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
 TOOL_CVSLATEST=		${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
 TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
@@ -463,6 +464,7 @@ TOOL_CONFIG=		config
 TOOL_CRUNCHGEN=		crunchgen
 TOOL_CTAGS=		ctags
 TOOL_CTFCONVERT=	ctfconvert
+TOOL_CTFDUMP=		ctfdump
 TOOL_CTFMERGE=		ctfmerge
 TOOL_CVSLATEST=		cvslatest
 TOOL_DB=		db
@@ -567,12 +569,6 @@ CXX=		${TOOL_CXX.${ACTIVE_CXX}}
 FC=		${TOOL_FC.${ACTIVE_FC}}
 OBJC=		${TOOL_OBJC.${ACTIVE_OBJC}}
 
-# Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
-CTFCONVERT=	${TOOL_CTFCONVERT}
-CTFMERGE=	${TOOL_CTFMERGE}
-.endif
-
 # For each ${MACHINE_CPU}, list the ports that use it.
 MACHINES.aarch64=	evbarm64
 MACHINES.alpha=		alpha
@@ -1477,4 +1473,10 @@ TARGETS+=	lintmanpages
 
 TESTSBASE=	/usr/tests${MLIBDIR:D/${MLIBDIR}}
 
+# Override with tools versions if needed
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
+CTFCONVERT=	${TOOL_CTFCONVERT}
+CTFMERGE=	${TOOL_CTFMERGE}
+.endif
+
 .endif	# !defined(_BSD_OWN_MK_)

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Feb  6 16:56:23 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Don't test dtrace-related variables until after they've been set.


To generate a diff of this commit:
cvs rdiff -u -r1.896 -r1.897 src/share/mk/bsd.own.mk

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

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Feb  6 16:58:31 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Back out unintended changes committed with last.


To generate a diff of this commit:
cvs rdiff -u -r1.897 -r1.898 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.897 src/share/mk/bsd.own.mk:1.898
--- src/share/mk/bsd.own.mk:1.897	Sat Feb  6 16:56:23 2016
+++ src/share/mk/bsd.own.mk	Sat Feb  6 16:58:31 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.897 2016/02/06 16:56:23 riz Exp $
+#	$NetBSD: bsd.own.mk,v 1.898 2016/02/06 16:58:31 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -351,7 +351,6 @@ TOOL_CONFIG=		${TOOLDIR}/bin/${_TOOL_PRE
 TOOL_CRUNCHGEN=		MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
 TOOL_CTAGS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
 TOOL_CTFCONVERT=	${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
-TOOL_CTFDUMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfdump
 TOOL_CTFMERGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
 TOOL_CVSLATEST=		${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
 TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
@@ -464,7 +463,6 @@ TOOL_CONFIG=		config
 TOOL_CRUNCHGEN=		crunchgen
 TOOL_CTAGS=		ctags
 TOOL_CTFCONVERT=	ctfconvert
-TOOL_CTFDUMP=		ctfdump
 TOOL_CTFMERGE=		ctfmerge
 TOOL_CVSLATEST=		cvslatest
 TOOL_DB=		db

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Feb  6 16:58:31 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Back out unintended changes committed with last.


To generate a diff of this commit:
cvs rdiff -u -r1.897 -r1.898 src/share/mk/bsd.own.mk

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

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Feb  3 17:50:13 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c

Log Message:
Adapt getmajor and getminor signatures for NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.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/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.8 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.9
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.8	Wed Oct  7 00:34:37 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c	Wed Feb  3 17:50:12 2016
@@ -277,10 +277,10 @@ static const dt_ident_t _dtrace_globals[
 	DT_VERS_1_2, _idops_func, "_symaddr(uintptr_t)" },
 { "getmajor", DT_IDENT_FUNC, 0, DIF_SUBR_GETMAJOR,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
-	_idops_func, "genunix`major_t(genunix`dev_t)" },
+	_idops_func, "netbsd`__devmajor_t(netbsd`dev_t)" },
 { "getminor", DT_IDENT_FUNC, 0, DIF_SUBR_GETMINOR,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
-	_idops_func, "genunix`minor_t(genunix`dev_t)" },
+	_idops_func, "netbsd`__devminor_t(netbsd`dev_t)" },
 { "htonl", DT_IDENT_FUNC, 0, DIF_SUBR_HTONL, DT_ATTR_EVOLCMN, DT_VERS_1_3,
 	_idops_func, "uint32_t(uint32_t)" },
 { "htonll", DT_IDENT_FUNC, 0, DIF_SUBR_HTONLL, DT_ATTR_EVOLCMN, DT_VERS_1_3,

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Feb  3 17:50:13 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c

Log Message:
Adapt getmajor and getminor signatures for NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.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

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Feb  1 05:05:44 UTC 2016

Modified Files:
src/sys/kern: subr_devsw.c vfs_bio.c

Log Message:
Implement the 'io' provider for DTrace.  From riastradh@, with
fixes from me.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/subr_devsw.c
cvs rdiff -u -r1.258 -r1.259 src/sys/kern/vfs_bio.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_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.33 src/sys/kern/subr_devsw.c:1.34
--- src/sys/kern/subr_devsw.c:1.33	Fri Sep  5 05:57:21 2014
+++ src/sys/kern/subr_devsw.c	Mon Feb  1 05:05:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $	*/
+/*	$NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#endif
 
 #include 
 #include 
@@ -80,6 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_devsw.c
 #include 
 #include 
 #include 
+#include 
 
 #ifdef DEVSW_DEBUG
 #define	DPRINTF(x)	printf x
@@ -730,12 +735,17 @@ bdev_close(dev_t dev, int flag, int devt
 	return rv;
 }
 
+SDT_PROVIDER_DECLARE(io);
+SDT_PROBE_DEFINE1(io, kernel, , start, "struct buf *"/*bp*/);
+
 void
 bdev_strategy(struct buf *bp)
 {
 	const struct bdevsw *d;
 	int mpflag;
 
+	SDT_PROBE1(io, kernel, , start, bp);
+
 	if ((d = bdevsw_lookup(bp->b_dev)) == NULL) {
 		bp->b_error = ENXIO;
 		bp->b_resid = bp->b_bcount;

Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.258 src/sys/kern/vfs_bio.c:1.259
--- src/sys/kern/vfs_bio.c:1.258	Mon Jan 11 01:22:36 2016
+++ src/sys/kern/vfs_bio.c	Mon Feb  1 05:05:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $	*/
+/*	$NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,10 +123,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bufcache.h"
+#include "opt_dtrace.h"
 #endif
 
 #include 
@@ -146,6 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 
 #include 
 #include 
 #include 
+#include 
 
 #include 	/* extern struct uvm uvm */
 
@@ -1474,6 +1476,11 @@ buf_drain(int n)
 	return size;
 }
 
+SDT_PROVIDER_DEFINE(io);
+
+SDT_PROBE_DEFINE1(io, kernel, , wait__start, "struct buf *"/*bp*/);
+SDT_PROBE_DEFINE1(io, kernel, , wait__done, "struct buf *"/*bp*/);
+
 /*
  * Wait for operations on the buffer to complete.
  * When they do, extract and return the I/O's error value.
@@ -1485,11 +1492,15 @@ biowait(buf_t *bp)
 	KASSERT(ISSET(bp->b_cflags, BC_BUSY));
 	KASSERT(bp->b_refcnt > 0);
 
+	SDT_PROBE1(io, kernel, , wait__start, bp);
+
 	mutex_enter(bp->b_objlock);
 	while (!ISSET(bp->b_oflags, BO_DONE | BO_DELWRI))
 		cv_wait(>b_done, bp->b_objlock);
 	mutex_exit(bp->b_objlock);
 
+	SDT_PROBE1(io, kernel, , wait__done, bp);
+
 	return bp->b_error;
 }
 
@@ -1528,11 +1539,15 @@ biodone(buf_t *bp)
 	}
 }
 
+SDT_PROBE_DEFINE1(io, kernel, , done, "struct buf *"/*bp*/);
+
 static void
 biodone2(buf_t *bp)
 {
 	void (*callout)(buf_t *);
 
+	SDT_PROBE1(io, kernel, ,done, bp);
+
 	mutex_enter(bp->b_objlock);
 	/* Note that the transfer is done. */
 	if (ISSET(bp->b_oflags, BO_DONE))

CVS commit: src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Feb  1 05:05:44 UTC 2016

Modified Files:
src/sys/kern: subr_devsw.c vfs_bio.c

Log Message:
Implement the 'io' provider for DTrace.  From riastradh@, with
fixes from me.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/subr_devsw.c
cvs rdiff -u -r1.258 -r1.259 src/sys/kern/vfs_bio.c

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

CVS commit: src/etc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jan 28 19:06:39 UTC 2016

Modified Files:
src/etc: MAKEDEV.tmpl

Log Message:
Create dtrace device as part of "all"


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/etc/MAKEDEV.tmpl

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

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.178 src/etc/MAKEDEV.tmpl:1.179
--- src/etc/MAKEDEV.tmpl:1.178	Sun Jan 17 23:18:18 2016
+++ src/etc/MAKEDEV.tmpl	Thu Jan 28 19:06:39 2016
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.178 2016/01/17 23:18:18 christos Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.179 2016/01/28 19:06:39 riz Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -842,6 +842,7 @@ all)
 	makedev zfs
 	makedev lua
 	makedev hdmicec0
+	makedev dtrace
 	makedev local # do this last
 	;;
 

CVS commit: src/etc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jan 28 19:06:39 UTC 2016

Modified Files:
src/etc: MAKEDEV.tmpl

Log Message:
Create dtrace device as part of "all"


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/etc/MAKEDEV.tmpl

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

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Jan 27 19:24:30 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo [netbsd-7]:
nouveau_engine_fifo_nvc0.c nouveau_engine_fifo_nve0.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1079):

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c:
 revision 1.6

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c:
 revision 1.5
don't try to wait if (cold), spin waiting for registers to clear.
same as in nouveau_engine_fifo_nve0.c 1.5.  should fix PR#50362.
minor re-format of the previous.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c
cvs rdiff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c

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

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Jan 27 19:24:30 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo [netbsd-7]:
nouveau_engine_fifo_nvc0.c nouveau_engine_fifo_nve0.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1079):

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c:
 revision 1.6

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c:
 revision 1.5
don't try to wait if (cold), spin waiting for registers to clear.
same as in nouveau_engine_fifo_nve0.c 1.5.  should fix PR#50362.
minor re-format of the previous.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c
cvs rdiff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.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/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c:1.1.1.1.4.2 src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c:1.1.1.1.4.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c:1.1.1.1.4.2	Fri Mar  6 21:39:09 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c	Wed Jan 27 19:24:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.1.1.1.4.2 2015/03/06 21:39:09 snj Exp $	*/
+/*	$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.1.1.1.4.3 2016/01/27 19:24:30 riz Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.1.1.1.4.2 2015/03/06 21:39:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.1.1.1.4.3 2016/01/27 19:24:30 riz Exp $");
 
 #include 
 #include 
@@ -115,17 +115,26 @@ nvc0_fifo_runlist_update(struct nvc0_fif
 	nv_wr32(priv, 0x002274, 0x01f0 | (p >> 3));
 
 #ifdef __NetBSD__
-{
-	int ret;
+	if (cold) {
+		uint count = 2000;
+		while (count-- > 0) {
+			if (!(nv_rd32(priv, 0x00227c) & 0x0010))
+break;
+			delay(1000);
+		}
+		if (count == 0)
+			nv_error(priv, "runlist update timeout\n");
+	} else {
+		int ret;
 
-	spin_lock(>runlist.lock);
-	DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, >runlist.wait,
-	>runlist.lock, msecs_to_jiffies(2000),
-	!(nv_rd32(priv, 0x00227c) & 0x0010));
-	if (ret == 0)
-		nv_error(priv, "runlist update timeout\n");
-	spin_unlock(>runlist.lock);
-}
+		spin_lock(>runlist.lock);
+		DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, >runlist.wait,
+		>runlist.lock, msecs_to_jiffies(2000),
+		!(nv_rd32(priv, 0x00227c) & 0x0010));
+		if (ret == 0)
+			nv_error(priv, "runlist update timeout\n");
+		spin_unlock(>runlist.lock);
+	}
 #else
 	if (wait_event_timeout(priv->runlist.wait,
 			   !(nv_rd32(priv, 0x00227c) & 0x0010),

Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c:1.1.1.1.4.3 src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c:1.1.1.1.4.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c:1.1.1.1.4.3	Fri Nov  6 23:03:20 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c	Wed Jan 27 19:24:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_engine_fifo_nve0.c,v 1.1.1.1.4.3 2015/11/06 23:03:20 riz Exp $	*/
+/*	$NetBSD: nouveau_engine_fifo_nve0.c,v 1.1.1.1.4.4 2016/01/27 19:24:30 riz Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nve0.c,v 1.1.1.1.4.3 2015/11/06 23:03:20 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nve0.c,v 1.1.1.1.4.4 2016/01/27 19:24:30 riz Exp $");
 
 #include 
 #include 
@@ -139,7 +139,8 @@ nve0_fifo_runlist_update(struct nve0_fif
 	if (cold) {
 		uint count = 2000;
 		while (count-- > 0) {
-			if (!(nv_rd32(priv, 0x002284 + (engine * 0x08)) & 0x0010))
+			if (!(nv_rd32(priv, 0x002284 +
+			(engine * 0x08)) & 0x0010))
 break;
 			delay(1000);
 		}

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Jan 27 19:29:25 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
TIcket 1079


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.52 src/doc/CHANGES-7.1:1.1.2.53
--- src/doc/CHANGES-7.1:1.1.2.52	Wed Jan 27 00:27:45 2016
+++ src/doc/CHANGES-7.1	Wed Jan 27 19:29:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.52 2016/01/27 00:27:45 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.53 2016/01/27 19:29:25 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1868,3 +1868,9 @@ sys/dev/pci/agp_i810.c1.120, 1.121
 	(CID 1328433).
 	[riastradh, ticket #1078]
 
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c 1.5-1.6
+
+	Don't try to wait if (cold), spin waiting for registers to clear.
+	PR#50362.
+	[riastradh, ticket #1079]
+

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Wed Jan 27 19:29:25 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
TIcket 1079


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:50:22 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: kern_softint.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1067):
sys/kern/kern_softint.c: revision 1.42
fix the following softint parallel operation problem.
(0) softint handler "handler A" is established
(1) CPU#X does softint_schedule() for "handler A"
- the softhand_t is set SOFTINT_PENDING flag
- the softhand_t is NOT set SOFTINT_ACTIVE flag yet
(2) CPU#X begins other H/W interrupt processing
(3) CPU#Y does softint_disestablish() for "handler A"
- waits until softhand_t's SOFTINT_ACTIVE of all CPUs is clear
- the softhand_t is set not SOFTINT_ACTIVE but SOFTINT_PENDING,
so CPU#Y does not wait
- unset the function of "handler A"
(4) CPU#X does softint_execute()
- the function of "handler A" is already clear, so panic


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/kern/kern_softint.c

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

CVS commit: [netbsd-7] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:50:22 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: kern_softint.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1067):
sys/kern/kern_softint.c: revision 1.42
fix the following softint parallel operation problem.
(0) softint handler "handler A" is established
(1) CPU#X does softint_schedule() for "handler A"
- the softhand_t is set SOFTINT_PENDING flag
- the softhand_t is NOT set SOFTINT_ACTIVE flag yet
(2) CPU#X begins other H/W interrupt processing
(3) CPU#Y does softint_disestablish() for "handler A"
- waits until softhand_t's SOFTINT_ACTIVE of all CPUs is clear
- the softhand_t is set not SOFTINT_ACTIVE but SOFTINT_PENDING,
so CPU#Y does not wait
- unset the function of "handler A"
(4) CPU#X does softint_execute()
- the function of "handler A" is already clear, so panic


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/kern/kern_softint.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_softint.c
diff -u src/sys/kern/kern_softint.c:1.41 src/sys/kern/kern_softint.c:1.41.2.1
--- src/sys/kern/kern_softint.c:1.41	Sun May 25 15:42:01 2014
+++ src/sys/kern/kern_softint.c	Tue Jan 26 04:50:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_softint.c,v 1.41 2014/05/25 15:42:01 rmind Exp $	*/
+/*	$NetBSD: kern_softint.c,v 1.41.2.1 2016/01/26 04:50:22 riz Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.41 2014/05/25 15:42:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.41.2.1 2016/01/26 04:50:22 riz Exp $");
 
 #include 
 #include 
@@ -442,8 +442,8 @@ softint_disestablish(void *arg)
 			KASSERT(sh->sh_func != NULL);
 			flags |= sh->sh_flags;
 		}
-		/* Inactive on all CPUs? */
-		if ((flags & SOFTINT_ACTIVE) == 0) {
+		/* Neither pending nor active on all CPUs? */
+		if ((flags & (SOFTINT_PENDING | SOFTINT_ACTIVE)) == 0) {
 			break;
 		}
 		/* Oops, still active.  Wait for it to clear. */

CVS commit: [netbsd-7-0] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:50:37 UTC 2016

Modified Files:
src/sys/kern [netbsd-7-0]: kern_softint.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1067):
sys/kern/kern_softint.c: revision 1.42
fix the following softint parallel operation problem.
(0) softint handler "handler A" is established
(1) CPU#X does softint_schedule() for "handler A"
- the softhand_t is set SOFTINT_PENDING flag
- the softhand_t is NOT set SOFTINT_ACTIVE flag yet
(2) CPU#X begins other H/W interrupt processing
(3) CPU#Y does softint_disestablish() for "handler A"
- waits until softhand_t's SOFTINT_ACTIVE of all CPUs is clear
- the softhand_t is set not SOFTINT_ACTIVE but SOFTINT_PENDING,
so CPU#Y does not wait
- unset the function of "handler A"
(4) CPU#X does softint_execute()
- the function of "handler A" is already clear, so panic


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.6.1 src/sys/kern/kern_softint.c

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

CVS commit: [netbsd-7-0] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:50:37 UTC 2016

Modified Files:
src/sys/kern [netbsd-7-0]: kern_softint.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1067):
sys/kern/kern_softint.c: revision 1.42
fix the following softint parallel operation problem.
(0) softint handler "handler A" is established
(1) CPU#X does softint_schedule() for "handler A"
- the softhand_t is set SOFTINT_PENDING flag
- the softhand_t is NOT set SOFTINT_ACTIVE flag yet
(2) CPU#X begins other H/W interrupt processing
(3) CPU#Y does softint_disestablish() for "handler A"
- waits until softhand_t's SOFTINT_ACTIVE of all CPUs is clear
- the softhand_t is set not SOFTINT_ACTIVE but SOFTINT_PENDING,
so CPU#Y does not wait
- unset the function of "handler A"
(4) CPU#X does softint_execute()
- the function of "handler A" is already clear, so panic


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.6.1 src/sys/kern/kern_softint.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_softint.c
diff -u src/sys/kern/kern_softint.c:1.41 src/sys/kern/kern_softint.c:1.41.6.1
--- src/sys/kern/kern_softint.c:1.41	Sun May 25 15:42:01 2014
+++ src/sys/kern/kern_softint.c	Tue Jan 26 04:50:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_softint.c,v 1.41 2014/05/25 15:42:01 rmind Exp $	*/
+/*	$NetBSD: kern_softint.c,v 1.41.6.1 2016/01/26 04:50:37 riz Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.41 2014/05/25 15:42:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.41.6.1 2016/01/26 04:50:37 riz Exp $");
 
 #include 
 #include 
@@ -442,8 +442,8 @@ softint_disestablish(void *arg)
 			KASSERT(sh->sh_func != NULL);
 			flags |= sh->sh_flags;
 		}
-		/* Inactive on all CPUs? */
-		if ((flags & SOFTINT_ACTIVE) == 0) {
+		/* Neither pending nor active on all CPUs? */
+		if ((flags & (SOFTINT_PENDING | SOFTINT_ACTIVE)) == 0) {
 			break;
 		}
 		/* Oops, still active.  Wait for it to clear. */

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:57:58 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1067-1069.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.50 -r1.1.2.51 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:57:58 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1067-1069.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.50 -r1.1.2.51 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.50 src/doc/CHANGES-7.1:1.1.2.51
--- src/doc/CHANGES-7.1:1.1.2.50	Tue Jan 26 01:30:23 2016
+++ src/doc/CHANGES-7.1	Tue Jan 26 04:57:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.50 2016/01/26 01:30:23 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.51 2016/01/26 04:57:58 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1815,3 +1815,20 @@ crypto/external/bsd/openssh/dist/sftp.c	
 	Fix sftp filename completion.  PR#50564.
 	[snj, ticket #1066]
 
+sys/kern/kern_softint.c1.42
+
+	Fix parallel operation problem with softint which
+	leads to panic.
+	[knakahara, ticket #1067]
+
+include/protocols/dumprestore.h			1.17
+
+	Bump dump/restore name length to NAME_MAX (511). PR#50434
+	[christos, ticket #1068]
+
+sys/arch/sparc64/sparc64/ofw_machdep.c		1.45
+
+	Restrict the check for fully specified interrupts to machines with psycho
+	controllers only, and adjust comments to note this.
+	[jdc, ticket #1069]
+

CVS commit: [netbsd-7] src/include/protocols

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:53:42 UTC 2016

Modified Files:
src/include/protocols [netbsd-7]: dumprestore.h

Log Message:
Pull up following revision(s) (requested by christos in ticket #1068):
include/protocols/dumprestore.h: revision 1.17
PR/50434: Louis Guillaume: Bump the in and out formats to 511 (NAME_MAX)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.28.1 src/include/protocols/dumprestore.h

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

Modified files:

Index: src/include/protocols/dumprestore.h
diff -u src/include/protocols/dumprestore.h:1.16 src/include/protocols/dumprestore.h:1.16.28.1
--- src/include/protocols/dumprestore.h:1.16	Sun Jan 11 03:04:12 2009
+++ src/include/protocols/dumprestore.h	Tue Jan 26 04:53:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumprestore.h,v 1.16 2009/01/11 03:04:12 christos Exp $	*/
+/*	$NetBSD: dumprestore.h,v 1.16.28.1 2016/01/26 04:53:42 riz Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -152,8 +152,9 @@ union u_spcl {
 #define DR_NEWINODEFMT	0x0002	/* new format inodes on tape */
 #define DR_EXTATTRIBUTES 0x8000	/* linux: extended attributes */
 
-#define	DUMPOUTFMT	"%-16s %c %s"		/* for printf */
+/* 511 == NAME_MAX */
+#define	DUMPOUTFMT	"%-511s %c %s"		/* for printf */
 		/* name, level, ctime(date) */
-#define	DUMPINFMT	"%16s %c %[^\n]\n"	/* inverse for scanf */
+#define	DUMPINFMT	"%511s %c %[^\n]\n"	/* inverse for scanf */
 
 #endif /* !_PROTOCOLS_DUMPRESTORE_H_ */

CVS commit: [netbsd-7-0] src/sys/arch/sparc64/sparc64

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:56:56 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: ofw_machdep.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1069):
sys/arch/sparc64/sparc64/ofw_machdep.c: revision 1.45
Restrict the check for fully specified interrupts to machines with psycho
controllers only, and adjust comments to note this.
See also the mail thread starting at:
http://mail-index.NetBSD.org/port-sparc64/2015/12/03/msg002488.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/sparc64/sparc64/ofw_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/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42.4.1
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42	Sun May  4 09:05:39 2014
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c	Tue Jan 26 04:56:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_machdep.c,v 1.42 2014/05/04 09:05:39 martin Exp $	*/
+/*	$NetBSD: ofw_machdep.c,v 1.42.4.1 2016/01/26 04:56:56 riz Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
 #include "opt_multiprocessor.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.42 2014/05/04 09:05:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.42.4.1 2016/01/26 04:56:56 riz Exp $");
 
 #include 
 #include 
@@ -707,22 +707,22 @@ OF_mapintr(int node, int *interrupt, int
 	int phc_node;
 	int rc = -1;
 
+	phc_node = find_pci_host_node(node);
+
 	/* 
-	 * Don't try to map interrupts for onboard devices, or if the
-	 * interrupt is already fully specified.
-	 * XXX This should be done differently (i.e. by matching
-	 * the node name) - but we need access to a machine where
-	 * a change is testable - hence the printf below.
+	 * On machines with psycho PCI controllers, we don't need to map
+	 * interrupts if they are already fully specified (0x20 to 0x3f
+	 * for onboard devices and IGN 0x7c0 for psycho0/psycho1).
 	 */
 	if (*interrupt & 0x20 || *interrupt & 0x7c0) {
-		char name[40];
-
-		OF_getprop(node, "name", , sizeof(name));
-		printf("\nATTENTION: if you see this message, please mail "
-		"the output of \"dmesg\" and \"ofctl -p\" to "
-		"port-spar...@netbsd.org!\n"
-		"Not mapping interrupt for node %s (%x)\n", name, node);
-		return validlen;
+		char model[40];
+		
+		if (OF_getprop(phc_node, "model", , sizeof(model)) > 10
+		&& !strcmp(model, "SUNW,psycho")) {
+			DPRINTF(("OF_mapintr: interrupt %x already mapped\n",
+			*interrupt));
+			return validlen;
+		}
 	}
 
 	/*
@@ -744,8 +744,6 @@ OF_mapintr(int node, int *interrupt, int
 		return (-1);
 	}
 
-	phc_node = find_pci_host_node(node);
-
 	while (node) {
 #ifdef DEBUG
 		char name[40];

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:57:20 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Tickets 1067, 1069


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.29 src/doc/CHANGES-7.0.1:1.1.2.30
--- src/doc/CHANGES-7.0.1:1.1.2.29	Tue Jan 26 01:30:56 2016
+++ src/doc/CHANGES-7.0.1	Tue Jan 26 04:57:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.29 2016/01/26 01:30:56 riz Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.30 2016/01/26 04:57:19 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -888,3 +888,15 @@ crypto/external/bsd/openssh/dist/sftp.c	
 	Fix sftp filename completion.  PR#50564.
 	[snj, ticket #1066]
 
+sys/kern/kern_softint.c1.42
+
+	Fix parallel operation problem with softint which
+	leads to panic.
+	[knakahara, ticket #1067]
+
+sys/arch/sparc64/sparc64/ofw_machdep.c		1.45
+
+	Restrict the check for fully specified interrupts to machines with psycho
+	controllers only, and adjust comments to note this.
+	[jdc, ticket #1069]
+

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:57:20 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Tickets 1067, 1069


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:56:34 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: ofw_machdep.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1069):
sys/arch/sparc64/sparc64/ofw_machdep.c: revision 1.45
Restrict the check for fully specified interrupts to machines with psycho
controllers only, and adjust comments to note this.
See also the mail thread starting at:
http://mail-index.NetBSD.org/port-sparc64/2015/12/03/msg002488.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/sparc64/sparc64/ofw_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/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42.2.1
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.42	Sun May  4 09:05:39 2014
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c	Tue Jan 26 04:56:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_machdep.c,v 1.42 2014/05/04 09:05:39 martin Exp $	*/
+/*	$NetBSD: ofw_machdep.c,v 1.42.2.1 2016/01/26 04:56:34 riz Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
 #include "opt_multiprocessor.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.42 2014/05/04 09:05:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.42.2.1 2016/01/26 04:56:34 riz Exp $");
 
 #include 
 #include 
@@ -707,22 +707,22 @@ OF_mapintr(int node, int *interrupt, int
 	int phc_node;
 	int rc = -1;
 
+	phc_node = find_pci_host_node(node);
+
 	/* 
-	 * Don't try to map interrupts for onboard devices, or if the
-	 * interrupt is already fully specified.
-	 * XXX This should be done differently (i.e. by matching
-	 * the node name) - but we need access to a machine where
-	 * a change is testable - hence the printf below.
+	 * On machines with psycho PCI controllers, we don't need to map
+	 * interrupts if they are already fully specified (0x20 to 0x3f
+	 * for onboard devices and IGN 0x7c0 for psycho0/psycho1).
 	 */
 	if (*interrupt & 0x20 || *interrupt & 0x7c0) {
-		char name[40];
-
-		OF_getprop(node, "name", , sizeof(name));
-		printf("\nATTENTION: if you see this message, please mail "
-		"the output of \"dmesg\" and \"ofctl -p\" to "
-		"port-spar...@netbsd.org!\n"
-		"Not mapping interrupt for node %s (%x)\n", name, node);
-		return validlen;
+		char model[40];
+		
+		if (OF_getprop(phc_node, "model", , sizeof(model)) > 10
+		&& !strcmp(model, "SUNW,psycho")) {
+			DPRINTF(("OF_mapintr: interrupt %x already mapped\n",
+			*interrupt));
+			return validlen;
+		}
 	}
 
 	/*
@@ -744,8 +744,6 @@ OF_mapintr(int node, int *interrupt, int
 		return (-1);
 	}
 
-	phc_node = find_pci_host_node(node);
-
 	while (node) {
 #ifdef DEBUG
 		char name[40];

CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:56:34 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: ofw_machdep.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1069):
sys/arch/sparc64/sparc64/ofw_machdep.c: revision 1.45
Restrict the check for fully specified interrupts to machines with psycho
controllers only, and adjust comments to note this.
See also the mail thread starting at:
http://mail-index.NetBSD.org/port-sparc64/2015/12/03/msg002488.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/sparc64/sparc64/ofw_machdep.c

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

CVS commit: [netbsd-7-0] src/sys/arch/sparc64/sparc64

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:56:56 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: ofw_machdep.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1069):
sys/arch/sparc64/sparc64/ofw_machdep.c: revision 1.45
Restrict the check for fully specified interrupts to machines with psycho
controllers only, and adjust comments to note this.
See also the mail thread starting at:
http://mail-index.NetBSD.org/port-sparc64/2015/12/03/msg002488.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/sparc64/sparc64/ofw_machdep.c

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

CVS commit: [netbsd-7] src/include/protocols

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 04:53:42 UTC 2016

Modified Files:
src/include/protocols [netbsd-7]: dumprestore.h

Log Message:
Pull up following revision(s) (requested by christos in ticket #1068):
include/protocols/dumprestore.h: revision 1.17
PR/50434: Louis Guillaume: Bump the in and out formats to 511 (NAME_MAX)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.28.1 src/include/protocols/dumprestore.h

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

CVS commit: [netbsd-7] src/usr.sbin/ndp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:21:33 UTC 2016

Modified Files:
src/usr.sbin/ndp [netbsd-7]: ndp.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1063):
usr.sbin/ndp/ndp.c: revision 1.46
Don't forget to set sin_scope. From Ryota Ozaki


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/ndp/ndp.c

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:21:56 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1037, 1062, 1063


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.48 -r1.1.2.49 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.48 src/doc/CHANGES-7.1:1.1.2.49
--- src/doc/CHANGES-7.1:1.1.2.48	Sat Jan 16 10:16:24 2016
+++ src/doc/CHANGES-7.1	Tue Jan 26 01:21:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.48 2016/01/16 10:16:24 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.49 2016/01/26 01:21:56 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1783,3 +1783,18 @@ sys/arch/evbarm/conf/OPENRD			1.6
 	Disable mvsdio on OPENRD.
 	[cyber, ticket #1061]
 
+external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c 1.13
+
+	Avoid creation of GNU_STACK segment.
+	[phx, ticket #1037]
+
+sys/kern/exec_elf.c			patch
+
+	Restore binary compatibility on sparc64 for old binaries.
+	[martin, ticket #1062]
+
+usr.sbin/ndp/ndp.c1.46
+
+	Fix ndp to ipv6 link-local addresses.
+	[ozaki-r, ticket #1063]
+

CVS commit: [netbsd-7-0] src/usr.sbin/ndp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:22:13 UTC 2016

Modified Files:
src/usr.sbin/ndp [netbsd-7-0]: ndp.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1063):
usr.sbin/ndp/ndp.c: revision 1.46
Don't forget to set sin_scope. From Ryota Ozaki


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.sbin/ndp/ndp.c

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

CVS commit: [netbsd-7] src/usr.sbin/ndp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:21:33 UTC 2016

Modified Files:
src/usr.sbin/ndp [netbsd-7]: ndp.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1063):
usr.sbin/ndp/ndp.c: revision 1.46
Don't forget to set sin_scope. From Ryota Ozaki


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/ndp/ndp.c

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

Modified files:

Index: src/usr.sbin/ndp/ndp.c
diff -u src/usr.sbin/ndp/ndp.c:1.43 src/usr.sbin/ndp/ndp.c:1.43.2.1
--- src/usr.sbin/ndp/ndp.c:1.43	Thu Jun  5 16:06:49 2014
+++ src/usr.sbin/ndp/ndp.c	Tue Jan 26 01:21:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ndp.c,v 1.43 2014/06/05 16:06:49 roy Exp $	*/
+/*	$NetBSD: ndp.c,v 1.43.2.1 2016/01/26 01:21:33 riz Exp $	*/
 /*	$KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $	*/
 
 /*
@@ -298,6 +298,15 @@ main(int argc, char **argv)
 }
 
 static void
+makeaddr(struct sockaddr_in6 *mysin, const void *resp)
+{
+	const struct sockaddr_in6 *res = resp;
+	mysin->sin6_addr = res->sin6_addr;
+	mysin->sin6_scope_id = res->sin6_scope_id;
+	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+}
+
+static void
 getsocket(void)
 {
 	if (my_s < 0) {
@@ -356,8 +365,7 @@ set(int argc, char **argv)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	ea = (u_char *)LLADDR(_m);
 	if (ndp_ether_aton(eaddr, ea) == 0)
 		sdl_m.sdl_alen = 6;
@@ -423,8 +431,7 @@ get(char *host)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	dump(>sin6_addr, 0);
 	if (found_entry == 0) {
 		(void)getnameinfo((struct sockaddr *)(void *)mysin,
@@ -457,8 +464,7 @@ delete(char *host)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	if (rtmsg(RTM_GET) < 0)
 		errx(1, "RTM_GET(%s) failed", host);
 	mysin = (struct sockaddr_in6 *)(void *)(rtm + 1);

CVS commit: [netbsd-7-0] src/usr.sbin/ndp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:22:13 UTC 2016

Modified Files:
src/usr.sbin/ndp [netbsd-7-0]: ndp.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1063):
usr.sbin/ndp/ndp.c: revision 1.46
Don't forget to set sin_scope. From Ryota Ozaki


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.sbin/ndp/ndp.c

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

Modified files:

Index: src/usr.sbin/ndp/ndp.c
diff -u src/usr.sbin/ndp/ndp.c:1.43 src/usr.sbin/ndp/ndp.c:1.43.4.1
--- src/usr.sbin/ndp/ndp.c:1.43	Thu Jun  5 16:06:49 2014
+++ src/usr.sbin/ndp/ndp.c	Tue Jan 26 01:22:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ndp.c,v 1.43 2014/06/05 16:06:49 roy Exp $	*/
+/*	$NetBSD: ndp.c,v 1.43.4.1 2016/01/26 01:22:13 riz Exp $	*/
 /*	$KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $	*/
 
 /*
@@ -298,6 +298,15 @@ main(int argc, char **argv)
 }
 
 static void
+makeaddr(struct sockaddr_in6 *mysin, const void *resp)
+{
+	const struct sockaddr_in6 *res = resp;
+	mysin->sin6_addr = res->sin6_addr;
+	mysin->sin6_scope_id = res->sin6_scope_id;
+	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+}
+
+static void
 getsocket(void)
 {
 	if (my_s < 0) {
@@ -356,8 +365,7 @@ set(int argc, char **argv)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	ea = (u_char *)LLADDR(_m);
 	if (ndp_ether_aton(eaddr, ea) == 0)
 		sdl_m.sdl_alen = 6;
@@ -423,8 +431,7 @@ get(char *host)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	dump(>sin6_addr, 0);
 	if (found_entry == 0) {
 		(void)getnameinfo((struct sockaddr *)(void *)mysin,
@@ -457,8 +464,7 @@ delete(char *host)
 		warnx("%s: %s\n", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	if (rtmsg(RTM_GET) < 0)
 		errx(1, "RTM_GET(%s) failed", host);
 	mysin = (struct sockaddr_in6 *)(void *)(rtm + 1);

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:21:56 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1037, 1062, 1063


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.48 -r1.1.2.49 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:23:50 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1063.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.27 src/doc/CHANGES-7.0.1:1.1.2.28
--- src/doc/CHANGES-7.0.1:1.1.2.27	Sat Jan 16 10:11:11 2016
+++ src/doc/CHANGES-7.0.1	Tue Jan 26 01:23:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.27 2016/01/16 10:11:11 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.28 2016/01/26 01:23:50 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -878,3 +878,8 @@ sys/arch/evbarm/conf/OPENRD			1.6
 	Disable mvsdio on OPENRD.
 	[cyber, ticket #1061]
 
+usr.sbin/ndp/ndp.c1.46
+
+	Fix ndp to ipv6 link-local addresses.
+	[ozaki-r, ticket #1063]
+

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:23:50 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1063.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7] src/sys/arch/sparc64/dev

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:25:33 UTC 2016

Modified Files:
src/sys/arch/sparc64/dev [netbsd-7]: schizo.c schizoreg.h schizovar.h

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1064):
sys/arch/sparc64/dev/schizo.c: revision 1.34
sys/arch/sparc64/dev/schizo.c: revision 1.35
sys/arch/sparc64/dev/schizovar.h: revision 1.7
sys/arch/sparc64/dev/schizoreg.h: revision 1.10
sys/arch/sparc64/dev/schizoreg.h: revision 1.11
add some tomatillo specific information to schizo_pbm_regs.
Set the target JPID for all interrupts on Tomatillo.
If the "ino-bitmap" property is available, use it to route error interrupts.
Minor cosmetic changes.
Add register printing when DEBUG is defined.
Use __BIT() for some masks to fix the sparc build.
No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.9 -r1.9.14.1 src/sys/arch/sparc64/dev/schizoreg.h
cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/arch/sparc64/dev/schizovar.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/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.31.8.1 src/sys/arch/sparc64/dev/schizo.c:1.31.8.2
--- src/sys/arch/sparc64/dev/schizo.c:1.31.8.1	Mon Nov 10 17:59:57 2014
+++ src/sys/arch/sparc64/dev/schizo.c	Tue Jan 26 01:25:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: schizo.c,v 1.31.8.1 2014/11/10 17:59:57 snj Exp $	*/
+/*	$NetBSD: schizo.c,v 1.31.8.2 2016/01/26 01:25:32 riz Exp $	*/
 /*	$OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.31.8.1 2014/11/10 17:59:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.31.8.2 2016/01/26 01:25:32 riz Exp $");
 
 #include 
 #include 
@@ -74,6 +74,10 @@ static	int	schizo_match(device_t, cfdata
 static	void	schizo_attach(device_t, device_t, void *);
 static	int	schizo_print(void *aux, const char *p);
 
+#ifdef DEBUG
+void schizo_print_regs(int unit, int what);
+#endif
+
 CFATTACH_DECL_NEW(schizo, sizeof(struct schizo_softc),
 schizo_match, schizo_attach, NULL, NULL);
 
@@ -143,8 +147,8 @@ schizo_attach(device_t parent, device_t 
 	struct schizo_pbm *pbm;
 	struct iommu_state *is;
 	struct pcibus_attach_args pba;
-	uint64_t reg, eccctrl;
-	int *busranges = NULL, nranges;
+	uint64_t reg, eccctrl, ino_bitmap;
+	int *busranges = NULL, nranges, *ino_bitmaps = NULL, nbitmaps;
 	char *str;
 	bool no_sc;
 
@@ -180,6 +184,9 @@ schizo_attach(device_t parent, device_t 
 	if (pbm == NULL)
 		panic("schizo: can't alloc schizo pbm");
 
+#ifdef DEBUG
+	sc->sc_pbm = pbm;
+#endif
 	pbm->sp_sc = sc;
 	pbm->sp_regt = sc->sc_bustag;
 
@@ -194,11 +201,25 @@ schizo_attach(device_t parent, device_t 
 	if (bus_space_map(sc->sc_bustag, ma->ma_reg[0].ur_paddr,
 			  ma->ma_reg[0].ur_len,
 			  BUS_SPACE_MAP_LINEAR, >sp_intrh)) {
-		aprint_error(": failed to interrupt map registers\n");
+		aprint_error(": failed to map interrupt registers\n");
 		kmem_free(pbm, sizeof(*pbm));
 		return;
 	}
 
+#ifdef DEBUG
+	/*
+	 * Map ichip registers
+	 */
+	if (sc->sc_tomatillo)
+		if (bus_space_map(sc->sc_bustag, ma->ma_reg[3].ur_paddr,
+			  ma->ma_reg[3].ur_len,
+			  BUS_SPACE_MAP_LINEAR, >sp_ichiph)) {
+			aprint_error(": failed to map ichip registers\n");
+			kmem_free(pbm, sizeof(*pbm));
+			return;
+		}
+#endif
+
 	if (prom_getprop(sc->sc_node, "ranges", sizeof(struct schizo_range),
 	>sp_nrange, (void **)>sp_range))
 		panic("schizo: can't get ranges");
@@ -207,7 +228,7 @@ schizo_attach(device_t parent, device_t 
 	(void **)))
 		panic("schizo: can't get bus-range");
 
-	aprint_normal(": \"%s\", version %d, ign %x, bus %c %d to %d\n",
+	aprint_normal(": %s, version %d, ign %x, bus %c %d to %d\n",
 	sc->sc_tomatillo ? "Tomatillo" : "Schizo", sc->sc_ver,
 	sc->sc_ign, pbm->sp_bus_a ? 'A' : 'B', busranges[0], busranges[1]);
 	aprint_naive("\n");
@@ -304,20 +325,34 @@ schizo_attach(device_t parent, device_t 
 	SCZ_PCIDIAG_D_INTSYNC);
 	schizo_pbm_write(pbm, SCZ_PCI_DIAG, reg);
 
-	if (pbm->sp_bus_a)
+	if (prom_getprop(sc->sc_node, "ino-bitmap", sizeof(int), ,
+	(void **)_bitmaps)) {
+		/* No property - set defaults (double map UE, CE, SERR). */
+		if (pbm->sp_bus_a)
+			ino_bitmap = __BIT(SCZ_PCIERR_A_INO);
+		else
+			ino_bitmap = __BIT(SCZ_PCIERR_B_INO);
+		ino_bitmap |= __BIT(SCZ_UE_INO) | __BIT(SCZ_CE_INO) |
+		__BIT(SCZ_SERR_INO);
+	} else
+		ino_bitmap = (uint64_t) ino_bitmaps[1] << 32 | ino_bitmaps[0];
+	DPRINTF(SDB_INTR, ("ino_bitmap=0x%016" PRIx64 "\n", ino_bitmap));
+
+	if (ino_bitmap & __BIT(SCZ_PCIERR_A_INO))
 		schizo_set_intr(sc, pbm, PIL_HIGH, schizo_pci_error,
 		   pbm, SCZ_PCIERR_A_INO, "pci_a");
-	else
+	if (ino_bitmap & __BIT(SCZ_PCIERR_B_INO))
 		schizo_set_intr(sc, pbm, PIL_HIGH, schizo_pci_error,
 		   pbm, 

CVS commit: [netbsd-7] src/sys/arch/sparc64/dev

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:25:33 UTC 2016

Modified Files:
src/sys/arch/sparc64/dev [netbsd-7]: schizo.c schizoreg.h schizovar.h

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1064):
sys/arch/sparc64/dev/schizo.c: revision 1.34
sys/arch/sparc64/dev/schizo.c: revision 1.35
sys/arch/sparc64/dev/schizovar.h: revision 1.7
sys/arch/sparc64/dev/schizoreg.h: revision 1.10
sys/arch/sparc64/dev/schizoreg.h: revision 1.11
add some tomatillo specific information to schizo_pbm_regs.
Set the target JPID for all interrupts on Tomatillo.
If the "ino-bitmap" property is available, use it to route error interrupts.
Minor cosmetic changes.
Add register printing when DEBUG is defined.
Use __BIT() for some masks to fix the sparc build.
No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.9 -r1.9.14.1 src/sys/arch/sparc64/dev/schizoreg.h
cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/arch/sparc64/dev/schizovar.h

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

CVS commit: [netbsd-7] src/sys/net/npf

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:27:21 UTC 2016

Modified Files:
src/sys/net/npf [netbsd-7]: npf_mbuf.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1065):
sys/net/npf/npf_mbuf.c: revision 1.15
handle delayed cksums also for ipv6


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/net/npf/npf_mbuf.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/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.13.2.1 src/sys/net/npf/npf_mbuf.c:1.13.2.2
--- src/sys/net/npf/npf_mbuf.c:1.13.2.1	Fri Jul 17 04:37:22 2015
+++ src/sys/net/npf/npf_mbuf.c	Tue Jan 26 01:27:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_mbuf.c,v 1.13.2.1 2015/07/17 04:37:22 snj Exp $	*/
+/*	$NetBSD: npf_mbuf.c,v 1.13.2.2 2016/01/26 01:27:21 riz Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.13.2.1 2015/07/17 04:37:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.13.2.2 2016/01/26 01:27:21 riz Exp $");
 
 #include 
 #include 
@@ -258,6 +258,11 @@ nbuf_cksum_barrier(nbuf_t *nbuf, int di)
 		m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4 | M_CSUM_UDPv4);
 		return true;
 	}
+	if (m->m_pkthdr.csum_flags & (M_CSUM_TCPv6 | M_CSUM_UDPv6)) {
+		in6_delayed_cksum(m);
+		m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv6 | M_CSUM_UDPv6);
+		return true;
+	}
 	return false;
 }
 

CVS commit: [netbsd-7] src/sys/net/npf

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:27:21 UTC 2016

Modified Files:
src/sys/net/npf [netbsd-7]: npf_mbuf.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1065):
sys/net/npf/npf_mbuf.c: revision 1.15
handle delayed cksums also for ipv6


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/net/npf/npf_mbuf.c

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

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:29:35 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: sftp.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1066):
crypto/external/bsd/openssh/dist/sftp.c: revision 1.17
PR/50564: Rin Okuyama: sftp: filename completion is broken


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/sftp.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/sftp.c
diff -u src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.2
--- src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/sftp.c	Tue Jan 26 01:29:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: sftp.c,v 1.12.4.2 2016/01/26 01:29:35 riz Exp $	*/
 /* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller 
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.12.4.2 2016/01/26 01:29:35 riz Exp $");
 #include 	/* MIN MAX */
 #include 
 #include 
@@ -1845,8 +1845,8 @@ complete_match(EditLine *el, struct sftp
 	if (remote != LOCAL) {
 		tmp = make_absolute(tmp, remote_path);
 		remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, );
+	} else
 		glob(tmp, GLOB_LIMIT|GLOB_DOOFFS|GLOB_MARK, NULL, );
-	}
 	
 	/* Determine length of pwd so we can trim completion display */
 	for (hadglob = tmplen = pwdlen = 0; tmp[tmplen] != 0; tmplen++) {

CVS commit: [netbsd-7-0] src/crypto/external/bsd/openssh/dist

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:41 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-0]: sftp.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1066):
crypto/external/bsd/openssh/dist/sftp.c: revision 1.17
PR/50564: Rin Okuyama: sftp: filename completion is broken


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/sftp.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/sftp.c
diff -u src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1.2.1
--- src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/sftp.c	Tue Jan 26 01:30:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: sftp.c,v 1.12.4.1.2.1 2016/01/26 01:30:40 riz Exp $	*/
 /* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller 
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.12.4.1.2.1 2016/01/26 01:30:40 riz Exp $");
 #include 	/* MIN MAX */
 #include 
 #include 
@@ -1845,8 +1845,8 @@ complete_match(EditLine *el, struct sftp
 	if (remote != LOCAL) {
 		tmp = make_absolute(tmp, remote_path);
 		remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, );
+	} else
 		glob(tmp, GLOB_LIMIT|GLOB_DOOFFS|GLOB_MARK, NULL, );
-	}
 	
 	/* Determine length of pwd so we can trim completion display */
 	for (hadglob = tmplen = pwdlen = 0; tmp[tmplen] != 0; tmplen++) {

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:23 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1064-1066


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.49 -r1.1.2.50 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:29:35 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: sftp.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1066):
crypto/external/bsd/openssh/dist/sftp.c: revision 1.17
PR/50564: Rin Okuyama: sftp: filename completion is broken


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/sftp.c

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:23 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1064-1066


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.49 -r1.1.2.50 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.49 src/doc/CHANGES-7.1:1.1.2.50
--- src/doc/CHANGES-7.1:1.1.2.49	Tue Jan 26 01:21:56 2016
+++ src/doc/CHANGES-7.1	Tue Jan 26 01:30:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.49 2016/01/26 01:21:56 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.50 2016/01/26 01:30:23 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1798,3 +1798,20 @@ usr.sbin/ndp/ndp.c1.46
 	Fix ndp to ipv6 link-local addresses.
 	[ozaki-r, ticket #1063]
 
+sys/arch/sparc64/dev/schizo.c			1.34-1.35
+sys/arch/sparc64/dev/schizoreg.h		1.7,1.10-1.11
+
+	Fix interrupt routing on sparc64 machines with Tomatillo
+	PCI controllers.
+	[jdc, ticket #1064]
+
+sys/net/npf/npf_mbuf.c1.15
+
+	Handle delayed checksums for IPv6.
+	[mlelstv, ticket #1065]
+
+crypto/external/bsd/openssh/dist/sftp.c		1.17
+
+	Fix sftp filename completion.  PR#50564.
+	[snj, ticket #1066]
+

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:56 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1066.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7-0] src/crypto/external/bsd/openssh/dist

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:41 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-0]: sftp.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1066):
crypto/external/bsd/openssh/dist/sftp.c: revision 1.17
PR/50564: Rin Okuyama: sftp: filename completion is broken


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/sftp.c

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:30:56 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1066.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.28 src/doc/CHANGES-7.0.1:1.1.2.29
--- src/doc/CHANGES-7.0.1:1.1.2.28	Tue Jan 26 01:23:50 2016
+++ src/doc/CHANGES-7.0.1	Tue Jan 26 01:30:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.28 2016/01/26 01:23:50 riz Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.29 2016/01/26 01:30:56 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -883,3 +883,8 @@ usr.sbin/ndp/ndp.c1.46
 	Fix ndp to ipv6 link-local addresses.
 	[ozaki-r, ticket #1063]
 
+crypto/external/bsd/openssh/dist/sftp.c		1.17
+
+	Fix sftp filename completion.  PR#50564.
+	[snj, ticket #1066]
+

CVS commit: [netbsd-7] src/external/gpl3/gcc/dist/gcc/config/rs6000

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:11:13 UTC 2016

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000 [netbsd-7]: rs6000.c

Log Message:
Pull up following revision(s) (requested by phx in ticket #1037):
external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c: revision 1.13
We've never supported the executable stack note, and none of the other
archs have it.


To generate a diff of this commit:
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.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/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.6.2.3 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.6.2.4
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.6.2.3	Sat Oct 31 21:35:17 2015
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c	Tue Jan 26 01:11:13 2016
@@ -29474,8 +29474,7 @@ rs6000_elf_file_end (void)
 		 aix_struct_return ? 2 : 1);
 }
 #endif
-#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD) \
-|| defined (POWERPC_NETBSD)
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
   if (TARGET_32BIT || DEFAULT_ABI == ABI_ELFv2)
 file_end_indicate_exec_stack ();
 #endif

CVS commit: [netbsd-7] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:18:37 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: exec_elf.c

Log Message:
Apply patch (requested by martin in ticket #1062):

sys/kern/exec_elf.c patch

Restore binary compatibility on sparc64 for old binaries.
[martin, ticket #1062]


To generate a diff of this commit:
cvs rdiff -u -r1.69.2.3 -r1.69.2.4 src/sys/kern/exec_elf.c

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

CVS commit: [netbsd-7] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:18:37 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: exec_elf.c

Log Message:
Apply patch (requested by martin in ticket #1062):

sys/kern/exec_elf.c patch

Restore binary compatibility on sparc64 for old binaries.
[martin, ticket #1062]


To generate a diff of this commit:
cvs rdiff -u -r1.69.2.3 -r1.69.2.4 src/sys/kern/exec_elf.c

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

Modified files:

Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.69.2.3 src/sys/kern/exec_elf.c:1.69.2.4
--- src/sys/kern/exec_elf.c:1.69.2.3	Sun Nov  8 00:57:09 2015
+++ src/sys/kern/exec_elf.c	Tue Jan 26 01:18:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.69.2.3 2015/11/08 00:57:09 riz Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.69.2.4 2016/01/26 01:18:37 riz Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.69.2.3 2015/11/08 00:57:09 riz Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.69.2.4 2016/01/26 01:18:37 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
@@ -77,6 +77,7 @@ __KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -409,20 +410,18 @@ elf_load_interp(struct lwp *l, struct ex
 	u_long phsize;
 	Elf_Addr addr = *last;
 	struct proc *p;
-	bool use_topdown;
+	bool use_topdown, restore_topdown;
 
 	p = l->l_proc;
 
 	KASSERT(p->p_vmspace);
-	if (__predict_true(p->p_vmspace != proc0.p_vmspace)) {
-		use_topdown = p->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN;
-	} else {
+	KASSERT(p->p_vmspace != proc0.p_vmspace);
+	restore_topdown = false;
 #ifdef __USE_TOPDOWN_VM
-		use_topdown = epp->ep_flags & EXEC_TOPDOWN_VM;
+	use_topdown = epp->ep_flags & EXEC_TOPDOWN_VM;
 #else
-		use_topdown = false;
+	use_topdown = false;
 #endif
-	}
 
 	/*
 	 * 1. open file
@@ -537,9 +536,36 @@ elf_load_interp(struct lwp *l, struct ex
 		/*
 		 * Now compute the size and load address.
 		 */
+		if (__predict_false(
+		/* vmspace is marked as topdown */
+		(((p->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN) != 0)
+			!=
+		 /* but this differs from the topdown usage we need */
+		 use_topdown))) {
+			/*
+			 * The vmmap might be shared, but this flag is
+			 * considered r/o and we will restore it immediately
+			 * after calculating the load address.
+			 */
+			int flags = p->p_vmspace->vm_map.flags;
+			int n = use_topdown
+? (flags | VM_MAP_TOPDOWN)
+: (flags & ~VM_MAP_TOPDOWN);
+
+			restore_topdown = true;
+			atomic_swap_32(>p_vmspace->vm_map.flags, n);
+		}
 		addr = (*epp->ep_esch->es_emul->e_vm_default_addr)(p,
 		epp->ep_daddr,
 		round_page(limit) - trunc_page(base_ph->p_vaddr));
+		if (__predict_false(restore_topdown)) {
+			int flags = p->p_vmspace->vm_map.flags;
+			int n = !use_topdown
+? (flags | VM_MAP_TOPDOWN)
+: (flags & ~VM_MAP_TOPDOWN);
+
+			atomic_swap_32(>p_vmspace->vm_map.flags, n);
+		}
 	} else
 		addr = *last; /* may be ELF_LINK_ADDR */
 

CVS commit: [netbsd-7] src/external/gpl3/gcc/dist/gcc/config/rs6000

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jan 26 01:11:13 UTC 2016

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000 [netbsd-7]: rs6000.c

Log Message:
Pull up following revision(s) (requested by phx in ticket #1037):
external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c: revision 1.13
We've never supported the executable stack note, and none of the other
archs have it.


To generate a diff of this commit:
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.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

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Jan 22 21:56:57 UTC 2016

Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC

Log Message:
Enable KDTRACE_HOOKS on i386 and amd64 GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1129 -r1.1130 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.421 src/sys/arch/amd64/conf/GENERIC:1.422
--- src/sys/arch/amd64/conf/GENERIC:1.421	Sun Jan 10 04:09:28 2016
+++ src/sys/arch/amd64/conf/GENERIC	Fri Jan 22 21:56:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.421 2016/01/10 04:09:28 christos Exp $
+# $NetBSD: GENERIC,v 1.422 2016/01/22 21:56:56 riz Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.421 $"
+#ident 		"GENERIC-$Revision: 1.422 $"
 
 maxusers	64		# estimated number of users
 
@@ -107,7 +107,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
-#options 	KDTRACE_HOOKS	# kernel DTrace hooks
+options 	KDTRACE_HOOKS	# kernel DTrace hooks
 
 # Compatibility options
 options 	COMPAT_15	# NetBSD 1.5,

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1129 src/sys/arch/i386/conf/GENERIC:1.1130
--- src/sys/arch/i386/conf/GENERIC:1.1129	Tue Jan  5 11:33:18 2016
+++ src/sys/arch/i386/conf/GENERIC	Fri Jan 22 21:56:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1129 2016/01/05 11:33:18 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.1130 2016/01/22 21:56:56 riz Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1129 $"
+#ident 		"GENERIC-$Revision: 1.1130 $"
 
 maxusers	64		# estimated number of users
 
@@ -122,7 +122,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
-#options 	KDTRACE_HOOKS	# kernel DTrace hooks
+options 	KDTRACE_HOOKS	# kernel DTrace hooks
 
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Jan 22 21:55:51 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Build DTrace userland by default on i386, amd64 and earm*


To generate a diff of this commit:
cvs rdiff -u -r1.883 -r1.884 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.883 src/share/mk/bsd.own.mk:1.884
--- src/share/mk/bsd.own.mk:1.883	Sat Dec 19 00:25:50 2015
+++ src/share/mk/bsd.own.mk	Fri Jan 22 21:55:51 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.883 2015/12/19 00:25:50 wiz Exp $
+#	$NetBSD: bsd.own.mk,v 1.884 2016/01/22 21:55:51 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -976,6 +976,16 @@ MKZFS?=		yes
 .endif
 
 #
+# DTrace works on amd64, i386 and earm*
+#
+
+.if ${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "x86_64" || \
+!empty(MACHINE_ARCH:Mearm*)
+MKDTRACE?=	yes
+MKCTF?=		yes
+.endif
+#
 # MK* options which default to "yes".
 #
 _MKVARS.yes= \

CVS commit: src/share/mk

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Jan 22 21:55:51 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Build DTrace userland by default on i386, amd64 and earm*


To generate a diff of this commit:
cvs rdiff -u -r1.883 -r1.884 src/share/mk/bsd.own.mk

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

CVS commit: src/sys/arch

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Jan 22 21:56:57 UTC 2016

Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC

Log Message:
Enable KDTRACE_HOOKS on i386 and amd64 GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1129 -r1.1130 src/sys/arch/i386/conf/GENERIC

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:40:39 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Fix changelog entry for ticket 1038 per kre.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.40 src/doc/CHANGES-7.1:1.1.2.41
--- src/doc/CHANGES-7.1:1.1.2.40	Sat Dec 26 22:26:28 2015
+++ src/doc/CHANGES-7.1	Sat Jan  2 14:40:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.40 2015/12/26 22:26:28 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.41 2016/01/02 14:40:39 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1617,7 +1617,7 @@ sys/dev/vnd.c	1.249-1.254
 sys/sys/disk.h	1.66
 
 	Avoid netbsd-6 (and prior) vnconfig -l infinite loop with a newer
-	kernel.
+	kernel, and limit the vnd sector size choices to rational values.
 	[manu, ticket #1038]
 
 sys/external/bsd/drm2/include/linux/hdmi.h	1.6

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:40:39 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Fix changelog entry for ticket 1038 per kre.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:46:09 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Ticket 1054


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.41 src/doc/CHANGES-7.1:1.1.2.42
--- src/doc/CHANGES-7.1:1.1.2.41	Sat Jan  2 14:40:39 2016
+++ src/doc/CHANGES-7.1	Sat Jan  2 14:46:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.41 2016/01/02 14:40:39 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.42 2016/01/02 14:46:09 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1707,3 +1707,8 @@ sys/dev/ic/dwc_gmac_reg.h			1.15
 	the cable wasn't plugged in at boot.
 	[jmcneill, ticket #1053]
 
+sys/dev/usb/ohci.c1.257
+
+	Fix missing-parentheses bug affecting ohci IN transfers.
+	[skrll, ticket #1054]
+

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:46:09 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Ticket 1054


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:39:25 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
ticket 1038 to netbsd-7-0 as well.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.21 src/doc/CHANGES-7.0.1:1.1.2.22
--- src/doc/CHANGES-7.0.1:1.1.2.21	Sat Dec 26 22:26:58 2015
+++ src/doc/CHANGES-7.0.1	Sat Jan  2 14:39:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.21 2015/12/26 22:26:58 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.22 2016/01/02 14:39:25 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -831,3 +831,10 @@ sys/dev/ic/dwc_gmac_reg.h			1.15
 	the cable wasn't plugged in at boot.
 	[jmcneill, ticket #1053]
 
+sys/dev/vnd.c   1.249-1.254
+sys/sys/disk.h  1.66
+
+	Avoid netbsd-6 (and prior) vnconfig -l infinite loop with a newer
+	kernel, and limit the vnd sector size choices to rational values.
+	[manu, ticket #1038]
+

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:39:25 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
ticket 1038 to netbsd-7-0 as well.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7-0] src/sys

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:38:45 UTC 2016

Modified Files:
src/sys/dev [netbsd-7-0]: vnd.c
src/sys/sys [netbsd-7-0]: disk.h

Log Message:
Pull up following revision(s) (requested by manu in ticket #1038):
sys/dev/vnd.c: revision 1.252
sys/dev/vnd.c: revision 1.253
sys/dev/vnd.c: revision 1.254
sys/dev/vnd.c: revision 1.249
sys/sys/disk.h: revision 1.66
sys/dev/vnd.c: revision 1.250
sys/dev/vnd.c: revision 1.251
- Add DK_DEV_BSIZE_OK()
- Simplify ioctl handling a little.
- disable debugging
- Return ENXIO if the get ioctl exceeds the number of configured devices.
  XXX: pullup-7
- explain why the int cast works (suggested by kre)
- fix incorrect memset.
- Use the new DK_DEV_BSIZE_OK() macro.


To generate a diff of this commit:
cvs rdiff -u -r1.232.2.3 -r1.232.2.3.2.1 src/sys/dev/vnd.c
cvs rdiff -u -r1.60 -r1.60.6.1 src/sys/sys/disk.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/vnd.c
diff -u src/sys/dev/vnd.c:1.232.2.3 src/sys/dev/vnd.c:1.232.2.3.2.1
--- src/sys/dev/vnd.c:1.232.2.3	Wed Jan 28 19:16:21 2015
+++ src/sys/dev/vnd.c	Sat Jan  2 14:38:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.232.2.3 2015/01/28 19:16:21 martin Exp $	*/
+/*	$NetBSD: vnd.c,v 1.232.2.3.2.1 2016/01/02 14:38:45 riz Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.232.2.3 2015/01/28 19:16:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.232.2.3.2.1 2016/01/02 14:38:45 riz Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -137,7 +137,7 @@ int dovndcluster = 1;
 #define VDB_INIT	0x02
 #define VDB_IO		0x04
 #define VDB_LABEL	0x08
-int vnddebug = 0x00;
+int vnddebug = 0;
 #endif
 
 #define vndunit(x)	DISKUNIT(x)
@@ -1030,7 +1030,7 @@ vnddoclear(struct vnd_softc *vnd, int pm
 	vndclear(vnd, minor);
 #ifdef DEBUG
 	if (vnddebug & VDB_INIT)
-		printf("vndioctl: CLRed\n");
+		printf("%s: CLRed\n", __func__);
 #endif
 
 	/* Destroy the xfer and buffer pools. */
@@ -1042,6 +1042,29 @@ vnddoclear(struct vnd_softc *vnd, int pm
 	return 0;
 }
 
+static int
+vndioctl_get(struct lwp *l, void *data, int unit, struct vattr *va)
+{
+	int error;
+
+	KASSERT(l);
+
+	/* the first member is always int vnd_unit in all the versions */
+	if (*(int *)data >= vnd_cd.cd_ndevs)
+		return ENXIO;
+
+	switch (error = vnd_cget(l, unit, (int *)data, va)) {
+	case -1:
+		/* unused is not an error */
+		memset(va, 0, sizeof(*va));
+		/*FALLTHROUGH*/
+	case 0:
+		return 0;
+	default:
+		return error;
+	}
+}
+
 /* ARGSUSED */
 static int
 vndioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
@@ -1067,15 +1090,46 @@ vndioctl(dev_t dev, u_long cmd, void *da
 		printf("vndioctl(0x%"PRIx64", 0x%lx, %p, 0x%x, %p): unit %d\n",
 		dev, cmd, data, flag, l->l_proc, unit);
 #endif
-	vnd = device_lookup_private(_cd, unit);
-	if (vnd == NULL &&
+	/* Do the get's first; they don't need initialization or verification */
+	switch (cmd) {
 #ifdef COMPAT_30
-	cmd != VNDIOCGET30 &&
+	case VNDIOCGET30: {
+		if ((error = vndioctl_get(l, data, unit, )) != 0)
+			return error;
+
+		struct vnd_user30 *vnu = data;
+		vnu->vnu_dev = vattr.va_fsid;
+		vnu->vnu_ino = vattr.va_fileid;
+		return 0;
+	}
 #endif
 #ifdef COMPAT_50
-	cmd != VNDIOCGET50 &&
+	case VNDIOCGET50: {
+		if ((error = vndioctl_get(l, data, unit, )) != 0)
+			return error;
+
+		struct vnd_user50 *vnu = data;
+		vnu->vnu_dev = vattr.va_fsid;
+		vnu->vnu_ino = vattr.va_fileid;
+		return 0;
+	}
 #endif
-	cmd != VNDIOCGET)
+
+	case VNDIOCGET: {
+		if ((error = vndioctl_get(l, data, unit, )) != 0)
+			return error;
+
+		struct vnd_user *vnu = data;
+		vnu->vnu_dev = vattr.va_fsid;
+		vnu->vnu_ino = vattr.va_fileid;
+		return 0;
+	}
+	default:
+		break;
+	}
+
+	vnd = device_lookup_private(_cd, unit);
+	if (vnd == NULL)
 		return ENXIO;
 	vio = (struct vnd_ioctl *)data;
 
@@ -1190,8 +1244,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
 			/* note last offset is the file byte size */
 			vnd->sc_comp_numoffs = ntohl(ch->num_blocks)+1;
 			free(ch, M_TEMP);
-			if (vnd->sc_comp_blksz == 0 ||
-			vnd->sc_comp_blksz % DEV_BSIZE !=0) {
+			if (!DK_DEV_BSIZE_OK(vnd->sc_comp_blksz)) {
 VOP_UNLOCK(nd.ni_vp);
 error = EINVAL;
 goto close_and_exit;
@@ -1286,14 +1339,11 @@ vndioctl(dev_t dev, u_long cmd, void *da
 
 			/*
 			 * Sanity-check the sector size.
-			 * XXX Don't allow secsize < DEV_BSIZE.	 Should
-			 * XXX we?
 			 */
-			if (vnd->sc_geom.vng_secsize < DEV_BSIZE ||
-			(vnd->sc_geom.vng_secsize % DEV_BSIZE) != 0 ||
+			if (!DK_DEV_BSIZE_OK(vnd->sc_geom.vng_secsize) ||
 			vnd->sc_geom.vng_ncylinders == 0 ||
-			(vnd->sc_geom.vng_ntracks *
-			 vnd->sc_geom.vng_nsectors) == 0) {
+			vnd->sc_geom.vng_ntracks == 0 ||
+			   

CVS commit: [netbsd-7-0] src/sys

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:38:45 UTC 2016

Modified Files:
src/sys/dev [netbsd-7-0]: vnd.c
src/sys/sys [netbsd-7-0]: disk.h

Log Message:
Pull up following revision(s) (requested by manu in ticket #1038):
sys/dev/vnd.c: revision 1.252
sys/dev/vnd.c: revision 1.253
sys/dev/vnd.c: revision 1.254
sys/dev/vnd.c: revision 1.249
sys/sys/disk.h: revision 1.66
sys/dev/vnd.c: revision 1.250
sys/dev/vnd.c: revision 1.251
- Add DK_DEV_BSIZE_OK()
- Simplify ioctl handling a little.
- disable debugging
- Return ENXIO if the get ioctl exceeds the number of configured devices.
  XXX: pullup-7
- explain why the int cast works (suggested by kre)
- fix incorrect memset.
- Use the new DK_DEV_BSIZE_OK() macro.


To generate a diff of this commit:
cvs rdiff -u -r1.232.2.3 -r1.232.2.3.2.1 src/sys/dev/vnd.c
cvs rdiff -u -r1.60 -r1.60.6.1 src/sys/sys/disk.h

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

CVS commit: [netbsd-7] src/sys/dev/usb

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:43:48 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: ohci.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1054):
sys/dev/usb/ohci.c: revision 1.257
Fix 10year old bug of mine affecting interrupt IN transfers.


To generate a diff of this commit:
cvs rdiff -u -r1.253.2.1 -r1.253.2.2 src/sys/dev/usb/ohci.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/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.253.2.1 src/sys/dev/usb/ohci.c:1.253.2.2
--- src/sys/dev/usb/ohci.c:1.253.2.1	Mon Dec  1 11:38:43 2014
+++ src/sys/dev/usb/ohci.c	Sat Jan  2 14:43:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.253.2.1 2014/12/01 11:38:43 martin Exp $	*/
+/*	$NetBSD: ohci.c,v 1.253.2.2 2016/01/02 14:43:48 riz Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253.2.1 2014/12/01 11:38:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253.2.2 2016/01/02 14:43:48 riz Exp $");
 
 #include 
 #include 
@@ -3191,7 +3191,7 @@ ohci_device_intr_start(usbd_xfer_handle 
 	tail->xfer = NULL;
 
 	data->td.td_flags = HTOO32(
-		isread ? OHCI_TD_IN : OHCI_TD_OUT |
+		(isread ? OHCI_TD_IN : OHCI_TD_OUT) |
 		OHCI_TD_NOCC |
 		OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
 	if (xfer->flags & USBD_SHORT_XFER_OK)

CVS commit: [netbsd-7] src/sys/dev/usb

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Jan  2 14:43:48 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: ohci.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1054):
sys/dev/usb/ohci.c: revision 1.257
Fix 10year old bug of mine affecting interrupt IN transfers.


To generate a diff of this commit:
cvs rdiff -u -r1.253.2.1 -r1.253.2.2 src/sys/dev/usb/ohci.c

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

CVS commit: othersrc/share/examples/ec2/files

[Jeff Rizzo]

Module Name:othersrc
Committed By:   riz
Date:   Sat Nov 21 20:02:36 UTC 2015

Modified Files:
othersrc/share/examples/ec2/files: ec2_init

Log Message:
Can't be both BEFORE: LOGIN and REQUIRE: sshd, so drop the former.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_init

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

CVS commit: othersrc/share/examples/ec2/files

[Jeff Rizzo]

Module Name:othersrc
Committed By:   riz
Date:   Sat Nov 21 20:02:36 UTC 2015

Modified Files:
othersrc/share/examples/ec2/files: ec2_init

Log Message:
Can't be both BEFORE: LOGIN and REQUIRE: sshd, so drop the former.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_init

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

Modified files:

Index: othersrc/share/examples/ec2/files/ec2_init
diff -u othersrc/share/examples/ec2/files/ec2_init:1.1 othersrc/share/examples/ec2/files/ec2_init:1.2
--- othersrc/share/examples/ec2/files/ec2_init:1.1	Fri Apr 20 21:01:03 2012
+++ othersrc/share/examples/ec2/files/ec2_init	Sat Nov 21 20:02:36 2015
@@ -2,7 +2,6 @@
 #
 # PROVIDE: ec2_init
 # REQUIRE: NETWORKING sshd
-# BEFORE:  LOGIN
 
 #
 # DO NOT modify the output of this file without understanding the

CVS commit: othersrc/share/examples/ec2/files

[Jeff Rizzo]

Module Name:othersrc
Committed By:   riz
Date:   Sat Nov 21 20:03:53 UTC 2015

Modified Files:
othersrc/share/examples/ec2/files: ec2_firstboot

Log Message:
Remove "resize_root" lines from rc.conf if they exist.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_firstboot

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

Modified files:

Index: othersrc/share/examples/ec2/files/ec2_firstboot
diff -u othersrc/share/examples/ec2/files/ec2_firstboot:1.1 othersrc/share/examples/ec2/files/ec2_firstboot:1.2
--- othersrc/share/examples/ec2/files/ec2_firstboot:1.1	Fri Apr 20 21:01:03 2012
+++ othersrc/share/examples/ec2/files/ec2_firstboot	Sat Nov 21 20:03:53 2015
@@ -19,6 +19,8 @@ ec2_firstboot_run()
 	# The first boot has finished.
 	if [ -f /root/firstboot ]; then
 		rm /root/firstboot
+		# remove resize_root from rc.conf
+		sed -i -e ',s^resize_root.*$,,' /etc/rc.conf
 	fi
 }
 

CVS commit: othersrc/share/examples/ec2/files

[Jeff Rizzo]

Module Name:othersrc
Committed By:   riz
Date:   Sat Nov 21 20:03:53 UTC 2015

Modified Files:
othersrc/share/examples/ec2/files: ec2_firstboot

Log Message:
Remove "resize_root" lines from rc.conf if they exist.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_firstboot

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

CVS commit: [netbsd-7] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:19 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/sys/compat/linux/common [netbsd-7]: linux_mod.c
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_mod.c

Log Message:
Revert ticket #1020, per pgoyette in ticket #1041.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-7.1
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/compat/netbsd32/netbsd32_mod.c

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

CVS commit: [netbsd-7-0] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:22 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7-0]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2.2.1 -r1.4.4.2.2.2 src/external/bsd/ntp/scripts/mkver

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

CVS commit: [netbsd-7] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:08 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/external/bsd/ntp/scripts/mkver

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

CVS commit: [netbsd-7] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:08 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/external/bsd/ntp/scripts/mkver

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/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.4.4.3 src/external/bsd/ntp/scripts/mkver:1.4.4.4
--- src/external/bsd/ntp/scripts/mkver:1.4.4.3	Sun Nov  8 01:51:18 2015
+++ src/external/bsd/ntp/scripts/mkver	Tue Nov 17 19:09:08 2015
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
-ConfStr="$ConfStr 4.2.8p3"
+ConfStr="$ConfStr 4.2.8p4"
 
 case "$CSET" in
  '') ;;

CVS commit: [netbsd-7] src/sys/arch/arm/omap

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:21:14 UTC 2015

Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omap3_sdhc.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1017):
sys/arch/arm/omap/omap3_sdhc.c: revision 1.18
AM335x EDMA3 has an alignment restriction for both SAM and DAM in constant
addressing mode. In these cases, the physical address must be aligned to
256-bits. To handle this, pre-allocate a MAXPHYS sized bounce buffer and
use it for unaligned transfers.
Fixes edma errint! problem mentioned in port-arm/50288.


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.2 -r1.14.4.3 src/sys/arch/arm/omap/omap3_sdhc.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/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.2 src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.3
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.2	Sun Nov  8 01:22:54 2015
+++ src/sys/arch/arm/omap/omap3_sdhc.c	Tue Nov 17 19:21:14 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdhc.c,v 1.14.4.2 2015/11/08 01:22:54 riz Exp $	*/
+/*	$NetBSD: omap3_sdhc.c,v 1.14.4.3 2015/11/17 19:21:14 riz Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.14.4.2 2015/11/08 01:22:54 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.14.4.3 2015/11/17 19:21:14 riz Exp $");
 
 #include "opt_omap.h"
 #include "edma.h"
@@ -109,13 +109,17 @@ struct obiosdhc_softc {
 	kcondvar_t		sc_edma_cv;
 	bus_addr_t		sc_edma_fifo;
 	bool			sc_edma_pending;
+	bus_dmamap_t		sc_edma_dmamap;
+	bus_dma_segment_t	sc_edma_segs[1];
+	void			*sc_edma_bbuf;
 #endif
 };
 
 #if NEDMA > 0
-static void obiosdhc_edma_init(struct obiosdhc_softc *, unsigned int);
+static int obiosdhc_edma_init(struct obiosdhc_softc *, unsigned int);
 static int obiosdhc_edma_xfer_data(struct sdhc_softc *, struct sdmmc_command *);
 static void obiosdhc_edma_done(void *);
+static int obiosdhc_edma_transfer(struct sdhc_softc *, struct sdmmc_command *);
 #endif
 
 #ifdef TI_AM335X
@@ -252,11 +256,13 @@ obiosdhc_attach(device_t parent, device_
 
 #if NEDMA > 0
 	if (oa->obio_edmabase != -1) {
+		if (obiosdhc_edma_init(sc, oa->obio_edmabase) != 0)
+			goto no_dma;
+
 		mutex_init(>sc_edma_lock, MUTEX_DEFAULT, IPL_SCHED);
 		cv_init(>sc_edma_cv, "sdhcedma");
 		sc->sc_edma_fifo = oa->obio_addr +
 		OMAP3_SDMMC_SDHC_OFFSET + SDHC_DATA;
-		obiosdhc_edma_init(sc, oa->obio_edmabase);
 		sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
 		sc->sc.sc_flags |= SDHC_FLAG_EXTERNAL_DMA;
 		sc->sc.sc_flags |= SDHC_FLAG_EXTDMA_DMAEN;
@@ -264,6 +270,7 @@ obiosdhc_attach(device_t parent, device_
 		sc->sc.sc_vendor_transfer_data_dma = obiosdhc_edma_xfer_data;
 		transfer_mode = "EDMA";
 	}
+no_dma:
 #endif
 
 	aprint_naive("\n");
@@ -494,10 +501,10 @@ obiosdhc_bus_clock(struct sdhc_softc *sc
 }
 
 #if NEDMA > 0
-static void
+static int
 obiosdhc_edma_init(struct obiosdhc_softc *sc, unsigned int edmabase)
 {
-	int i;
+	int i, error, rseg;
 
 	/* Request tx and rx DMA channels */
 	sc->sc_edma_tx = edma_channel_alloc(EDMA_TYPE_DMA, edmabase + 0,
@@ -521,18 +528,98 @@ obiosdhc_edma_init(struct obiosdhc_softc
 		KASSERT(sc->sc_edma_param_rx[i] != 0x);
 	}
 
-	return;
+	/* Setup bounce buffer */
+	error = bus_dmamem_alloc(sc->sc.sc_dmat, MAXPHYS, 32, MAXPHYS,
+	sc->sc_edma_segs, 1, , BUS_DMA_WAITOK);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev,
+		"couldn't allocate dmamem: %d\n", error);
+		return error;
+	}
+	KASSERT(rseg == 1);
+	error = bus_dmamem_map(sc->sc.sc_dmat, sc->sc_edma_segs, rseg, MAXPHYS,
+	>sc_edma_bbuf, BUS_DMA_WAITOK);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev, "couldn't map dmamem: %d\n",
+		error);
+		return error;
+	}
+	error = bus_dmamap_create(sc->sc.sc_dmat, MAXPHYS, 1, MAXPHYS, 0,
+	BUS_DMA_WAITOK, >sc_edma_dmamap);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev, "couldn't create dmamap: %d\n",
+		error);
+		return error;
+	}
+
+	return error;
 }
 
 static int
 obiosdhc_edma_xfer_data(struct sdhc_softc *sdhc_sc, struct sdmmc_command *cmd)
 {
 	struct obiosdhc_softc *sc = device_private(sdhc_sc->sc_dev);
+	const bus_dmamap_t map = cmd->c_dmamap;
+	int seg, error;
+	bool bounce;
+
+	for (bounce = false, seg = 0; seg < cmd->c_dmamap->dm_nsegs; seg++) {
+		if ((cmd->c_dmamap->dm_segs[seg].ds_addr & 0x1f) != 0) {
+			bounce = true;
+			break;
+		}
+	}
+
+	if (bounce) {
+		error = bus_dmamap_load(sc->sc.sc_dmat, sc->sc_edma_dmamap,
+		sc->sc_edma_bbuf, MAXPHYS, NULL, BUS_DMA_WAITOK);
+		if (error) {
+			device_printf(sc->sc.sc_dev,
+			"[bounce] bus_dmamap_load failed: %d\n", error);
+			return error;
+		}
+		if (ISSET(cmd->c_flags, SCF_CMD_READ)) {
+			bus_dmamap_sync(sc->sc.sc_dmat, sc->sc_edma_dmamap, 0,
+			MAXPHYS, BUS_DMASYNC_PREREAD);
+		} else {

CVS commit: [netbsd-7] src/sys/arch/arm/omap

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:21:14 UTC 2015

Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omap3_sdhc.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1017):
sys/arch/arm/omap/omap3_sdhc.c: revision 1.18
AM335x EDMA3 has an alignment restriction for both SAM and DAM in constant
addressing mode. In these cases, the physical address must be aligned to
256-bits. To handle this, pre-allocate a MAXPHYS sized bounce buffer and
use it for unaligned transfers.
Fixes edma errint! problem mentioned in port-arm/50288.


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.2 -r1.14.4.3 src/sys/arch/arm/omap/omap3_sdhc.c

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

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:22:10 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
ticket 1017.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.33 src/doc/CHANGES-7.1:1.1.2.34
--- src/doc/CHANGES-7.1:1.1.2.33	Tue Nov 17 19:18:19 2015
+++ src/doc/CHANGES-7.1	Tue Nov 17 19:22:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.33 2015/11/17 19:18:19 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.34 2015/11/17 19:22:10 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1585,3 +1585,9 @@ external/bsd/ntp/scripts/mkver			1.8
 	PR/50426: Dave Tyson: Fix ntp reported version.
 	[christos, ticket #1036]
 
+sys/arch/arm/omap/omap3_sdhc.c			1.18 via patch
+
+	Fix edma_errint problems with resize_ffs on beaglebone.
+	PR#50288.
+	[jmcneill, ticket #1017]
+

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:22:10 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
ticket 1017.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:19 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/sys/compat/linux/common [netbsd-7]: linux_mod.c
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_mod.c

Log Message:
Revert ticket #1020, per pgoyette in ticket #1041.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-7.1
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/compat/netbsd32/netbsd32_mod.c

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.32 src/doc/CHANGES-7.1:1.1.2.33
--- src/doc/CHANGES-7.1:1.1.2.32	Mon Nov 16 14:46:54 2015
+++ src/doc/CHANGES-7.1	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.32 2015/11/16 14:46:54 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.33 2015/11/17 19:18:19 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1473,12 +1473,6 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p4.
 	[christos, ticket #1024]
 
-sys/compat/linux/common/linux_mod.c		1.5
-sys/compat/netbsd32/netbsd32_mod.c		1.6-1.9
-
-	Fixes for compat modules.
-	[pgoyette, ticket #1020]
-
 usr.sbin/vnconfig/vnconfig.8			1.40
 
 	In NetBSD 7, the vnconfig command was renamed.
@@ -1585,3 +1579,9 @@ sys/dev/usb/usb_subr.c1.204
 
 	Attach serial number as property to all USB devices having one.
 	[joerg, ticket #1032]
+
+external/bsd/ntp/scripts/mkver			1.8
+
+	PR/50426: Dave Tyson: Fix ntp reported version.
+	[christos, ticket #1036]
+

Index: src/sys/compat/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.4.4.1 src/sys/compat/linux/common/linux_mod.c:1.4.4.2
--- src/sys/compat/linux/common/linux_mod.c:1.4.4.1	Sun Nov  8 02:02:37 2015
+++ src/sys/compat/linux/common/linux_mod.c	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $	*/
+/*	$NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -65,8 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
 # define	MD3	""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,compat_sysv"
-	MD1 MD2 MD3);
+MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio" MD1 MD2 MD3);
 
 static struct execsw linux_execsw[] = {
 #if defined(EXEC_ELF32) && ELFSIZE == 32

Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1 src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.2
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1	Sun Nov  8 02:02:36 2015
+++ src/sys/compat/netbsd32/netbsd32_mod.c	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $	*/
+/*	$NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
-# define	DEPS1	"compat,compat_sysv,nfsserver,mqueue"
+# define	DEPS1	"compat"
 #else
-# define	DEPS1	"compat,compat_sysv,nfsserver,mqueue,ksem"
+# define	DEPS1	"compat,ksem"
 #endif
 
 #ifndef ELFSIZE

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:56 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1036.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7-0] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:22 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7-0]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2.2.1 -r1.4.4.2.2.2 src/external/bsd/ntp/scripts/mkver

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/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.1 src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.2
--- src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.1	Sun Nov  8 01:55:39 2015
+++ src/external/bsd/ntp/scripts/mkver	Tue Nov 17 19:09:22 2015
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
-ConfStr="$ConfStr 4.2.8p3"
+ConfStr="$ConfStr 4.2.8p4"
 
 case "$CSET" in
  '') ;;

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:56 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1036.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.15 src/doc/CHANGES-7.0.1:1.1.2.16
--- src/doc/CHANGES-7.0.1:1.1.2.15	Mon Nov 16 14:47:16 2015
+++ src/doc/CHANGES-7.0.1	Tue Nov 17 19:18:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.15 2015/11/16 14:47:16 msaitoh Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.16 2015/11/17 19:18:56 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -761,3 +761,9 @@ sys/arch/sparc64/sparc64/vm_machdep.c		1
 
 	Fix various sparc64 compat_netbsd32 issues.
 	[martin, ticket #1028]
+
+external/bsd/ntp/scripts/mkver			1.8
+
+	PR/50426: Dave Tyson: Fix ntp reported version.
+	[christos, ticket #1036]
+

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Nov 12 22:10:48 UTC 2015

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_lex.l

Log Message:
Declare variables under the same conditions as their use.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l

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

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Nov 12 22:10:48 UTC 2015

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_lex.l

Log Message:
Declare variables under the same conditions as their use.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l:1.5
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l:1.4	Thu Sep 24 14:25:29 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l	Thu Nov 12 22:10:48 2015
@@ -430,7 +430,10 @@ if (yypcb->pcb_token != 0) {
 '{RGX_CHR}$	xyerror(D_CHR_NL, "newline encountered in character constant");
 
 '{RGX_CHR}'	{
-			char *s, *p, *q;
+			char *s;
+#if BYTE_ORDER == _LITTLE_ENDIAN
+			char  *p, *q;
+#endif
 			size_t nbytes;
 
 			/*

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:30:08 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Adjust ticket 1024


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:29:53 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Adjust ticket #1024


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7] src/external/bsd/ntp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:28:05 UTC 2015

Modified Files:
src/external/bsd/ntp [netbsd-7]: Makefile.inc

Log Message:
Apply additional patch (requested by christos in ticket #1024):
-D__syslog__=__printf__


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/external/bsd/ntp/Makefile.inc

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/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.14.2.1 src/external/bsd/ntp/Makefile.inc:1.14.2.2
--- src/external/bsd/ntp/Makefile.inc:1.14.2.1	Wed Dec 24 00:05:04 2014
+++ src/external/bsd/ntp/Makefile.inc	Sun Nov  8 23:28:05 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.14.2.1 2014/12/24 00:05:04 riz Exp $
+#	$NetBSD: Makefile.inc,v 1.14.2.2 2015/11/08 23:28:05 riz Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -22,6 +22,7 @@ NTP_HTMLDIR=	/usr/share/doc/reference/re
 SYSCONFDIR=/etc
 LOCALSTATEDIR=/var
 
+CPPFLAGS+=-D__syslog__=__printf__
 CPPFLAGS+=-DHAVE_CONFIG_H
 CPPFLAGS+=-I${NTP_SRCDIR}/include \
 	  -I${IDIST}/include \

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:29:53 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Adjust ticket #1024


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.12 src/doc/CHANGES-7.0.1:1.1.2.13
--- src/doc/CHANGES-7.0.1:1.1.2.12	Sun Nov  8 02:05:16 2015
+++ src/doc/CHANGES-7.0.1	Sun Nov  8 23:29:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.12 2015/11/08 02:05:16 riz Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.13 2015/11/08 23:29:53 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -134,6 +134,7 @@ sys/fs/tmpfs/tmpfs_subr.c			1.101
 	[leot, ticket #1023]
 
 doc/3RDPARTY	patch
+external/bsd/ntp/Makefile.inc			patch
 external/bsd/ntp/dist/tests/libntp/atoint.c up to 1.1.1.3
 external/bsd/ntp/dist/tests/libntp/atouint.cup to 1.1.1.3
 external/bsd/ntp/dist/tests/libntp/authkeys.c   up to 1.1.1.3

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:30:08 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Adjust ticket 1024


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.28 src/doc/CHANGES-7.1:1.1.2.29
--- src/doc/CHANGES-7.1:1.1.2.28	Sun Nov  8 05:18:34 2015
+++ src/doc/CHANGES-7.1	Sun Nov  8 23:30:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.28 2015/11/08 05:18:34 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.29 2015/11/08 23:30:08 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -865,6 +865,7 @@ sys/fs/tmpfs/tmpfs_subr.c			1.101
 	[leot, ticket #1023]
 
 doc/3RDPARTY	patch
+external/bsd/ntp/Makefile.inc			patch
 external/bsd/ntp/dist/tests/libntp/atoint.c up to 1.1.1.3
 external/bsd/ntp/dist/tests/libntp/atouint.cup to 1.1.1.3
 external/bsd/ntp/dist/tests/libntp/authkeys.c   up to 1.1.1.3

CVS commit: [netbsd-7] src/external/bsd/ntp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:28:05 UTC 2015

Modified Files:
src/external/bsd/ntp [netbsd-7]: Makefile.inc

Log Message:
Apply additional patch (requested by christos in ticket #1024):
-D__syslog__=__printf__


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/external/bsd/ntp/Makefile.inc

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

CVS commit: [netbsd-7-0] src/external/bsd/ntp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:26:45 UTC 2015

Modified Files:
src/external/bsd/ntp [netbsd-7-0]: Makefile.inc

Log Message:
Apply additional patch (requested by christos in ticket #1024):
-D__syslog__=__printf__


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.1.2.1 src/external/bsd/ntp/Makefile.inc

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/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.14.2.1 src/external/bsd/ntp/Makefile.inc:1.14.2.1.2.1
--- src/external/bsd/ntp/Makefile.inc:1.14.2.1	Wed Dec 24 00:05:04 2014
+++ src/external/bsd/ntp/Makefile.inc	Sun Nov  8 23:26:45 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.14.2.1 2014/12/24 00:05:04 riz Exp $
+#	$NetBSD: Makefile.inc,v 1.14.2.1.2.1 2015/11/08 23:26:45 riz Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -22,6 +22,7 @@ NTP_HTMLDIR=	/usr/share/doc/reference/re
 SYSCONFDIR=/etc
 LOCALSTATEDIR=/var
 
+CPPFLAGS+=-D__syslog__=__printf__
 CPPFLAGS+=-DHAVE_CONFIG_H
 CPPFLAGS+=-I${NTP_SRCDIR}/include \
 	  -I${IDIST}/include \

CVS commit: [netbsd-7-0] src/external/bsd/ntp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Nov  8 23:26:45 UTC 2015

Modified Files:
src/external/bsd/ntp [netbsd-7-0]: Makefile.inc

Log Message:
Apply additional patch (requested by christos in ticket #1024):
-D__syslog__=__printf__


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.1.2.1 src/external/bsd/ntp/Makefile.inc

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:37:03 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1006.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7-0] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:37:03 UTC 2015

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
Ticket 1006.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.5 src/doc/CHANGES-7.0.1:1.1.2.6
--- src/doc/CHANGES-7.0.1:1.1.2.5	Thu Nov  5 09:35:43 2015
+++ src/doc/CHANGES-7.0.1	Sat Nov  7 16:37:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.5 2015/11/05 09:35:43 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.6 2015/11/07 16:37:03 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -92,3 +92,8 @@ sys/kern/kern_exit.c1.248
 	Update value of p_stat before we release the proc_lock.
 	[pgoyette, ticket #999]
 
+sys/arch/arm/allwinner/awin_mmc.c		1.22
+
+	Avoid a divide by 0 when unplugging a sd card.
+	[bouyer, ticket #1006]
+

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:43:39 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1006, 1007


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.21 src/doc/CHANGES-7.1:1.1.2.22
--- src/doc/CHANGES-7.1:1.1.2.21	Sat Nov  7 01:56:08 2015
+++ src/doc/CHANGES-7.1	Sat Nov  7 16:43:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.21 2015/11/07 01:56:08 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.22 2015/11/07 16:43:38 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -769,3 +769,13 @@ sys/arch/arm/allwinner/awin_gpio.c		1.19
 	to find which port is connected to which gpio instance.
 	[bouyer, ticket #1004]
 
+sys/arch/arm/allwinner/awin_mmc.c		1.22
+
+	Avoid a divide by 0 when unplugging a sd card.
+	[bouyer, ticket #1006]
+
+lib/libcurses/toucholap.c			1.16
+
+	Fix x/y editing error.
+	[uwe, ticket #1007]
+

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:43:39 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Tickets 1006, 1007


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7-0] src/sys/arch/arm/allwinner

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:14:37 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner [netbsd-7-0]: awin_mmc.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1006):
sys/arch/arm/allwinner/awin_mmc.c: revision 1.22
Avoid a divide by 0 when unplugging a sd card.


To generate a diff of this commit:
cvs rdiff -u -r1.3.10.3 -r1.3.10.3.2.1 src/sys/arch/arm/allwinner/awin_mmc.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/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3 src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3.2.1
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3	Thu Dec  4 11:08:38 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c	Sat Nov  7 16:14:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.3.10.3 2014/12/04 11:08:38 martin Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.3.10.3.2.1 2015/11/07 16:14:37 riz Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.3 2014/12/04 11:08:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.3.2.1 2015/11/07 16:14:37 riz Exp $");
 
 #include 
 #include 
@@ -510,7 +510,10 @@ awin_mmc_bus_clock(sdmmc_chipset_handle_
 		sdly = awin_chip_id() == AWIN_CHIP_ID_A31 ? 0 : 7;
 		clksrc = AWIN_SD_CLK_SRC_SEL_OSC24M;
 		n = 2;
-		m = ((osc24m_freq / (1 << n)) / freq) - 1;
+		if (freq > 0)
+			m = ((osc24m_freq / (1 << n)) / freq) - 1;
+		else
+			m = 15;
 	} else if (freq <= 25000) {
 		odly = 0;
 		sdly = 5;

CVS commit: [netbsd-7-0] src/sys/arch/arm/allwinner

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov  7 16:14:37 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner [netbsd-7-0]: awin_mmc.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1006):
sys/arch/arm/allwinner/awin_mmc.c: revision 1.22
Avoid a divide by 0 when unplugging a sd card.


To generate a diff of this commit:
cvs rdiff -u -r1.3.10.3 -r1.3.10.3.2.1 src/sys/arch/arm/allwinner/awin_mmc.c

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