date:20161008

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 23:40:52 UTC 2016

Modified Files:
src/external/gpl2/groff/dist/src/roff/troff: input.cpp

Log Message:
Revert half of the last commit. Turns out that in some contexts,
BEGIN_QUOTE/END_QUOTE is used intentionally as non-char marker.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3	Sat Oct  8 20:44:59 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp	Sat Oct  8 23:40:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.cpp,v 1.3 2016/10/08 20:44:59 joerg Exp $	*/
+/*	$NetBSD: input.cpp,v 1.4 2016/10/08 23:40:52 joerg Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -941,11 +941,11 @@ static int get_copy(node **nd, int defin
   compatible_flag = input_stack::get_compatible_flag();
   continue;
 }
-if (c == (char)BEGIN_QUOTE) {
+if (c == BEGIN_QUOTE) {
   input_stack::increase_level();
   continue;
 }
-if (c == (char)END_QUOTE) {
+if (c == END_QUOTE) {
   input_stack::decrease_level();
   continue;
 }

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:44:59 UTC 2016

Modified Files:
src/external/gpl2/groff/dist/src/roff/troff: input.cpp

Log Message:
BEGIN_QUOTE and END_QUOTE have values outside the range of a signed char
for non-EBCDIC host. Explicitly cast them to char to avoid the implicit
cast.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.2 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.2	Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp	Sat Oct  8 20:44:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.cpp,v 1.2 2016/01/13 19:01:59 christos Exp $	*/
+/*	$NetBSD: input.cpp,v 1.3 2016/10/08 20:44:59 joerg Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -941,11 +941,11 @@ static int get_copy(node **nd, int defin
   compatible_flag = input_stack::get_compatible_flag();
   continue;
 }
-if (c == BEGIN_QUOTE) {
+if (c == (char)BEGIN_QUOTE) {
   input_stack::increase_level();
   continue;
 }
-if (c == END_QUOTE) {
+if (c == (char)END_QUOTE) {
   input_stack::decrease_level();
   continue;
 }
@@ -4238,12 +4238,12 @@ static void interpolate_arg(symbol nm)
 string args;
 for (int i = 1; i <= limit; i++) {
   args += '"';
-  args += BEGIN_QUOTE;
+  args += (char)BEGIN_QUOTE;
   input_iterator *p = input_stack::get_arg(i);
   int c;
   while ((c = p->get(0)) != EOF)
 	args += c;
-  args += END_QUOTE;
+  args += (char)END_QUOTE;
   args += '"';
   if (i != limit)
 	args += ' ';

CVS commit: src/external/gpl2/texinfo/dist/info

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:35:00 UTC 2016

Modified Files:
src/external/gpl2/texinfo/dist/info: infokey.c

Log Message:
Explicitly cast Meta(c) to char as the intermediate value can be too
large for a signed character.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/dist/info/infokey.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/gpl2/texinfo/dist/info/infokey.c
diff -u src/external/gpl2/texinfo/dist/info/infokey.c:1.2 src/external/gpl2/texinfo/dist/info/infokey.c:1.3
--- src/external/gpl2/texinfo/dist/info/infokey.c:1.2	Thu Jan 14 00:34:52 2016
+++ src/external/gpl2/texinfo/dist/info/infokey.c	Sat Oct  8 20:34:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: infokey.c,v 1.2 2016/01/14 00:34:52 christos Exp $	*/
+/*	$NetBSD: infokey.c,v 1.3 2016/10/08 20:34:59 joerg Exp $	*/
 
 /* infokey.c -- compile ~/.infokey to ~/.info.
Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp 
@@ -446,7 +446,7 @@ compile (FILE *fp, const char *filename,
 #define	To_seq(c) \
 		  do { \
 		if (slen < sizeof seq) \
-		  seq[slen++] = meta ? Meta(c) : (c); \
+		  seq[slen++] = meta ? (char)Meta(c) : (c); \
 		else \
 		  { \
 			syntax_error(filename, lnum, _("key sequence too long"), \

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

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:30:55 UTC 2016

Modified Files:
src/sys/arch/sparc/include: cpuconf.h

Log Message:
Macros expanding to defined() expression is not actually correct ISO C
behavior. Since it is not clear whether someone might decide to define
the macros to random non-1 values, introduce a level of indirection and
count the same of the helper macros.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/include/cpuconf.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/sparc/include/cpuconf.h
diff -u src/sys/arch/sparc/include/cpuconf.h:1.4 src/sys/arch/sparc/include/cpuconf.h:1.5
--- src/sys/arch/sparc/include/cpuconf.h:1.4	Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/include/cpuconf.h	Sat Oct  8 20:30:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuconf.h,v 1.4 2005/12/11 12:19:05 christos Exp $	*/
+/*	$NetBSD: cpuconf.h,v 1.5 2016/10/08 20:30:54 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -76,8 +76,28 @@ extern int cputyp;
  * Step 1: Count the number of CPU types configured into the kernel.
  */
 #if defined(_KERNEL_OPT)
-#define	CPU_NTYPES	(defined(SUN4) + defined(SUN4C) + \
-			 defined(SUN4M) + defined(SUN4D))
+#ifdef SUN4
+#define	_CPU_NTYPES_SUN4 1
+#else
+#define	_CPU_NTYPES_SUN4 0
+#endif
+#ifdef SUN4C
+#define	_CPU_NTYPES_SUN4C 1
+#else
+#define	_CPU_NTYPES_SUN4C 0
+#endif
+#ifdef SUN4M
+#define	_CPU_NTYPES_SUN4M 1
+#else
+#define	_CPU_NTYPES_SUN4M 0
+#endif
+#ifdef SUN4D
+#define	_CPU_NTYPES_SUN4D 1
+#else
+#define	_CPU_NTYPES_SUN4D 0
+#endif
+#define	CPU_NTYPES	(_CPU_NTYPES_SUN4 + _CPU_NTYPES_SUN4C + \
+			 _CPU_NTYPES_SUN4M + _CPU_NTYPES_SUN4D)
 #else
 #define	CPU_NTYPES	0
 #endif

CVS commit: src/sys/netmpls

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:19:37 UTC 2016

Modified Files:
src/sys/netmpls: mpls.h

Log Message:
Assert size for sockaddr_mpls, but don't require it to be packed.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/netmpls/mpls.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/netmpls/mpls.h
diff -u src/sys/netmpls/mpls.h:1.1 src/sys/netmpls/mpls.h:1.2
--- src/sys/netmpls/mpls.h:1.1	Sat Jun 26 14:24:28 2010
+++ src/sys/netmpls/mpls.h	Sat Oct  8 20:19:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpls.h,v 1.1 2010/06/26 14:24:28 kefren Exp $ */
+/*	$NetBSD: mpls.h,v 1.2 2016/10/08 20:19:37 joerg Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ struct sockaddr_mpls {
 	uint8_t smpls_family;
 	uint8_t smpls_pad[2];
 	union mpls_shim smpls_addr;
-} __packed;
-
+};
+__CTASSERT(sizeof(struct sockaddr_mpls) == 8);
 
 #endif /* !_NETMPLS_MPLS_H_ */

CVS commit: src/external/mit/xorg/server

2016-10-08 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Sat Oct  8 20:08:57 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile

Log Message:
set XFree86LOADER for all xorg-server driver builds again,
it's still needed for many drivers and would normally be
set in xorg-server.h.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23	Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Sat Oct  8 20:08:57 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.23 2016/09/26 22:37:31 mrg Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
@@ -37,10 +37,11 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-DHAVE_XORG_SERVER_1_1_0 \
 		-DSERVER_1_5 \
 		-DXSERVER_LIBPCIACCESS \
-		-DHAVE_XEXTPROTO_71
+		-DHAVE_XEXTPROTO_71 \
+		-DXFree86LOADER
 
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-CPPFLAGS+=	-DHAVE_XAA_H -DXFree86LOADER
+CPPFLAGS+=	-DHAVE_XAA_H
 .endif
 
 CPPFLAGS+=	-DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.25
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24	Mon Sep 19 19:15:04 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Sat Oct  8 20:08:57 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2016/09/19 19:15:04 christos Exp $
+#	$NetBSD: Makefile,v 1.25 2016/10/08 20:08:57 mrg Exp $
 
 .include 
 
@@ -178,7 +178,6 @@ CPPFLAGS+=	-DUMS=1
 CPPFLAGS+=	-DUSE_BACKLIGHT=1
 CPPFLAGS+=	-DUSE_SNA=1
 CPPFLAGS+=	-DUSE_UXA=1
-CPPFLAGS+=	-DXFree86LOADER
 
 # XXX This should not be hard-coded here...
 DRI_DRIVER_PATH=	/usr/X11R7/lib/modules/dri

Index: src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6	Tue Sep 27 02:33:16 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile	Sat Oct  8 20:08:57 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/09/27 02:33:16 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2016/10/08 20:08:57 mrg Exp $
 
 DRIVER=		xf86-video-vesa
 DRIVER_NAME=	vesa_drv
@@ -7,6 +7,5 @@ SRCS=		vesa.c
 MAN=		vesa.4
 
 COPTS.vesa.c+=	-Wno-error
-CPPFLAGS+=-DXFree86LOADER
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11	Sat Oct  8 10:21:18 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile	Sat Oct  8 20:08:57 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2016/10/08 10:21:18 ryoon Exp $
+#	$NetBSD: Makefile,v 1.12 2016/10/08 20:08:57 mrg Exp $
 
 DRIVER=		xf86-video-vmware
 DRIVER_NAME=	vmware_drv
@@ -19,7 +19,6 @@ MAN=	vmware.4
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
 		-I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+=	-DXFree86LOADER
 
 # XXX
 COPTS.vmware.c+= 	-Wno-error

Index:

CVS commit: src/external/mit/xorg/server

2016-10-08 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Sat Oct  8 20:03:04 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile

Log Message:
don't undefine XFree86LOADER twice.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2	Wed Jun 29 19:36:35 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile	Sat Oct  8 20:03:04 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
 
 .include 
 
@@ -45,7 +45,6 @@ CPPFLAGS.InitInput.c=	${X11FLAGS.EXTENSI
 			-UGLXEXT
 CPPFLAGS.miinitext.c=	${X11FLAGS.EXTENSION} \
 			-DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
-			-UXFree86LOADER \
 			-UGLXEXT
 CPPFLAGS.dpmsstubs.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15	Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Sat Oct  8 20:03:04 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2016/10/08 20:03:04 mrg Exp $
 
 .include 
 
@@ -44,7 +44,6 @@ CPPFLAGS+=	-UDDXTIME
 CPPFLAGS.InitInput.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT
 CPPFLAGS.miinitext.c=	${X11FLAGS.EXTENSION} \
-			-UXFree86LOADER \
 			-UGLXEXT
 CPPFLAGS.dpmsstubs.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT

CVS commit: src/share/man/man4

2016-10-08 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Sat Oct  8 17:46:07 UTC 2016

Modified Files:
src/share/man/man4: nvme.4

Log Message:
Paul fixed the kernel module to load independently of other ld attachments,
remove the module note


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/nvme.4

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

Modified files:

Index: src/share/man/man4/nvme.4
diff -u src/share/man/man4/nvme.4:1.6 src/share/man/man4/nvme.4:1.7
--- src/share/man/man4/nvme.4:1.6	Wed Sep 21 20:12:12 2016
+++ src/share/man/man4/nvme.4	Sat Oct  8 17:46:06 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nvme.4,v 1.6 2016/09/21 20:12:12 wiz Exp $
+.\"	$NetBSD: nvme.4,v 1.7 2016/10/08 17:46:06 jdolecek Exp $
 .\"	$OpenBSD: nvme.4,v 1.2 2016/04/14 11:53:37 jmc Exp $
 .\"
 .\" Copyright (c) 2016 David Gwynne 
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd September 21, 2016
+.Dd October 8, 2016
 .Dt NVME 4
 .Os
 .Sh NAME
@@ -149,7 +149,3 @@ controller responds to commands only the
 after reboot or module reload it stops responding.
 The virtual machine must be completely powered off
 (or even killed) to fix this.
-.Pp
-.Nm
-kernel module is currently only loadable for kernels configured with
-.Dq no ld .

CVS commit: src/sys/net

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 17:40:12 UTC 2016

Modified Files:
src/sys/net: if.h

Log Message:
Since IFF_MULTICAST's value can't be represented without implicit cast
as signed short, make if_flags unsigned.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/net/if.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/net/if.h
diff -u src/sys/net/if.h:1.227 src/sys/net/if.h:1.228
--- src/sys/net/if.h:1.227	Mon Oct  3 11:06:06 2016
+++ src/sys/net/if.h	Sat Oct  8 17:40:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.h,v 1.227 2016/10/03 11:06:06 ozaki-r Exp $	*/
+/*	$NetBSD: if.h,v 1.228 2016/10/08 17:40:12 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -243,7 +243,7 @@ typedef struct ifnet {
 	struct bpf_if *if_bpf;		/* packet filter structure */
 	if_index_t	if_index;	/* numeric abbreviation for this if */
 	short	if_timer;		/* time 'til if_slowtimo called */
-	short	if_flags;		/* up/down, broadcast, etc. */
+	unsigned short	if_flags;	/* up/down, broadcast, etc. */
 	short	if_extflags;		/* if_output MP-safe, etc. */
 	struct	if_data if_data;	/* statistics and other data about if */
 	/*

CVS commit: src/sys/sys

2016-10-08 Thread Adrian Steinmann

Module Name:src
Committed By:   ast
Date:   Sat Oct  8 17:28:17 UTC 2016

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

Log Message:
white space


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/fstypes.h

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

Modified files:

Index: src/sys/sys/fstypes.h
diff -u src/sys/sys/fstypes.h:1.33 src/sys/sys/fstypes.h:1.34
--- src/sys/sys/fstypes.h:1.33	Wed May  6 15:57:08 2015
+++ src/sys/sys/fstypes.h	Sat Oct  8 17:28:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstypes.h,v 1.33 2015/05/06 15:57:08 hannken Exp $	*/
+/*	$NetBSD: fstypes.h,v 1.34 2016/10/08 17:28:17 ast Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -267,7 +267,7 @@ typedef struct fhandle	fhandle_t;
 	"\20" \
 	"\13IMNT_ONWORKLIST" \
 	"\12IMNT_CAN_RWTORO" \
-"\11IMNT_MPSAFE" \
+	"\11IMNT_MPSAFE" \
 	"\10IMNT_HAS_TRANS" \
 	"\07IMNT_DTYPE" \
 	"\03IMNT_WANTRDWR" \

CVS commit: src/sys/dev/ic

2016-10-08 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Sat Oct  8 16:05:32 UTC 2016

Modified Files:
src/sys/dev/ic: nvmereg.h

Log Message:
add defines for dataset management (from NVMe spec rev 1.2)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/nvmereg.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/ic/nvmereg.h
diff -u src/sys/dev/ic/nvmereg.h:1.5 src/sys/dev/ic/nvmereg.h:1.6
--- src/sys/dev/ic/nvmereg.h:1.5	Sat Sep 17 23:59:30 2016
+++ src/sys/dev/ic/nvmereg.h	Sat Oct  8 16:05:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmereg.h,v 1.5 2016/09/17 23:59:30 jdolecek Exp $	*/
+/*	$NetBSD: nvmereg.h,v 1.6 2016/10/08 16:05:32 jdolecek Exp $	*/
 /*	$OpenBSD: nvmereg.h,v 1.10 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -188,10 +188,27 @@ struct nvme_sqe_io {
 
 	uint16_t	nlb;	/* Number of Logical Blocks */
 	uint16_t	ioflags;
-#define NVM_SQE_IO_FUA	__BIT(14)	/* Force Unit Access (bypass cache) */
 #define NVM_SQE_IO_LR	__BIT(15)	/* Limited Retry */
+#define NVM_SQE_IO_FUA	__BIT(14)	/* Force Unit Access (bypass cache) */
 
 	uint8_t		dsm;	/* Dataset Management */
+#define NVM_SQE_IO_INCOMP	__BIT(7)	/* Incompressible */
+#define NVM_SQE_IO_SEQ		__BIT(6)	/* Sequential request */
+#define NVM_SQE_IO_LAT_MASK	__BITS(4, 5)	/* Access Latency */
+#define  NVM_SQE_IO_LAT_NONE	0		/* Latency: none */
+#define  NVM_SQE_IO_LAT_IDLE	__BIT(4)	/* Latency: idle */
+#define  NVM_SQE_IO_LAT_NORMAL	__BIT(5)	/* Latency: normal */
+#define  NVM_SQE_IO_LAT_LOW	__BITS(4, 5)	/* Latency: low */
+#define NVM_SQE_IO_FREQ_MASK	__BITS(0, 3)	/* Access Frequency */
+#define  NVM_SQE_IO_FREQ_TYPICAL	0x1	/* Typical */
+#define  NVM_SQE_IO_FREQ_INFR_INFW	0x2	/* Infrequent read and writes */
+#define  NVM_SQE_IO_FREQ_FRR_INFW	0x3	/* Frequent read, inf. writes */
+#define  NVM_SQE_IO_FREQ_INFR_FRW	0x4	/* Inf. read, freq. writes */
+#define  NVM_SQE_IO_FREQ_FRR_FRW	0x5	/* Freq. read and writes */
+#define  NVM_SQE_IO_FREQ_ONCE		0x6	/* One time i/o operation */
+/* Extra Access Frequency bits for read operations */
+#define  NVM_SQE_IO_FREQ_SPEC		0x7	/* Speculative read - prefech */
+#define  NVM_SQE_IO_FREQ_OVERWRITE	0x8	/* Will be overwritten soon */
 	uint8_t		_reserved2[3];
 
 	uint32_t	eilbrt;	/* Expected Initial Logical Block

CVS commit: src/sys/dev/ic

2016-10-08 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Oct  8 15:57:11 UTC 2016

Modified Files:
src/sys/dev/ic: rt2860.c rt2860reg.h

Log Message:
sync antenna vals with OpenBSD, some changes from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/rt2860.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/rt2860reg.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/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.23 src/sys/dev/ic/rt2860.c:1.24
--- src/sys/dev/ic/rt2860.c:1.23	Tue Sep 27 16:37:05 2016
+++ src/sys/dev/ic/rt2860.c	Sat Oct  8 11:57:11 2016
@@ -1,6 +1,6 @@
-/*	$NetBSD: rt2860.c,v 1.23 2016/09/27 20:37:05 christos Exp $	*/
+/*	$NetBSD: rt2860.c,v 1.24 2016/10/08 15:57:11 christos Exp $	*/
 /*	$OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $	*/
-/*	$FreeBSD: head/sys/dev/ral/rt2860.c 297793 2016-04-10 23:07:00Z pfg $ */
+/*	$FreeBSD: head/sys/dev/ral/rt2860.c 306591 2016-10-02 20:35:55Z avos $ */
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini 
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.23 2016/09/27 20:37:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.24 2016/10/08 15:57:11 christos Exp $");
 
 #include 
 #include 
@@ -3228,6 +3228,7 @@ rt2860_get_rf(uint32_t rev)
 	case RT3070_RF_3053:	return "RT3053";
 	case RT5390_RF_5360:	return "RT5360";
 	case RT5390_RF_5390:	return "RT5390";
+	case RT5390_RF_5392:	return "RT5392";
 	default:		return "unknown";
 	}
 }
@@ -3250,9 +3251,11 @@ rt2860_read_eeprom(struct rt2860_softc *
 			sc->sc_srom_read = rt3090_efuse_read_2;
 	}
 
+#ifdef RAL_DEBUG
 	/* read EEPROM version */
 	val = rt2860_srom_read(sc, RT2860_EEPROM_VERSION);
 	DPRINTF(("EEPROM rev=%d, FAE=%d\n", val & 0xff, val >> 8));
+#endif
 
 	/* read MAC address */
 	val = rt2860_srom_read(sc, RT2860_EEPROM_MAC01);
@@ -3265,9 +3268,11 @@ rt2860_read_eeprom(struct rt2860_softc *
 	ic->ic_myaddr[4] = val & 0xff;
 	ic->ic_myaddr[5] = val >> 8;
 
+#ifdef RAL_DEBUG
 	/* read country code */
 	val = rt2860_srom_read(sc, RT2860_EEPROM_COUNTRY);
 	DPRINTF(("EEPROM region code=0x%04x\n", val));
+#endif
 
 	/* read vendor BBP settings */
 	for (i = 0; i < 8; i++) {
@@ -3309,33 +3314,12 @@ rt2860_read_eeprom(struct rt2860_softc *
 
 	/* read RF information */
 	val = rt2860_srom_read(sc, RT2860_EEPROM_ANTENNA);
-	if (sc->mac_ver >= 0x5390) {
+	if (sc->mac_ver >= 0x5390)
 		sc->rf_rev = rt2860_srom_read(sc, RT2860_EEPROM_CHIPID);
-		sc->ntxchains = (val >> 4) & 0xf;
-		sc->nrxchains = val & 0xf;
-	} else if (val == 0x) {
-		DPRINTF(("invalid EEPROM antenna info, using default\n"));
-		if (sc->mac_ver == 0x3593) {
-			/* default to RF3053 3T3R */
-			sc->rf_rev = RT3070_RF_3053;
-			sc->ntxchains = 3;
-			sc->nrxchains = 3;
-		} else if (sc->mac_ver >= 0x3071) {
-			/* default to RF3020 1T1R */
-			sc->rf_rev = RT3070_RF_3020;
-			sc->ntxchains = 1;
-			sc->nrxchains = 1;
-		} else {
-			/* default to RF2820 1T2R */
-			sc->rf_rev = RT2860_RF_2820;
-			sc->ntxchains = 1;
-			sc->nrxchains = 2;
-		}
-	} else {
+	else
 		sc->rf_rev = (val >> 8) & 0xf;
-		sc->ntxchains = (val >> 4) & 0xf;
-		sc->nrxchains = val & 0xf;
-	}
+	sc->ntxchains = (val >> 4) & 0xf;
+	sc->nrxchains = val & 0xf;
 	DPRINTF(("EEPROM RF rev=0x%02x chains=%dT%dR\n",
 	sc->rf_rev, sc->ntxchains, sc->nrxchains));
 
@@ -3865,7 +3849,9 @@ rt2860_init(struct ifnet *ifp)
 		rt2860_stop(ifp, 1);
 		return ETIMEDOUT;
 	}
-	tmp &= 0xff0;
+	tmp &= ~(RT2860_RX_DMA_BUSY | RT2860_RX_DMA_EN | RT2860_TX_DMA_BUSY |
+	RT2860_TX_DMA_EN);
+	tmp |= RT2860_TX_WB_DDONE;
 	RAL_WRITE(sc, RT2860_WPDMA_GLO_CFG, tmp);
 
 	/* disable interrupts mitigation */
@@ -3882,7 +3868,7 @@ rt2860_init(struct ifnet *ifp)
 	if (sc->rf_rev == RT3070_RF_2020 ||
 	sc->rf_rev == RT3070_RF_3020 ||
 	sc->rf_rev == RT3070_RF_3320 ||
-	sc->mac_ver == 0x5390)
+	sc->rf_rev == RT5390_RF_5390)
 		rt3090_set_rx_antenna(sc, 0);
 
 	/* send LEDs operating mode to microcontroller */

Index: src/sys/dev/ic/rt2860reg.h
diff -u src/sys/dev/ic/rt2860reg.h:1.6 src/sys/dev/ic/rt2860reg.h:1.7
--- src/sys/dev/ic/rt2860reg.h:1.6	Fri Sep 16 05:25:30 2016
+++ src/sys/dev/ic/rt2860reg.h	Sat Oct  8 11:57:11 2016
@@ -1,5 +1,6 @@
-/*	$NetBSD: rt2860reg.h,v 1.6 2016/09/16 09:25:30 mlelstv Exp $	*/
-/*	$OpenBSD: rt2860reg.h,v 1.32 2014/05/24 10:10:17 stsp Exp $	*/
+/*	$NetBSD: rt2860reg.h,v 1.7 2016/10/08 15:57:11 christos Exp $	*/
+/*	$OpenBSD: rt2860reg.h,v 1.33 2016/08/17 11:50:52 stsp Exp $	*/
+/*	$FreeBSD: head/sys/dev/ral/rt2860reg.h 301575 2016-06-08 02:37:23Z kevlo */
 
 /*-
  * Copyright (c) 2007
@@ -83,8 +84,6 @@
 #define RT3070_LDO_CFG0			0x05d4
 #define RT3070_GPIO_SWITCH		0x05dc
 
-
-
 /* RT5592 registers */
 #define RT5592_DEBUG_INDEX		0x05e8
 
@@ -767,6 +766,11 @@
 #define RT3593_CP_IC_MASK	0xe0
 #define RT3593_CP_IC_SHIFT	5
 
+/* possible flags

CVS commit: src/sys/compat

2016-10-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Oct  8 15:48:07 UTC 2016

Modified Files:
src/sys/compat/sunos: sunos_ioctl.c
src/sys/compat/ultrix: ultrix_ioctl.c

Log Message:
Uninitialized var, found by mootja; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/sunos/sunos_ioctl.c
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/ultrix/ultrix_ioctl.c

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

Modified files:

Index: src/sys/compat/sunos/sunos_ioctl.c
diff -u src/sys/compat/sunos/sunos_ioctl.c:1.67 src/sys/compat/sunos/sunos_ioctl.c:1.68
--- src/sys/compat/sunos/sunos_ioctl.c:1.67	Sat Dec 12 17:48:18 2015
+++ src/sys/compat/sunos/sunos_ioctl.c	Sat Oct  8 15:48:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $	*/
+/*	$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $	*/
 
 /*
  * Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $");
 
 #include 
 #include 
@@ -443,7 +443,7 @@ sunos_sys_ioctl(struct lwp *l, const str
 	{
 		int x;	/* unused */
 
-		error = copyin((void *), SCARG(uap, data), sizeof x);
+		error = copyin(SCARG(uap, data), (void *), sizeof x);
 		break;
 	}
 	case _IOR('t', 100, int):	/* sun SUNOS_TIOCSSOFTCAR */

Index: src/sys/compat/ultrix/ultrix_ioctl.c
diff -u src/sys/compat/ultrix/ultrix_ioctl.c:1.36 src/sys/compat/ultrix/ultrix_ioctl.c:1.37
--- src/sys/compat/ultrix/ultrix_ioctl.c:1.36	Mon Dec 14 00:47:12 2009
+++ src/sys/compat/ultrix/ultrix_ioctl.c	Sat Oct  8 15:48:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultrix_ioctl.c,v 1.36 2009/12/14 00:47:12 matt Exp $ */
+/*	$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $ */
 /*	from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.36 2009/12/14 00:47:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_ultrix.h"
@@ -491,7 +491,7 @@ ultrix_sys_ioctl(struct lwp *l, const st
 	{
 		int x;	/* unused */
 
-		return copyin(, SCARG(, data), sizeof x);
+		return copyin(SCARG(, data), , sizeof x);
 	}
 	case _IOR('t', 100, int):	/* sun SUNOS_TIOCSSOFTCAR */
 	{

CVS commit: src/tests/fs/ffs

2016-10-08 Thread Andreas Gustafsson

Module Name:src
Committed By:   gson
Date:   Sat Oct  8 13:23:53 UTC 2016

Modified Files:
src/tests/fs/ffs: ffs_common.sh

Log Message:
Incrase timeout for the benefit of the walk_list_user test case which
sometimes times out under qemu under Linux, where the timing is more
accurate than under qemu under NetBSD where the the 60 second timeout
typically takes more than 60 seconds to trigger.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/ffs_common.sh

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

Modified files:

Index: src/tests/fs/ffs/ffs_common.sh
diff -u src/tests/fs/ffs/ffs_common.sh:1.2 src/tests/fs/ffs/ffs_common.sh:1.3
--- src/tests/fs/ffs/ffs_common.sh:1.2	Mon Jul 29 13:15:24 2013
+++ src/tests/fs/ffs/ffs_common.sh	Sat Oct  8 13:23:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ffs_common.sh,v 1.2 2013/07/29 13:15:24 skrll Exp $ 
+# $NetBSD: ffs_common.sh,v 1.3 2016/10/08 13:23:53 gson Exp $ 
 
 create_ffs()
 {
@@ -45,7 +45,7 @@ test_case()
 
 	eval "${name}_head() { \
 		atf_set "descr" "${descr}"
-		atf_set "timeout" "60"
+		atf_set "timeout" "120"
 	}"
 	eval "${name}_body() { \
 		RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \

CVS commit: xsrc/external/mit/xf86-video-vmware/include

2016-10-08 Thread Ryo ONODERA

Module Name:xsrc
Committed By:   ryoon
Date:   Sat Oct  8 10:24:07 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-vmware/include: config.h

Log Message:
Fix segfault when xf86-video-vmware module loads libvgahw


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-vmware/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-vmware/include/config.h
diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.11 xsrc/external/mit/xf86-video-vmware/include/config.h:1.12
--- xsrc/external/mit/xf86-video-vmware/include/config.h:1.11	Fri Feb 13 08:00:39 2015
+++ xsrc/external/mit/xf86-video-vmware/include/config.h	Sat Oct  8 10:24:07 2016
@@ -43,7 +43,7 @@
 #undef HAVE_XA_2
 
 /* Has version 1.12.0 or greater of the Xserver */
-#undef HAVE_XORG_SERVER_1_12_0
+#define HAVE_XORG_SERVER_1_12_0
 
 /* Has version 1.1.0 or greater of the Xserver */
 #define HAVE_XORG_SERVER_1_1_0 1

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vmware

2016-10-08 Thread Ryo ONODERA

Module Name:src
Committed By:   ryoon
Date:   Sat Oct  8 10:21:18 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile

Log Message:
Fix module load error of vmware_drv.so


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.10	Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile	Sat Oct  8 10:21:18 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2016/08/16 07:10:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2016/10/08 10:21:18 ryoon Exp $
 
 DRIVER=		xf86-video-vmware
 DRIVER_NAME=	vmware_drv
@@ -19,6 +19,7 @@ MAN=	vmware.4
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
 		-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-DXFree86LOADER
 
 # XXX
 COPTS.vmware.c+= 	-Wno-error

CVS commit: src/sys/arch/mips/mips

2016-10-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Oct  8 08:19:22 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mips_fixup.c

Log Message:
Sign extend VA for cache operations.

OK matt@


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/mips/mips_fixup.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/mips/mips/mips_fixup.c
diff -u src/sys/arch/mips/mips/mips_fixup.c:1.18 src/sys/arch/mips/mips/mips_fixup.c:1.19
--- src/sys/arch/mips/mips/mips_fixup.c:1.18	Thu Aug 18 19:25:34 2016
+++ src/sys/arch/mips/mips/mips_fixup.c	Sat Oct  8 08:19:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_fixup.c,v 1.18 2016/08/18 19:25:34 skrll Exp $	*/
+/*	$NetBSD: mips_fixup.c,v 1.19 2016/10/08 08:19:22 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.18 2016/08/18 19:25:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.19 2016/10/08 08:19:22 skrll Exp $");
 
 #include "opt_mips3_wired.h"
 #include "opt_multiprocessor.h"
@@ -157,7 +157,7 @@ mips_fixup_exceptions(mips_fixup_callbac
 	}
 
 	if (fixed)
-		mips_icache_sync_range((vaddr_t)start,
+		mips_icache_sync_range((intptr_t)start,
 		   sizeof(start[0]) * (end - start));
 
 	return fixed;
@@ -491,7 +491,7 @@ mips_fixup_stubs(uint32_t *start, uint32
 	if (sizeof(uint32_t [end - start]) > mips_cache_info.mci_picache_size)
 		mips_icache_sync_all();
 	else
-		mips_icache_sync_range((vaddr_t)start,
+		mips_icache_sync_range((intptr_t)start,
 		sizeof(uint32_t [end - start]));
 
 #ifdef DEBUG

CVS commit: src/sbin/mount

2016-10-08 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Sat Oct  8 06:47:59 UTC 2016

Modified Files:
src/sbin/mount: mount.c

Log Message:
change warning message

previously attempting to use mount -t ext2 like myself would result in
the warning "mount: mount_ext2 not found for /mnt", which (if you're me)
can be misunderstood as "/mnt is not an ext2 filesystem"...

change it to "mount: mount_ext2 not found"


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sbin/mount/mount.c

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

Modified files:

Index: src/sbin/mount/mount.c
diff -u src/sbin/mount/mount.c:1.100 src/sbin/mount/mount.c:1.101
--- src/sbin/mount/mount.c:1.100	Sun Jan  4 22:05:37 2015
+++ src/sbin/mount/mount.c	Sat Oct  8 06:47:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.c,v 1.100 2015/01/04 22:05:37 pooka Exp $	*/
+/*	$NetBSD: mount.c,v 1.101 2016/10/08 06:47:59 maya Exp $	*/
 
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.100 2015/01/04 22:05:37 pooka Exp $");
+__RCSID("$NetBSD: mount.c,v 1.101 2016/10/08 06:47:59 maya Exp $");
 #endif
 #endif /* not lint */
 
@@ -503,7 +503,7 @@ mountfs(const char *vfstype, const char 
 		} while (*++edir != NULL);
 
 		if (errno == ENOENT)
-			warnx("%s not found for %s", execbase, name);
+			warnx("%s not found", execbase);
 		_exit(1);
 		/* NOTREACHED */

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

CVS commit: src/external/gpl2/texinfo/dist/info

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

CVS commit: src/sys/netmpls

CVS commit: src/external/mit/xorg/server

CVS commit: src/external/mit/xorg/server

CVS commit: src/share/man/man4

CVS commit: src/sys/net

CVS commit: src/sys/sys

CVS commit: src/sys/dev/ic

CVS commit: src/sys/dev/ic

CVS commit: src/sys/compat

CVS commit: src/tests/fs/ffs

CVS commit: xsrc/external/mit/xf86-video-vmware/include

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vmware

CVS commit: src/sys/arch/mips/mips

CVS commit: src/sbin/mount

18 matches

Site Navigation

Mail list logo

Footer information