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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 30 07:35:14 UTC 2016

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
catch up with physmem type change (in the same manner as sdp24xx_machdep.c)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/gemini/gemini_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/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.23 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.24
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.23	Thu Dec 22 14:47:55 2016
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c	Fri Dec 30 07:35:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $	*/
+/*	$NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $	*/
 
 /* adapted from:
  *	NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -1150,7 +1150,7 @@ printf("%s:%d: pmap_link_l2pt ipmq_pt\n"
 
 	printf(mem_fmt, "SDRAM", physical_start, physical_end-1,
 	KERN_PHYSTOV(physical_start), KERN_PHYSTOV(physical_end-1),
-	physmem);
+	(int)physmem);
 	printf(mem_fmt, "text section",
 	   KERN_VTOPHYS(KERNEL_BASE_virt), KERN_VTOPHYS(etext-1),
 	   (vaddr_t)KERNEL_BASE_virt, (vaddr_t)etext-1,

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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 30 07:35:14 UTC 2016

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
catch up with physmem type change (in the same manner as sdp24xx_machdep.c)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/gemini/gemini_machdep.c

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 03:36:51 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
sort, kill typo


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/xlint/lint1/cgram.y

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.89 src/usr.bin/xlint/lint1/cgram.y:1.90
--- src/usr.bin/xlint/lint1/cgram.y:1.89	Thu Dec 29 21:16:36 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 22:36:51 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.89 2016/12/30 02:16:36 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.90 2016/12/30 03:36:51 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.89 2016/12/30 02:16:36 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.90 2016/12/30 03:36:51 christos Exp $");
 #endif
 
 #include 
@@ -209,14 +209,14 @@ anonymize(sym_t *s)
 %token 		T_AT_FORMAT_ARG
 %token 		T_AT_FORMAT_PRINTF
 %token 		T_AT_FORMAT_SCANF
-%token 		T_AT_FORMAT_STRFTIME
 %token 		T_AT_FORMAT_STRFMON
+%token 		T_AT_FORMAT_STRFTIME
 %token 		T_AT_GNU_INLINE
 %token 		T_AT_MAY_ALIAS
 %token 		T_AT_MINBYTES
 %token 		T_AT_MODE
-%token 		T_AT_NORETURN
 %token 		T_AT_NONNULL
+%token 		T_AT_NORETURN
 %token 		T_AT_NO_INSTRUMENT_FUNCTION
 %token 		T_AT_PACKED
 %token 		T_AT_PURE
@@ -224,7 +224,6 @@ anonymize(sym_t *s)
 %token 		T_AT_SECTION
 %token 		T_AT_SENTINEL
 %token 		T_AT_STRING
-%token 		T_AT_TUINION
 %token 		T_AT_TUNION
 %token 		T_AT_UNUSED
 %token 		T_AT_USED

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 03:36:51 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
sort, kill typo


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/xlint/lint1/cgram.y

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 02:16:36 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
add bounded, fix nonnull


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 02:16:36 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
add bounded, fix nonnull


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.88 src/usr.bin/xlint/lint1/cgram.y:1.89
--- src/usr.bin/xlint/lint1/cgram.y:1.88	Thu Dec 29 18:54:29 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 21:16:36 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.88 2016/12/29 23:54:29 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.89 2016/12/30 02:16:36 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.88 2016/12/29 23:54:29 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.89 2016/12/30 02:16:36 christos Exp $");
 #endif
 
 #include 
@@ -201,6 +201,7 @@ anonymize(sym_t *s)
 %token 		T_AT_ALIAS
 %token 		T_AT_ALIGNED
 %token 		T_AT_ALWAYS_INLINE
+%token 		T_AT_BOUNDED
 %token 		T_AT_COLD
 %token 		T_AT_CONSTRUCTOR
 %token 		T_AT_DEPRECATED
@@ -212,15 +213,17 @@ anonymize(sym_t *s)
 %token 		T_AT_FORMAT_STRFMON
 %token 		T_AT_GNU_INLINE
 %token 		T_AT_MAY_ALIAS
+%token 		T_AT_MINBYTES
 %token 		T_AT_MODE
 %token 		T_AT_NORETURN
-%token 		T_AT_NON_NULL
+%token 		T_AT_NONNULL
 %token 		T_AT_NO_INSTRUMENT_FUNCTION
 %token 		T_AT_PACKED
 %token 		T_AT_PURE
 %token 		T_AT_RETURNS_TWICE
 %token 		T_AT_SECTION
 %token 		T_AT_SENTINEL
+%token 		T_AT_STRING
 %token 		T_AT_TUINION
 %token 		T_AT_TUNION
 %token 		T_AT_UNUSED
@@ -512,9 +515,13 @@ type_attribute_format_type:
 type_attribute_spec:
 	  T_AT_DEPRECATED
 	| T_AT_ALIGNED T_LPARN constant T_RPARN
+	| T_AT_BOUNDED T_LPARN T_AT_MINBYTES T_COMMA constant T_COMMA
+	  constant T_RPARN
+	| T_AT_BOUNDED T_LPARN T_AT_STRING T_COMMA constant T_COMMA
+	  constant T_RPARN
 	| T_AT_SENTINEL T_LPARN constant T_RPARN
 	| T_AT_FORMAT_ARG T_LPARN constant T_RPARN
-	| T_AT_NON_NULL T_LPARN constant T_RPARN
+	| T_AT_NONNULL T_LPARN constant T_RPARN
 	| T_AT_MODE T_LPARN T_NAME T_RPARN
 	| T_AT_ALIAS T_LPARN string T_RPARN
 	| T_AT_SECTION T_LPARN string T_RPARN

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.74 src/usr.bin/xlint/lint1/scan.l:1.75
--- src/usr.bin/xlint/lint1/scan.l:1.74	Thu Dec 29 19:57:10 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 21:16:36 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.74 2016/12/30 00:57:10 christos Exp $ */
+/* $NetBSD: scan.l,v 1.75 2016/12/30 02:16:36 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.74 2016/12/30 00:57:10 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.75 2016/12/30 02:16:36 christos Exp $");
 #endif
 
 #include 
@@ -215,6 +215,7 @@ static	struct	kwtab {
 	{ "asm",	T_ASM,		0,	0,	0,	  0,0,1,0,7 },
 	{ "attribute",	T_ATTRIBUTE,	0,	0,	0,	  0,0,1,0,6 },
 	{ "auto",	T_SCLASS,	AUTO,	0,	0,	  0,0,0,0,1 },
+	{ "bounded",	T_AT_BOUNDED,	0,	0,	0,	  0,0,1,1,5 },
 	{ "break",	T_BREAK,	0,	0,	0,	  0,0,0,0,1 },
 	{ "case",	T_CASE,		0,	0,	0,	  0,0,0,0,1 },
 	{ "char",	T_TYPE,		0,	CHAR,	0,	  0,0,0,0,1 },
@@ -242,10 +243,11 @@ static	struct	kwtab {
 	{ "int",	T_TYPE,		0,	INT,	0,	  0,0,0,0,1 },
 	{ "long",	T_TYPE,		0,	LONG,	0,	  0,0,0,0,1 },
 	{ "may_alias",	T_AT_MAY_ALIAS,	0,	0,	0,	  0,0,1,1,5 },
+	{ "minbytes",	T_AT_MINBYTES,	0,	0,	0,	  0,0,1,1,5 },
 	{ "mode",	T_AT_MODE,	0,	0,	0,	  0,0,1,1,5 },
 	{ "no_instrument_function", T_AT_NO_INSTRUMENT_FUNCTION,
 	0,	0,	0,	  0,0,1,1,5 },
-	{ "non_null",	T_AT_NON_NULL,	0,	0,	0,	  0,0,1,1,5 },
+	{ "nonnull",	T_AT_NONNULL,	0,	0,	0,	  0,0,1,1,5 },
 	{ "noreturn",	T_AT_NORETURN,	0,	0,	0,	  0,0,1,1,5 },
 	{ "packed",	T_AT_PACKED,	0,	0,	0,	  0,0,1,1,5 },
 	{ "packed",	T_PACKED,	0,	0,	0,	  0,0,0,0,2 },
@@ -265,6 +267,7 @@ static	struct	kwtab {
 	{ "static",	T_SCLASS,	STATIC,	0,	0,	  0,0,0,0,1 },
 	{ "strfmon",	T_AT_FORMAT_STRFMON,0,	0,	0,	  0,0,1,1,5 },
 	{ "strftime",	T_AT_FORMAT_STRFTIME,0,	0,	0,	  0,0,1,1,5 },
+	{ "string",	T_AT_STRING,	0,	0,	0,	  0,0,1,1,5 },
 	{ "struct",	T_SOU,		0,	STRUCT,	0,	  0,0,0,0,1 },
 	{ "switch",	T_SWITCH,	0,	0,	0,	  0,0,0,0,1 },
 	{ "symbolrename", T_SYMBOLRENAME, 0,	0,	0,	  0,0,0,0,2 },

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 00:57:10 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: scan.l

Log Message:
fix __typeof


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.73 src/usr.bin/xlint/lint1/scan.l:1.74
--- src/usr.bin/xlint/lint1/scan.l:1.73	Thu Dec 29 18:54:29 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 19:57:10 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.73 2016/12/29 23:54:29 christos Exp $ */
+/* $NetBSD: scan.l,v 1.74 2016/12/30 00:57:10 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.73 2016/12/29 23:54:29 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.74 2016/12/30 00:57:10 christos Exp $");
 #endif
 
 #include 
@@ -270,7 +270,7 @@ static	struct	kwtab {
 	{ "symbolrename", T_SYMBOLRENAME, 0,	0,	0,	  0,0,0,0,2 },
 	{ "transparent_union",T_AT_TUNION,0,	0,	0,	  0,0,1,1,5 },
 	{ "typedef",	T_SCLASS,	TYPEDEF, 0,	0,	  0,0,0,0,1 },
-	{ "typeof",	T_TYPEOF,	0,	0,	0,	  0,0,1,0,5 },
+	{ "typeof",	T_TYPEOF,	0,	0,	0,	  0,0,1,0,7 },
 	{ "union",	T_SOU,		0,	UNION,	0,	  0,0,0,0,1 },
 	{ "unsigned",	T_TYPE,		0,	UNSIGN,	0,	  0,0,0,0,1 },
 	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0,0,1,1,5 },

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 30 00:57:10 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: scan.l

Log Message:
fix __typeof


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Dec 30 00:36:23 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
gcc-6.3 out.


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1385 src/doc/3RDPARTY:1.1386
--- src/doc/3RDPARTY:1.1385	Sun Dec 25 00:10:33 2016
+++ src/doc/3RDPARTY	Fri Dec 30 00:36:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1385 2016/12/25 00:10:33 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1386 2016/12/30 00:36:23 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -439,7 +439,7 @@ There is a flex2netbsd script to help ne
 
 Package:	gcc
 Version:	4.8.5/5.4
-Current Vers:	4.8.5/5.4/6.2
+Current Vers:	4.8.5/5.4/6.3
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
 Home Page:	http://www.gnu.org/software/gcc/

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Dec 30 00:36:42 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
flex-2.6.2 out.


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

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

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Dec 30 00:36:42 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
flex-2.6.2 out.


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1386 src/doc/3RDPARTY:1.1387
--- src/doc/3RDPARTY:1.1386	Fri Dec 30 00:36:23 2016
+++ src/doc/3RDPARTY	Fri Dec 30 00:36:41 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1386 2016/12/30 00:36:23 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1387 2016/12/30 00:36:41 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -426,7 +426,7 @@ use file2netbsd
 
 Package:	flex
 Version:	2.6.0
-Current Vers:	2.6.0
+Current Vers:	2.6.2
 Maintainer:	Will Estes 
 Archive Site:	http://flex.sourceforge.net/
 Home Page:	http://flex.sourceforge.net/

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Dec 30 00:36:23 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
gcc-6.3 out.


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

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

CVS commit: src/share/man/man3

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 23:55:28 UTC 2016

Modified Files:
src/share/man/man3: bitstring.3

Log Message:
bitstring.h does not provide size_t; include sys/types.h for that.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man3/bitstring.3

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 23:54:29 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
handle __ symbols differently (so we don't duplicate entries in the table)
and add non_null.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.87 src/usr.bin/xlint/lint1/cgram.y:1.88
--- src/usr.bin/xlint/lint1/cgram.y:1.87	Thu Dec 29 14:40:21 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 18:54:29 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.87 2016/12/29 19:40:21 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.88 2016/12/29 23:54:29 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.87 2016/12/29 19:40:21 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.88 2016/12/29 23:54:29 christos Exp $");
 #endif
 
 #include 
@@ -214,6 +214,7 @@ anonymize(sym_t *s)
 %token 		T_AT_MAY_ALIAS
 %token 		T_AT_MODE
 %token 		T_AT_NORETURN
+%token 		T_AT_NON_NULL
 %token 		T_AT_NO_INSTRUMENT_FUNCTION
 %token 		T_AT_PACKED
 %token 		T_AT_PURE
@@ -513,6 +514,7 @@ type_attribute_spec:
 	| T_AT_ALIGNED T_LPARN constant T_RPARN
 	| T_AT_SENTINEL T_LPARN constant T_RPARN
 	| T_AT_FORMAT_ARG T_LPARN constant T_RPARN
+	| T_AT_NON_NULL T_LPARN constant T_RPARN
 	| T_AT_MODE T_LPARN T_NAME T_RPARN
 	| T_AT_ALIAS T_LPARN string T_RPARN
 	| T_AT_SECTION T_LPARN string T_RPARN

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.72 src/usr.bin/xlint/lint1/scan.l:1.73
--- src/usr.bin/xlint/lint1/scan.l:1.72	Thu Dec 29 14:40:35 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 18:54:29 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.72 2016/12/29 19:40:35 christos Exp $ */
+/* $NetBSD: scan.l,v 1.73 2016/12/29 23:54:29 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.72 2016/12/29 19:40:35 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.73 2016/12/29 23:54:29 christos Exp $");
 #endif
 
 #include 
@@ -203,132 +203,84 @@ static	struct	kwtab {
 	u_int	kw_c99 : 1;	/* c99 keyword */
 	u_int	kw_gcc : 1;	/* GCC keyword */
 	u_int	kw_attr : 1;	/* GCC attribute, keyword */
+	u_int	kw_deco : 3;	/* name[1] __name[2] __name__[4] */
 } kwtab[] = {
-	{ "__alignof__", T_ALIGNOF,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "__attribute__",T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1, 0 },
-	{ "__attribute",T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1, 0 },
-	{ "__packed__",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "packed",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__alias__",	T_AT_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "alias",	T_AT_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__aligned__",T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "aligned",	T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__transparent_union__",T_AT_TUNION,0,0,	0,	  0, 0, 1, 1 },
-	{ "transparent_union",T_AT_TUNION,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__unused__",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__used__",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "used",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__always_inline__", T_AT_ALWAYS_INLINE,
-	0,	0,	0,	  0, 0, 1, 1 },
-	{ "always_inline", T_AT_ALWAYS_INLINE,
-	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__gnu_inline__",T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
-	{ "gnu_inline",	T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__constructor__",T_AT_CONSTRUCTOR,0,	0,	0,	  0, 0, 1, 1 },
-	{ "constructor",T_AT_CONSTRUCTOR,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__deprecated__",T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
-	{ "deprecated",	T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__may_alias__",T_AT_MAY_ALIAS,0,	0,	0,	  0, 0, 1, 1 },
-	{ "may_alias",	T_AT_MAY_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "format",	T_AT_FORMAT,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__format__",	T_AT_FORMAT,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "printf",	T_AT_FORMAT_PRINTF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__printf__",	T_AT_FORMAT_PRINTF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "scanf",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__scanf__",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "strfmon",	T_AT_FORMAT_STRFMON,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__strfmon__",T_AT_FORMAT_STRFMON,0,	0,	0,	  0, 0, 1, 1 },
-	{ "strftime",	T_AT_FORMAT_STRFTIME,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__strftime__",T_AT_FORMAT_STRFTIME,0,0,	0,	  0, 0, 1, 1 },
-	{ "pure",	T_AT_PURE,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__pure__",	T_AT_PURE,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "noreturn",	T_AT_NORETURN,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__noreturn__",T_AT_NORETURN,	0,	0,	0,	 

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 23:54:29 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
handle __ symbols differently (so we don't duplicate entries in the table)
and add non_null.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/lib/libcurses

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 23:50:59 UTC 2016

Modified Files:
src/lib/libcurses: curses_tty.3

Log Message:
Fix some prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_tty.3

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

Modified files:

Index: src/lib/libcurses/curses_tty.3
diff -u src/lib/libcurses/curses_tty.3:1.8 src/lib/libcurses/curses_tty.3:1.9
--- src/lib/libcurses/curses_tty.3:1.8	Tue Mar 16 19:27:35 2004
+++ src/lib/libcurses/curses_tty.3	Thu Dec 29 23:50:59 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: curses_tty.3,v 1.8 2004/03/16 19:27:35 snj Exp $
+.\"	$NetBSD: curses_tty.3,v 1.9 2016/12/29 23:50:59 wiz Exp $
 .\"
 .\" Copyright (c) 2002
 .\"	Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au)
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd June 13, 2003
+.Dd December 29, 2016
 .Dt CURSES_TTY 3
 .Os
 .Sh NAME
@@ -98,16 +98,16 @@
 .Fn flushinp "void"
 .Ft int
 .Fn gettmode "void"
-.Ft int
+.Ft bool
 .Fn has_ic "void"
-.Ft int
+.Ft bool
 .Fn has_il "void"
 .Ft int
-.Fn idcok "WINDOW *win" "boolf flag"
+.Fn idcok "WINDOW *win" "bool flag"
 .Ft int
-.Fn idlok "WINDOW *win" "boolf flag"
+.Fn idlok "WINDOW *win" "bool flag"
 .Ft int
-.Fn intrflush "WINDOW *win" "boolf flag"
+.Fn intrflush "WINDOW *win" "bool flag"
 .Ft void
 .Fn noqiflush "void"
 .Ft void
@@ -115,7 +115,7 @@
 .Ft char
 .Fn killchar "void"
 .Ft int
-.Fn meta "WINDOW *win" "boolf flag"
+.Fn meta "WINDOW *win" "bool flag"
 .Ft int
 .Fn napms "int ms"
 .Ft int

CVS commit: src/lib/libcurses

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 23:50:59 UTC 2016

Modified Files:
src/lib/libcurses: curses_tty.3

Log Message:
Fix some prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_tty.3

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

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 29 23:42:39 UTC 2016

Modified Files:
src/compat: exec.mk
src/usr.bin/vmstat: Makefile

Log Message:
build vmstat as n64 on mips64.  only kernel histories and hash stats
need to be fixed fot this to be reverted.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/exec.mk
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/vmstat/Makefile

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

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 29 23:42:39 UTC 2016

Modified Files:
src/compat: exec.mk
src/usr.bin/vmstat: Makefile

Log Message:
build vmstat as n64 on mips64.  only kernel histories and hash stats
need to be fixed fot this to be reverted.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/exec.mk
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/vmstat/Makefile

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

Modified files:

Index: src/compat/exec.mk
diff -u src/compat/exec.mk:1.1 src/compat/exec.mk:1.2
--- src/compat/exec.mk:1.1	Fri Dec 23 10:19:57 2016
+++ src/compat/exec.mk	Thu Dec 29 23:42:38 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: exec.mk,v 1.1 2016/12/23 10:19:57 mrg Exp $
+#	$NetBSD: exec.mk,v 1.2 2016/12/29 23:42:38 mrg Exp $
 
 # this makefile fragment can be included to modify the default
 # ABI a program is compiled with.  this is designed to be used
@@ -12,6 +12,7 @@
 #   usr.bin/netstat/Makefile
 #   usr.bin/pmap/Makefile
 #   usr.bin/systat/Makefile
+#   usr.bin/vmstat/Makefile
 #   usr.sbin/crash/Makefile
 #   usr.sbin/kgmon/Makefile
 #   usr.sbin/pstat/Makefile

Index: src/usr.bin/vmstat/Makefile
diff -u src/usr.bin/vmstat/Makefile:1.33 src/usr.bin/vmstat/Makefile:1.34
--- src/usr.bin/vmstat/Makefile:1.33	Sun Mar  6 18:01:28 2016
+++ src/usr.bin/vmstat/Makefile	Thu Dec 29 23:42:39 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2016/03/06 18:01:28 christos Exp $
+#	$NetBSD: Makefile,v 1.34 2016/12/29 23:42:39 mrg Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include 
@@ -19,4 +19,6 @@ COPTS.vmstat.c += -Wno-format-nonliteral
 # sparc64 is broken!
 COPTS.vmstat.c += -Wno-error=stack-protector
 
+.include "../../compat/exec.mk"
+
 .include 

CVS commit: src/regress/sys/kern/lkmcommon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 29 23:36:07 UTC 2016

Removed Files:
src/regress/sys/kern/lkmcommon: lkminit_test.c
src/regress/sys/kern/lkmcommon/test: Makefile testmisc.c

Log Message:
remove obsolete lkm tests


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/regress/sys/kern/lkmcommon/lkminit_test.c
cvs rdiff -u -r1.1 -r0 src/regress/sys/kern/lkmcommon/test/Makefile \
src/regress/sys/kern/lkmcommon/test/testmisc.c

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

CVS commit: src/regress/sys/kern/lkmcommon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 29 23:36:07 UTC 2016

Removed Files:
src/regress/sys/kern/lkmcommon: lkminit_test.c
src/regress/sys/kern/lkmcommon/test: Makefile testmisc.c

Log Message:
remove obsolete lkm tests


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/regress/sys/kern/lkmcommon/lkminit_test.c
cvs rdiff -u -r1.1 -r0 src/regress/sys/kern/lkmcommon/test/Makefile \
src/regress/sys/kern/lkmcommon/test/testmisc.c

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

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 29 22:17:51 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
Reference siginfo(2) for a SIGCHLD signal

siginfo(2) describes appropriate signal specific information for SIGCHLD.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/ptrace.2

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

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 29 22:17:51 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
Reference siginfo(2) for a SIGCHLD signal

siginfo(2) describes appropriate signal specific information for SIGCHLD.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/ptrace.2

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

Modified files:

Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.45 src/lib/libc/sys/ptrace.2:1.46
--- src/lib/libc/sys/ptrace.2:1.45	Mon Dec 19 07:17:45 2016
+++ src/lib/libc/sys/ptrace.2	Thu Dec 29 22:17:51 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ptrace.2,v 1.45 2016/12/19 07:17:45 abhinav Exp $
+.\"	$NetBSD: ptrace.2,v 1.46 2016/12/29 22:17:51 kamil Exp $
 .\"
 .\" This file is in the public domain.
 .Dd November 1, 2016
@@ -33,7 +33,12 @@ The tracing process is expected to notic
 .Xr wait 2
 or the delivery of a
 .Dv SIGCHLD
-signal, examine the state of the stopped process, and cause it to
+signal
+.Po
+see
+.Xr siginfo 2
+.Pc ,
+examine the state of the stopped process, and cause it to
 terminate or continue as appropriate.
 .Fn ptrace
 is the mechanism by which all this happens.

CVS commit: src/lib/libc/rpc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 22:07:12 UTC 2016

Modified Files:
src/lib/libc/rpc: rpc_soc.3

Log Message:
Update prototypes to match current RPC code.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/rpc/rpc_soc.3

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

Modified files:

Index: src/lib/libc/rpc/rpc_soc.3
diff -u src/lib/libc/rpc/rpc_soc.3:1.15 src/lib/libc/rpc/rpc_soc.3:1.16
--- src/lib/libc/rpc/rpc_soc.3:1.15	Mon Aug  8 04:16:45 2016
+++ src/lib/libc/rpc/rpc_soc.3	Thu Dec 29 22:07:12 2016
@@ -1,8 +1,8 @@
 .\"	@(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\"	$NetBSD: rpc_soc.3,v 1.15 2016/08/08 04:16:45 dholland Exp $
+.\"	$NetBSD: rpc_soc.3,v 1.16 2016/12/29 22:07:12 wiz Exp $
 .\" Converted to mdoc by Thomas Klausner 
 .\"
-.Dd December 12, 2008
+.Dd December 29, 2016
 .Dt RPC_SOC 3
 .Os
 .Sh NAME
@@ -81,8 +81,8 @@
 .Ft AUTH *
 .Fn authunix_create_default "void"
 .Ft int
-.Fn callrpc "char *host" "u_long prognum" "u_long versnum" \
-"u_long procnum" "xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out"
+.Fn callrpc "char *host" "int prognum" "int versnum" \
+"int procnum" "xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out"
 .Ft enum clnt_stat
 .Fn clnt_broadcast "u_long prognum" "u_long versnum" "u_long procnum" \
 "xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out" \
@@ -93,7 +93,7 @@
 .Ft int
 .Fn clnt_destroy "CLIENT *clnt"
 .Ft CLIENT *
-.Fn clnt_create "char *host" "u_long prog" "u_long vers" "char *proto"
+.Fn clnt_create "const char *host" "rpcprog_t prog" "rpcvers_t vers" "const char *proto"
 .Ft bool_t
 .Fn clnt_control "CLIENT *cl" "u_int req" "char *info"
 .Ft int
@@ -101,17 +101,17 @@
 .Ft void
 .Fn clnt_geterr "CLIENT *clnt" "struct rpc_err errp"
 .Ft void
-.Fn clnt_pcreateerror "char *s"
+.Fn clnt_pcreateerror "const char *s"
 .Ft void
 .Fn clnt_perrno "enum clnt_stat stat"
-.Ft int
-.Fn clnt_perror "CLIENT *clnt" "char *s"
+.Ft void
+.Fn clnt_perror "CLIENT *clnt" "const char *s"
 .Ft char *
 .Fn clnt_spcreateerror "const char *s"
 .Ft char *
 .Fn clnt_sperrno "enum clnt_stat stat"
 .Ft char *
-.Fn clnt_sperror "CLIENT *rpch" "char *s"
+.Fn clnt_sperror "CLIENT *rpch" "const char *s"
 .Ft CLIENT *
 .Fn clntraw_create "u_long prognum" "u_long versnum"
 .Ft CLIENT *
@@ -130,7 +130,7 @@
 .Fn pmap_getmaps "struct sockaddr_in *addr"
 .Ft u_short
 .Fn pmap_getport "struct sockaddr_in *addr" "u_long prognum" \
-"u_long versnum" "u_long protocol"
+"u_long versnum" "u_int protocol"
 .Ft enum clnt_stat
 .Fo pmap_rmtcall
 .Fa "struct sockaddr_in *addr"
@@ -139,7 +139,7 @@
 .Fa "u_long procnum"
 .Fa "xdrproc_t inproc"
 .Fa "char *in"
-.Fa "xdrpoc_t outproc"
+.Fa "xdrproc_t outproc"
 .Fa "char *out"
 .Fa "struct timeval tout"
 .Fa "u_long *portp"
@@ -150,7 +150,7 @@
 .Ft int
 .Fn pmap_unset "u_long prognum" "u_long versnum"
 .Ft int
-.Fn registerrpc "u_long prognum" "u_long versnum" "u_long procnum" \
+.Fn registerrpc "int prognum" "int versnum" "int procnum" \
 "char *(*procname)()" "xdrproc_t inproc" "xdrproc_t outproc"
 .Fd struct rpc_createerr rpc_createerr;
 .Ft int
@@ -163,19 +163,19 @@
 .Fn svc_getargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
 .Ft struct sockaddr_in *
 .Fn svc_getcaller "SVCXPRT *xprt"
-.Ft int
+.Ft void
 .Fn svc_getreqset "fd_set *rdfds"
-.Ft int
+.Ft void
 .Fn svc_getreq "int rdfds"
 .Ft struct netbuf *
 .Fn svc_getrpccaller "SVCXPRT *xprt"
-.Ft int
+.Ft bool_t
 .Fn svc_register "SVCXPRT *xprt" "u_long prognum" "u_long versnum" \
-"void (*dispatch)()" "u_long protocol"
-.Ft int
+"void (*dispatch)()" "int protocol"
+.Ft void
 .Fn svc_run "void"
-.Ft int
-.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "char *out"
+.Ft bool_t
+.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t xdr_results" "const char *location"
 .Ft void
 .Fn svc_unregister "u_long prognum" "u_long versnum"
 .Ft void
@@ -187,7 +187,7 @@
 .Ft void
 .Fn svcerr_noprog "SVCXPRT *xprt"
 .Ft void
-.Fn svcerr_progvers "SVCXPRT *xprt"
+.Fn svcerr_progvers "SVCXPRT *xprt" "rpcvers_t low_vers" "rpcvers_t high_vers"
 .Ft void
 .Fn svcerr_systemerr "SVCXPRT *xprt"
 .Ft void
@@ -207,7 +207,7 @@
 .Fn xdr_accepted_reply "XDR *xdrs" "struct accepted_reply *ar"
 .Ft int
 .Fn xdr_authunix_parms "XDR *xdrs" "struct authunix_parms *aupp"
-.Ft void
+.Ft bool_t
 .Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
 .Ft int
 .Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
@@ -877,9 +877,9 @@ remote procedure call.
 The parameter
 .Fa xprt
 is the request's associated transport handle;
-.Fa outproc
+.Fa xdr_results
 is the XDR routine which is used to encode the results; and
-.Fa out
+.Fa xdr_location
 is the address of the results.
 This routine returns one if it succeeds, zero otherwise.
 .It Fn svc_unregister
@@ -910,6 +910,7 @@ Service implementors usually do not need
 Called when the desired version of a 

CVS commit: src/lib/libc/rpc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 22:07:12 UTC 2016

Modified Files:
src/lib/libc/rpc: rpc_soc.3

Log Message:
Update prototypes to match current RPC code.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/rpc/rpc_soc.3

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

CVS commit: src/lib/libc/time

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 21:03:51 UTC 2016

Modified Files:
src/lib/libc/time: ctime.3

Log Message:
Fix asctime_r prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/time/ctime.3

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

CVS commit: src/lib/libc/time

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 21:03:51 UTC 2016

Modified Files:
src/lib/libc/time: ctime.3

Log Message:
Fix asctime_r prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/time/ctime.3

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

Modified files:

Index: src/lib/libc/time/ctime.3
diff -u src/lib/libc/time/ctime.3:1.53 src/lib/libc/time/ctime.3:1.54
--- src/lib/libc/time/ctime.3:1.53	Thu Dec 22 17:39:28 2016
+++ src/lib/libc/time/ctime.3	Thu Dec 29 21:03:51 2016
@@ -1,8 +1,8 @@
-.\" $NetBSD: ctime.3,v 1.53 2016/12/22 17:39:28 abhinav Exp $
+.\" $NetBSD: ctime.3,v 1.54 2016/12/29 21:03:51 wiz Exp $
 .\"
 .\" XXX: License missing?
 .\"
-.Dd October 7, 2014
+.Dd December 29, 2016
 .Dt CTIME 3
 .Os
 .Sh NAME
@@ -28,7 +28,7 @@
 .Ft char *
 .Fn asctime "const struct tm *tm"
 .Ft char *
-.Fn asctime_r "const struct tm restrict tm" "char * restrict buf"
+.Fn asctime_r "const struct tm *restrict tm" "char * restrict buf"
 .Ft char *
 .Fn ctime "const time_t *clock"
 .Ft char *

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

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Thu Dec 29 20:59:31 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
sun4v: make debugging kernel bringup a bit easier by using the slowtrap code 
path for currently unhandled trap level 1 trap entries 0x32-0x7f


To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/arch/sparc64/sparc64/locore.s

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/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.401 src/sys/arch/sparc64/sparc64/locore.s:1.402
--- src/sys/arch/sparc64/sparc64/locore.s:1.401	Tue Sep 20 08:56:34 2016
+++ src/sys/arch/sparc64/sparc64/locore.s	Thu Dec 29 20:59:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.401 2016/09/20 08:56:34 nakayama Exp $	*/
+/*	$NetBSD: locore.s,v 1.402 2016/12/29 20:59:31 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -1144,7 +1144,7 @@ _C_LABEL(trapbase_sun4v):
 	CLEANWIN1		! 0x24-0x27 = clean window
 	sun4v_trap_entry_fail 9	! 0x028-0x030			
 	VTRAP(T_DATA_MMU_MISS, sun4v_dtsb_miss)			! 0x031 = data MMU miss
-	sun4v_trap_entry_fail 78! 0x032-0x07f
+	sun4v_trap_entry 78	! 0x032-0x07f
 	SPILL64(uspill8_sun4vt1,ASI_AIUS)			! 0x080 spill_0_normal -- save user windows
 	SPILL32(uspill4_sun4vt1,ASI_AIUS)			! 0x084 spill_1_normal
 	SPILLBOTH(uspill8_sun4vt1,uspill4_sun4vt1,ASI_AIUS)	! 0x088 spill_2_normal

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

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Thu Dec 29 20:59:31 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
sun4v: make debugging kernel bringup a bit easier by using the slowtrap code 
path for currently unhandled trap level 1 trap entries 0x32-0x7f


To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/arch/sparc64/sparc64/locore.s

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 20:51:26 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: RPI2_INSTALL RPI_INSTALL

Log Message:
Bump image size


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/RPI2_INSTALL
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/RPI_INSTALL

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 20:51:26 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: RPI2_INSTALL RPI_INSTALL

Log Message:
Bump image size


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/RPI2_INSTALL
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/RPI_INSTALL

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

Modified files:

Index: src/sys/arch/evbarm/conf/RPI2_INSTALL
diff -u src/sys/arch/evbarm/conf/RPI2_INSTALL:1.1 src/sys/arch/evbarm/conf/RPI2_INSTALL:1.2
--- src/sys/arch/evbarm/conf/RPI2_INSTALL:1.1	Fri Mar  6 22:29:06 2015
+++ src/sys/arch/evbarm/conf/RPI2_INSTALL	Thu Dec 29 20:51:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: RPI2_INSTALL,v 1.1 2015/03/06 22:29:06 skrll Exp $
+#	$NetBSD: RPI2_INSTALL,v 1.2 2016/12/29 20:51:26 skrll Exp $
 #
 #	RPI2_INSTALL -- RPI2 kernel with installation-sized
 #	ramdisk
@@ -8,7 +8,7 @@ include "arch/evbarm/conf/RPI2"
 include "arch/evbarm/conf/INSTALL"
 
 no options	MEMORY_DISK_ROOT_SIZE
-options 	MEMORY_DISK_ROOT_SIZE=29696
+options 	MEMORY_DISK_ROOT_SIZE=49152
 
 makeoptions	RAMDISKNAME=sshramdisk
 no makeoptions	DEBUG

Index: src/sys/arch/evbarm/conf/RPI_INSTALL
diff -u src/sys/arch/evbarm/conf/RPI_INSTALL:1.8 src/sys/arch/evbarm/conf/RPI_INSTALL:1.9
--- src/sys/arch/evbarm/conf/RPI_INSTALL:1.8	Mon Feb 23 23:21:47 2015
+++ src/sys/arch/evbarm/conf/RPI_INSTALL	Thu Dec 29 20:51:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: RPI_INSTALL,v 1.8 2015/02/23 23:21:47 joerg Exp $
+#	$NetBSD: RPI_INSTALL,v 1.9 2016/12/29 20:51:26 skrll Exp $
 #
 #	RPI_INSTALL -- RPI kernel with installation-sized
 #	ramdisk
@@ -8,7 +8,7 @@ include "arch/evbarm/conf/RPI"
 include "arch/evbarm/conf/INSTALL"
 
 no options	MEMORY_DISK_ROOT_SIZE
-options 	MEMORY_DISK_ROOT_SIZE=29696
+options 	MEMORY_DISK_ROOT_SIZE=49152
 
 makeoptions	RAMDISKNAME=sshramdisk
 no makeoptions	DEBUG

CVS commit: src/usr.sbin/npf/npfctl

[Mindaugas Rasiukevicius]

Module Name:src
Committed By:   rmind
Date:   Thu Dec 29 20:48:50 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: npf_show.c npfctl.c

Log Message:
Improve 'npfctl debug' a little bit.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/npf/npfctl/npf_show.c
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/npf/npfctl/npfctl.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/npf/npfctl/npf_show.c
diff -u src/usr.sbin/npf/npfctl/npf_show.c:1.21 src/usr.sbin/npf/npfctl/npf_show.c:1.22
--- src/usr.sbin/npf/npfctl/npf_show.c:1.21	Tue Dec 27 20:14:35 2016
+++ src/usr.sbin/npf/npfctl/npf_show.c	Thu Dec 29 20:48:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_show.c,v 1.21 2016/12/27 20:14:35 christos Exp $	*/
+/*	$NetBSD: npf_show.c,v 1.22 2016/12/29 20:48:50 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: npf_show.c,v 1.21 2016/12/27 20:14:35 christos Exp $");
+__RCSID("$NetBSD: npf_show.c,v 1.22 2016/12/29 20:48:50 rmind Exp $");
 
 #include 
 #define	__FAVOR_BSD
@@ -506,8 +506,8 @@ npfctl_config_show(int fd)
 		loaded ? "loaded" : "empty");
 		print_linesep(ctx);
 	} else {
-		npfctl_config_send(0, NULL);
 		ncf = npfctl_config_ref();
+		(void)npf_config_build(ncf);
 		loaded = true;
 	}
 	ctx->conf = ncf;

Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.51 src/usr.sbin/npf/npfctl/npfctl.c:1.52
--- src/usr.sbin/npf/npfctl/npfctl.c:1.51	Tue Dec 27 20:24:32 2016
+++ src/usr.sbin/npf/npfctl/npfctl.c	Thu Dec 29 20:48:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npfctl.c,v 1.51 2016/12/27 20:24:32 wiz Exp $	*/
+/*	$NetBSD: npfctl.c,v 1.52 2016/12/29 20:48:50 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: npfctl.c,v 1.51 2016/12/27 20:24:32 wiz Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.52 2016/12/29 20:48:50 rmind Exp $");
 
 #include 
 #include 
@@ -70,6 +70,7 @@ enum {
 	NPFCTL_STATS,
 	NPFCTL_SAVE,
 	NPFCTL_LOAD,
+	NPFCTL_DEBUG,
 	NPFCTL_CONN_LIST,
 };
 
@@ -83,7 +84,6 @@ static const struct operations_s {
 	{	"reload",	NPFCTL_RELOAD		},
 	{	"show",		NPFCTL_SHOWCONF,	},
 	{	"flush",	NPFCTL_FLUSH		},
-	{	"valid",	NPFCTL_VALIDATE		},
 	/* Table */
 	{	"table",	NPFCTL_TABLE		},
 	/* Rule */
@@ -94,6 +94,9 @@ static const struct operations_s {
 	{	"save",		NPFCTL_SAVE		},
 	{	"load",		NPFCTL_LOAD		},
 	{	"list",		NPFCTL_CONN_LIST	},
+	/* Misc. */
+	{	"valid",	NPFCTL_VALIDATE		},
+	{	"debug",	NPFCTL_DEBUG		},
 	/* --- */
 	{	NULL,		0			}
 };
@@ -247,14 +250,12 @@ npfctl_print_addrmask(int alen, const ch
 	switch (alen) {
 	case 4: {
 		struct sockaddr_in *sin = (void *)
-		sin->sin_len = sizeof(*sin);
 		sin->sin_family = AF_INET;
 		memcpy(>sin_addr, addr, sizeof(sin->sin_addr));
 		break;
 	}
 	case 16: {
 		struct sockaddr_in6 *sin6 = (void *)
-		sin6->sin6_len = sizeof(*sin6);
 		sin6->sin6_family = AF_INET6;
 		memcpy(>sin6_addr, addr, sizeof(sin6->sin6_addr));
 		break;
@@ -593,7 +594,7 @@ struct npf_conn_filter {
 };
 
 static int
-npfctl_conn_print(unsigned alen, const npf_addr_t *a, const in_port_t *p, 
+npfctl_conn_print(unsigned alen, const npf_addr_t *a, const in_port_t *p,
 const char *ifname, void *v)
 {
 	struct npf_conn_filter *fil = v;
@@ -674,21 +675,19 @@ npfctl_conn_list(int fd, int argc, char 
 	if (header)
 		fprintf(f.fp, "%*.*s %*.*s\n",
 		w, w, "From address:port ", w, w, "To address:port ");
-		
+
 	npf_conn_list(fd, npfctl_conn_print, );
 	return 0;
 }
 
-static void
-npfctl(int action, int argc, char **argv)
+static int
+npfctl_open_dev(const char *path)
 {
-	int fd, ver, boolval, ret = 0;
-	nl_config_t *ncf;
-	const char *fun = "";
+	int fd, ver;
 
-	fd = open(NPF_DEV_PATH, O_RDONLY);
+	fd = open(path, O_RDONLY);
 	if (fd == -1) {
-		err(EXIT_FAILURE, "cannot open '%s'", NPF_DEV_PATH);
+		err(EXIT_FAILURE, "cannot open '%s'", path);
 	}
 	if (ioctl(fd, IOC_NPF_VERSION, ) == -1) {
 		err(EXIT_FAILURE, "ioctl(IOC_NPF_VERSION)");
@@ -698,6 +697,24 @@ npfctl(int action, int argc, char **argv
 		"incompatible NPF interface version (%d, kernel %d)\n"
 		"Hint: update userland?", NPF_VERSION, ver);
 	}
+	return fd;
+}
+
+static void
+npfctl(int action, int argc, char **argv)
+{
+	int fd, boolval, ret = 0;
+	const char *fun = "";
+	nl_config_t *ncf;
+
+	switch (action) {
+	case NPFCTL_VALIDATE:
+	case NPFCTL_DEBUG:
+		fd = 0;
+		break;
+	default:
+		fd = npfctl_open_dev(NPF_DEV_PATH);
+	}
 
 	switch (action) {
 	case NPFCTL_START:
@@ -725,12 +742,6 @@ npfctl(int action, int argc, char **argv
 		ret = npf_config_flush(fd);
 		fun = "npf_config_flush";
 		break;
-	case NPFCTL_VALIDATE:
-		npfctl_config_init(false);
-		npfctl_parse_file(argc < 3 ? NPF_CONF_PATH : argv[2]);
-		ret = npfctl_config_show(0);
-		fun = "npfctl_config_show";
-		break;
 	case 

CVS commit: src/usr.sbin/npf/npfctl

[Mindaugas Rasiukevicius]

Module Name:src
Committed By:   rmind
Date:   Thu Dec 29 20:48:50 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: npf_show.c npfctl.c

Log Message:
Improve 'npfctl debug' a little bit.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/npf/npfctl/npf_show.c
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/npf/npfctl/npfctl.c

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

CVS commit: src/lib/libc/stdio

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:29:30 UTC 2016

Modified Files:
src/lib/libc/stdio: printf_l.3

Log Message:
Mention stdarg.h for va_list.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/printf_l.3

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

CVS commit: src/lib/libc/stdio

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:29:30 UTC 2016

Modified Files:
src/lib/libc/stdio: printf_l.3

Log Message:
Mention stdarg.h for va_list.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/printf_l.3

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

Modified files:

Index: src/lib/libc/stdio/printf_l.3
diff -u src/lib/libc/stdio/printf_l.3:1.1 src/lib/libc/stdio/printf_l.3:1.2
--- src/lib/libc/stdio/printf_l.3:1.1	Tue Dec 29 17:55:23 2015
+++ src/lib/libc/stdio/printf_l.3	Thu Dec 29 20:29:30 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printf_l.3,v 1.1 2015/12/29 17:55:23 christos Exp $
+.\"	$NetBSD: printf_l.3,v 1.2 2016/12/29 20:29:30 wiz Exp $
 .\" Copyright (c) 2012 Isabell Long 
 .\" All rights reserved.
 .\"
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD: head/lib/libc/stdio/printf_l.3 258245 2013-11-17 02:03:45Z eadler $
 .\"
-.Dd December 29, 2015
+.Dd December 29, 2016
 .Dt PRINTF_L 3
 .Os
 .Sh NAME
@@ -55,6 +55,7 @@
 .Fn snprintf_l "char * restrict str" "size_t size" "locale_t loc" "const char * restrict format" "..."
 .Ft int
 .Fn sprintf_l "char * restrict str" "locale_t loc" "const char * restrict format" "..."
+.In stdarg.h
 .Ft int
 .Fn vasprintf_l "char **ret" "locale_t loc" "const char *format" "va_list ap"
 .Ft int

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:11:50 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_write.3

Log Message:
Do not mention non-existing archive_write_set_format_shar_binary.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/archive_write.3

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/libarchive/dist/libarchive/archive_write.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.4 src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.5
--- src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.4	Sat Jul 20 21:40:04 2013
+++ src/external/bsd/libarchive/dist/libarchive/archive_write.3	Thu Dec 29 20:11:50 2016
@@ -33,7 +33,6 @@
 .Nm archive_write_set_format_pax ,
 .Nm archive_write_set_format_pax_restricted ,
 .Nm archive_write_set_format_shar ,
-.Nm archive_write_set_format_shar_binary ,
 .Nm archive_write_set_format_ustar ,
 .Nm archive_write_get_bytes_per_block ,
 .Nm archive_write_set_bytes_per_block ,
@@ -86,8 +85,6 @@
 .Ft int
 .Fn archive_write_set_format_shar "struct archive *"
 .Ft int
-.Fn archive_write_set_format_shar_binary "struct archive *"
-.Ft int
 .Fn archive_write_set_format_ustar "struct archive *"
 .Ft int
 .Fn archive_write_set_format_options "struct archive *" "const char *"
@@ -177,7 +174,6 @@ A value of -1 here indicates that the li
 Fn archive_write_set_format_pax , \
 Fn archive_write_set_format_pax_restricted , \
 Fn archive_write_set_format_shar , \
-Fn archive_write_set_format_shar_binary , \
 Fn archive_write_set_format_ustar
 Sets the format that will be used for the archive.
 The library can write

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:11:50 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_write.3

Log Message:
Do not mention non-existing archive_write_set_format_shar_binary.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/archive_write.3

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

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:07:49 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_entry.3

Log Message:
Fix prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3

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/libarchive/dist/libarchive/archive_entry.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.3 src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.4
--- src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.3	Sat Jul 20 21:40:04 2013
+++ src/external/bsd/libarchive/dist/libarchive/archive_entry.3	Thu Dec 29 20:07:49 2016
@@ -159,8 +159,8 @@
 .Fn archive_entry_clear "struct archive_entry *"
 .Ft struct archive_entry *
 .Fn archive_entry_clone "struct archive_entry *"
-.Ft const char * *
-.Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const char *"
+.Ft const char *
+.Fn archive_entry_copy_fflags_text "struct archive_entry *" "const char *"
 .Ft const wchar_t *
 .Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const wchar_t *"
 .Ft void

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 20:07:49 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_entry.3

Log Message:
Fix prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 19:40:21 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
allow cascaded attributes


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/xlint/lint1/cgram.y

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.86 src/usr.bin/xlint/lint1/cgram.y:1.87
--- src/usr.bin/xlint/lint1/cgram.y:1.86	Thu Dec 29 13:44:49 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 14:40:21 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.86 2016/12/29 18:44:49 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.87 2016/12/29 19:40:21 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.86 2016/12/29 18:44:49 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.87 2016/12/29 19:40:21 christos Exp $");
 #endif
 
 #include 
@@ -117,7 +117,7 @@ anonymize(sym_t *s)
 }
 %}
 
-%expect 92
+%expect 100
 
 %union {
 	int	y_int;
@@ -562,6 +562,11 @@ type_attribute:
 	}
 	;
 
+type_attribute_list:
+	  type_attribute
+	| type_attribute_list type_attribute
+	;
+
 clrtyp:
 	  {
 		clrtyp();
@@ -605,7 +610,7 @@ declmod:
 	| T_SCLASS {
 		addscl($1);
 	  }
-	| type_attribute
+	| type_attribute_list
 	;
 
 clrtyp_typespec:
@@ -1001,7 +1006,7 @@ notype_direct_decl:
 		popdecl();
 		blklev--;
 	  }
-	| notype_direct_decl type_attribute
+	| notype_direct_decl type_attribute_list
 	;
 
 type_decl:
@@ -1034,7 +1039,7 @@ type_direct_decl:
 		popdecl();
 		blklev--;
 	  }
-	| type_direct_decl type_attribute
+	| type_direct_decl type_attribute_list
 	;
 
 /*
@@ -1054,7 +1059,7 @@ param_decl:
 	;
 
 direct_param_decl:
-	  identifier type_attribute {
+	  identifier type_attribute_list {
 		$$ = dname(getsym($1));
 	  }
 	| identifier {
@@ -1407,7 +1412,7 @@ direct_abs_decl:
 		popdecl();
 		blklev--;
 	  }
-	| direct_abs_decl type_attribute
+	| direct_abs_decl type_attribute_list
 	;
 
 non_expr_stmnt:

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 19:40:35 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: scan.l

Log Message:
only return attributes if looking for attributes


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 19:40:35 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: scan.l

Log Message:
only return attributes if looking for attributes


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.71 src/usr.bin/xlint/lint1/scan.l:1.72
--- src/usr.bin/xlint/lint1/scan.l:1.71	Thu Dec 29 13:44:49 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 14:40:35 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.71 2016/12/29 18:44:49 christos Exp $ */
+/* $NetBSD: scan.l,v 1.72 2016/12/29 19:40:35 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.71 2016/12/29 18:44:49 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.72 2016/12/29 19:40:35 christos Exp $");
 #endif
 
 #include 
@@ -523,7 +523,7 @@ search(sbuf_t *sb)
 struct kwtab *kw = sym->s_keyw;
 if (!kw->kw_attr || attron)
 	return (sym);
-			} else if (sym->s_kind == symtyp)
+			} else if (!attron && sym->s_kind == symtyp)
 return sym;
 		}
 	}

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 19:40:21 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
allow cascaded attributes


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/xlint/lint1/cgram.y

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

CVS commit: src/sys/dev/pci

[Leonardo Taccari]

Module Name:src
Committed By:   leot
Date:   Thu Dec 29 19:22:51 UTC 2016

Modified Files:
src/sys/dev/pci: if_alcreg.h

Log Message:
Do not access `sc' directly via the CSR_{READ,WRITE}_[124] macros.

Patch provided by Amol via PR kern/51708.

ok 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_alcreg.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/pci/if_alcreg.h
diff -u src/sys/dev/pci/if_alcreg.h:1.5 src/sys/dev/pci/if_alcreg.h:1.6
--- src/sys/dev/pci/if_alcreg.h:1.5	Tue Nov 24 23:30:04 2015
+++ src/sys/dev/pci/if_alcreg.h	Thu Dec 29 19:22:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_alcreg.h,v 1.5 2015/11/24 23:30:04 leot Exp $	*/
+/*	$NetBSD: if_alcreg.h,v 1.6 2016/12/29 19:22:51 leot Exp $	*/
 /*	$OpenBSD: if_alcreg.h,v 1.1 2009/08/08 09:31:13 kevlo Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon 
@@ -1488,15 +1488,15 @@ struct alc_softc {
 
 /* Register access macros. */
 #define	CSR_WRITE_4(_sc, reg, val)	\
-	bus_space_write_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+	bus_space_write_4((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
 #define	CSR_WRITE_2(_sc, reg, val)	\
-	bus_space_write_2((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+	bus_space_write_2((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
 #define	CSR_WRITE_1(_sc, reg, val)	\
-	bus_space_write_1((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+	bus_space_write_1((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
 #define	CSR_READ_2(_sc, reg)		\
-	bus_space_read_2((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg))
+	bus_space_read_2((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg))
 #define	CSR_READ_4(_sc, reg)		\
-	bus_space_read_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg))
+	bus_space_read_4((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg))
 
 #define	ALC_RXCHAIN_RESET(_sc)		\
 do {	\

CVS commit: src/sys/dev/pci

[Leonardo Taccari]

Module Name:src
Committed By:   leot
Date:   Thu Dec 29 19:22:51 UTC 2016

Modified Files:
src/sys/dev/pci: if_alcreg.h

Log Message:
Do not access `sc' directly via the CSR_{READ,WRITE}_[124] macros.

Patch provided by Amol via PR kern/51708.

ok 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_alcreg.h

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:44:49 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add alias attribute


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.85 src/usr.bin/xlint/lint1/cgram.y:1.86
--- src/usr.bin/xlint/lint1/cgram.y:1.85	Thu Dec 29 13:37:32 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 13:44:49 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.85 2016/12/29 18:37:32 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.86 2016/12/29 18:44:49 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.85 2016/12/29 18:37:32 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.86 2016/12/29 18:44:49 christos Exp $");
 #endif
 
 #include 
@@ -198,6 +198,7 @@ anonymize(sym_t *s)
 %token			T_PACKED
 /* Type Attributes */
 %token 		T_ATTRIBUTE
+%token 		T_AT_ALIAS
 %token 		T_AT_ALIGNED
 %token 		T_AT_ALWAYS_INLINE
 %token 		T_AT_COLD
@@ -513,6 +514,7 @@ type_attribute_spec:
 	| T_AT_SENTINEL T_LPARN constant T_RPARN
 	| T_AT_FORMAT_ARG T_LPARN constant T_RPARN
 	| T_AT_MODE T_LPARN T_NAME T_RPARN
+	| T_AT_ALIAS T_LPARN string T_RPARN
 	| T_AT_SECTION T_LPARN string T_RPARN
 	| T_AT_ALIGNED 
 	| T_AT_CONSTRUCTOR 

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.70 src/usr.bin/xlint/lint1/scan.l:1.71
--- src/usr.bin/xlint/lint1/scan.l:1.70	Thu Dec 29 13:37:32 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 13:44:49 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.70 2016/12/29 18:37:32 christos Exp $ */
+/* $NetBSD: scan.l,v 1.71 2016/12/29 18:44:49 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.70 2016/12/29 18:37:32 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.71 2016/12/29 18:44:49 christos Exp $");
 #endif
 
 #include 
@@ -209,6 +209,8 @@ static	struct	kwtab {
 	{ "__attribute",T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1, 0 },
 	{ "__packed__",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "packed",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
+	{ "__alias__",	T_AT_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
+	{ "alias",	T_AT_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "__aligned__",T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "aligned",	T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "__transparent_union__",T_AT_TUNION,0,0,	0,	  0, 0, 1, 1 },

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:44:49 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add alias attribute


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:37:32 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add always_inline


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.84 src/usr.bin/xlint/lint1/cgram.y:1.85
--- src/usr.bin/xlint/lint1/cgram.y:1.84	Thu Dec 29 11:41:16 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 13:37:32 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.84 2016/12/29 16:41:16 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.85 2016/12/29 18:37:32 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.84 2016/12/29 16:41:16 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.85 2016/12/29 18:37:32 christos Exp $");
 #endif
 
 #include 
@@ -199,6 +199,7 @@ anonymize(sym_t *s)
 /* Type Attributes */
 %token 		T_ATTRIBUTE
 %token 		T_AT_ALIGNED
+%token 		T_AT_ALWAYS_INLINE
 %token 		T_AT_COLD
 %token 		T_AT_CONSTRUCTOR
 %token 		T_AT_DEPRECATED
@@ -526,6 +527,7 @@ type_attribute_spec:
 	| T_AT_PURE
 	| T_AT_TUNION
 	| T_AT_GNU_INLINE
+	| T_AT_ALWAYS_INLINE
 	| T_AT_FORMAT T_LPARN type_attribute_format_type T_COMMA
 	constant T_COMMA constant T_RPARN
 	| T_AT_USED {

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.69 src/usr.bin/xlint/lint1/scan.l:1.70
--- src/usr.bin/xlint/lint1/scan.l:1.69	Thu Dec 29 11:41:16 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 13:37:32 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.69 2016/12/29 16:41:16 christos Exp $ */
+/* $NetBSD: scan.l,v 1.70 2016/12/29 18:37:32 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.69 2016/12/29 16:41:16 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.70 2016/12/29 18:37:32 christos Exp $");
 #endif
 
 #include 
@@ -217,6 +217,10 @@ static	struct	kwtab {
 	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "__used__",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "used",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
+	{ "__always_inline__", T_AT_ALWAYS_INLINE,
+	0,	0,	0,	  0, 0, 1, 1 },
+	{ "always_inline", T_AT_ALWAYS_INLINE,
+	0,	0,	0,	  0, 0, 1, 1 },
 	{ "__gnu_inline__",T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
 	{ "gnu_inline",	T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
 	{ "__constructor__",T_AT_CONSTRUCTOR,0,	0,	0,	  0, 0, 1, 1 },

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:37:32 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add always_inline


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/lib/libutil

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:30:55 UTC 2016

Modified Files:
src/lib/libutil: Makefile sockaddr_snprintf.c

Log Message:
Make this portable to other OSs


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/lib/libutil/Makefile
cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/sockaddr_snprintf.c

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

Modified files:

Index: src/lib/libutil/Makefile
diff -u src/lib/libutil/Makefile:1.79 src/lib/libutil/Makefile:1.80
--- src/lib/libutil/Makefile:1.79	Sun Apr 10 15:05:50 2016
+++ src/lib/libutil/Makefile	Thu Dec 29 13:30:55 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.79 2016/04/10 19:05:50 roy Exp $
+#	$NetBSD: Makefile,v 1.80 2016/12/29 18:30:55 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 USE_SHLIBDIR=	yes
@@ -35,6 +35,10 @@ MAN=	efun.3 \
 	snprintb.3 sockaddr_snprintf.3 stat_flags.3 strpct.3 ttyaction.3 \
 	ttymsg.3 util.3
 
+CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_UTIL_H
+CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NETATALK_AT_H
+CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NET_IF_DL_H
+
 YPREFIX=__pd
 .PATH:	${NETBSDSRCDIR}/lib/libc/gen
 

Index: src/lib/libutil/sockaddr_snprintf.c
diff -u src/lib/libutil/sockaddr_snprintf.c:1.13 src/lib/libutil/sockaddr_snprintf.c:1.14
--- src/lib/libutil/sockaddr_snprintf.c:1.13	Wed Jun  1 18:58:52 2016
+++ src/lib/libutil/sockaddr_snprintf.c	Thu Dec 29 13:30:55 2016
@@ -1,7 +1,7 @@
-/*	$NetBSD: sockaddr_snprintf.c,v 1.13 2016/06/01 22:58:52 christos Exp $	*/
+/*	$NetBSD: sockaddr_snprintf.c,v 1.14 2016/12/29 18:30:55 christos Exp $	*/
 
 /*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
+ * Copyright (c) 2004, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -28,26 +28,47 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.13 2016/06/01 22:58:52 christos Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.14 2016/12/29 18:30:55 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include 
 #include 
 #include 
 #include 
 
 #include 
+#ifdef HAVE_NETATALK_AT_H
 #include 
+#endif
+#ifdef HAVE_NET_IF_DL_H
 #include 
+#endif
 
 #include 
 #include 
 #include 
 #include 
+#ifdef HAVE_UTIL_H
 #include 
+#endif
+#ifdef HAVE_LIBUTIL_H
+#include 
+#endif
 #include 
 
+#ifdef BSD4_4
+# define SALEN(sa)	((sa)->sa ## _len)
+#else
+# define SALEN(sa)	((unsigned)sizeof(*sa))
+#endif
+
+#ifdef HAVE_NETATALK_AT_H
 static int
 debug_at(char *str, size_t len, const struct sockaddr_at *sat)
 {
@@ -56,19 +77,20 @@ debug_at(char *str, size_t len, const st
 	"sat_range.r_netrange.nr_phase=%u, "
 	"sat_range.r_netrange.nr_firstnet=%u, "
 	"sat_range.r_netrange.nr_lastnet=%u",
-	sat->sat_len, sat->sat_family, sat->sat_port,
+	SALEN(sat), sat->sat_family, sat->sat_port,
 	sat->sat_addr.s_net, sat->sat_addr.s_node,
 	sat->sat_range.r_netrange.nr_phase,
 	sat->sat_range.r_netrange.nr_firstnet,
 	sat->sat_range.r_netrange.nr_lastnet);
 }
+#endif
 
 static int
 debug_in(char *str, size_t len, const struct sockaddr_in *sin)
 {
 	return snprintf(str, len, "sin_len=%u, sin_family=%u, sin_port=%u, "
 	"sin_addr.s_addr=%08x",
-	sin->sin_len, sin->sin_family, sin->sin_port,
+	SALEN(sin), sin->sin_family, sin->sin_port,
 	sin->sin_addr.s_addr);
 }
 
@@ -81,7 +103,7 @@ debug_in6(char *str, size_t len, const s
 	"sin6_flowinfo=%u, "
 	"sin6_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:"
 	"%02x:%02x:%02x:%02x:%02x:%02x, sin6_scope_id=%u",
-	sin6->sin6_len, sin6->sin6_family, sin6->sin6_port,
+	SALEN(sin6), sin6->sin6_family, sin6->sin6_port,
 	sin6->sin6_flowinfo, s[0x0], s[0x1], s[0x2], s[0x3], s[0x4], s[0x5],
 	s[0x6], s[0x7], s[0x8], s[0x9], s[0xa], s[0xb], s[0xc], s[0xd],
 	s[0xe], s[0xf], sin6->sin6_scope_id);
@@ -91,10 +113,11 @@ static int
 debug_un(char *str, size_t len, const struct sockaddr_un *sun)
 {
 	return snprintf(str, len, "sun_len=%u, sun_family=%u, sun_path=%*s",
-	sun->sun_len, sun->sun_family, (int)sizeof(sun->sun_path),
+	SALEN(sun), sun->sun_family, (int)sizeof(sun->sun_path),
 	sun->sun_path);
 }
 
+#ifdef HAVE_NET_IF_DL_H
 static int
 debug_dl(char *str, size_t len, const struct sockaddr_dl *sdl)
 {
@@ -103,27 +126,34 @@ debug_dl(char *str, size_t len, const st
 	return snprintf(str, len, "sdl_len=%u, sdl_family=%u, sdl_index=%u, "
 	"sdl_type=%u, sdl_nlen=%u, sdl_alen=%u, sdl_slen=%u, sdl_data="
 	"%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
-	sdl->sdl_len, sdl->sdl_family, sdl->sdl_index,
+	SALEN(sdl), sdl->sdl_family, sdl->sdl_index,
 	sdl->sdl_type, 

CVS commit: src/lib/libutil

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 18:30:55 UTC 2016

Modified Files:
src/lib/libutil: Makefile sockaddr_snprintf.c

Log Message:
Make this portable to other OSs


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/lib/libutil/Makefile
cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/sockaddr_snprintf.c

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 16:41:16 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add more attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/xlint/lint1/scan.l

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 16:41:16 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l

Log Message:
Add more attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/xlint/lint1/scan.l

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.83 src/usr.bin/xlint/lint1/cgram.y:1.84
--- src/usr.bin/xlint/lint1/cgram.y:1.83	Thu Dec 29 11:01:46 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 11:41:16 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.83 2016/12/29 16:01:46 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.84 2016/12/29 16:41:16 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.83 2016/12/29 16:01:46 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.84 2016/12/29 16:41:16 christos Exp $");
 #endif
 
 #include 
@@ -199,25 +199,31 @@ anonymize(sym_t *s)
 /* Type Attributes */
 %token 		T_ATTRIBUTE
 %token 		T_AT_ALIGNED
+%token 		T_AT_COLD
+%token 		T_AT_CONSTRUCTOR
 %token 		T_AT_DEPRECATED
-%token 		T_AT_NORETURN
+%token 		T_AT_FORMAT
+%token 		T_AT_FORMAT_ARG
+%token 		T_AT_FORMAT_PRINTF
+%token 		T_AT_FORMAT_SCANF
+%token 		T_AT_FORMAT_STRFTIME
+%token 		T_AT_FORMAT_STRFMON
 %token 		T_AT_GNU_INLINE
 %token 		T_AT_MAY_ALIAS
+%token 		T_AT_MODE
+%token 		T_AT_NORETURN
+%token 		T_AT_NO_INSTRUMENT_FUNCTION
 %token 		T_AT_PACKED
 %token 		T_AT_PURE
+%token 		T_AT_RETURNS_TWICE
+%token 		T_AT_SECTION
+%token 		T_AT_SENTINEL
 %token 		T_AT_TUINION
 %token 		T_AT_TUNION
 %token 		T_AT_UNUSED
-%token 		T_AT_WEAK
+%token 		T_AT_USED
 %token 		T_AT_VISIBILITY
-%token 		T_AT_FORMAT
-%token 		T_AT_FORMAT_PRINTF
-%token 		T_AT_FORMAT_SCANF
-%token 		T_AT_FORMAT_STRFTIME
-%token 		T_AT_FORMAT_ARG
-%token 		T_AT_SENTINEL
-%token 		T_AT_RETURNS_TWICE
-%token 		T_AT_COLD
+%token 		T_AT_WEAK
 
 %left	T_COMMA
 %right	T_ASSIGN T_OPASS
@@ -496,6 +502,7 @@ declaration:
 type_attribute_format_type:
 	  T_AT_FORMAT_PRINTF
 	| T_AT_FORMAT_SCANF
+	| T_AT_FORMAT_STRFMON
 	| T_AT_FORMAT_STRFTIME
 	;
 
@@ -504,8 +511,12 @@ type_attribute_spec:
 	| T_AT_ALIGNED T_LPARN constant T_RPARN
 	| T_AT_SENTINEL T_LPARN constant T_RPARN
 	| T_AT_FORMAT_ARG T_LPARN constant T_RPARN
+	| T_AT_MODE T_LPARN T_NAME T_RPARN
+	| T_AT_SECTION T_LPARN string T_RPARN
 	| T_AT_ALIGNED 
+	| T_AT_CONSTRUCTOR 
 	| T_AT_MAY_ALIAS
+	| T_AT_NO_INSTRUMENT_FUNCTION
 	| T_AT_NORETURN
 	| T_AT_COLD
 	| T_AT_RETURNS_TWICE
@@ -517,6 +528,9 @@ type_attribute_spec:
 	| T_AT_GNU_INLINE
 	| T_AT_FORMAT T_LPARN type_attribute_format_type T_COMMA
 	constant T_COMMA constant T_RPARN
+	| T_AT_USED {
+		addused();
+	}
 	| T_AT_UNUSED {
 		addused();
 	}
@@ -528,10 +542,15 @@ type_attribute_spec:
 	}
 	;
 
+type_attribute_spec_list:
+	  type_attribute_spec
+	| type_attribute_spec_list T_COMMA type_attribute_spec
+	;
+
 type_attribute:
 	  T_ATTRIBUTE T_LPARN T_LPARN {
 	attron = 1;
-	} type_attribute_spec {
+	} type_attribute_spec_list {
 	attron = 0;
 	} T_RPARN T_RPARN
 	| T_PACKED {

Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.68 src/usr.bin/xlint/lint1/scan.l:1.69
--- src/usr.bin/xlint/lint1/scan.l:1.68	Sat Dec 24 12:43:45 2016
+++ src/usr.bin/xlint/lint1/scan.l	Thu Dec 29 11:41:16 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.68 2016/12/24 17:43:45 christos Exp $ */
+/* $NetBSD: scan.l,v 1.69 2016/12/29 16:41:16 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.68 2016/12/24 17:43:45 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.69 2016/12/29 16:41:16 christos Exp $");
 #endif
 
 #include 
@@ -215,8 +215,12 @@ static	struct	kwtab {
 	{ "transparent_union",T_AT_TUNION,0,	0,	0,	  0, 0, 1, 1 },
 	{ "__unused__",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
+	{ "__used__",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
+	{ "used",	T_AT_USED,	0,	0,	0,	  0, 0, 1, 1 },
 	{ "__gnu_inline__",T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
 	{ "gnu_inline",	T_AT_GNU_INLINE,0,	0,	0,	  0, 0, 1, 1 },
+	{ "__constructor__",T_AT_CONSTRUCTOR,0,	0,	0,	  0, 0, 1, 1 },
+	{ "constructor",T_AT_CONSTRUCTOR,0,	0,	0,	  0, 0, 1, 1 },
 	{ "__deprecated__",T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
 	{ "deprecated",	T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
 	{ "__may_alias__",T_AT_MAY_ALIAS,0,	0,	0,	  0, 0, 1, 1 },
@@ -227,12 +231,20 @@ static	struct	kwtab {
 	{ "__printf__",	T_AT_FORMAT_PRINTF,0,	0,	0,	  0, 0, 1, 1 },
 	{ "scanf",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
 	{ "__scanf__",	T_AT_FORMAT_SCANF,0,	0,	0,	  

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 16:01:46 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
accept optional type attributes after struct/union members


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/cgram.y

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

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 29 16:01:46 UTC 2016

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
accept optional type attributes after struct/union members


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/cgram.y

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.82 src/usr.bin/xlint/lint1/cgram.y:1.83
--- src/usr.bin/xlint/lint1/cgram.y:1.82	Tue Dec 27 16:52:35 2016
+++ src/usr.bin/xlint/lint1/cgram.y	Thu Dec 29 11:01:46 2016
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.82 2016/12/27 21:52:35 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.83 2016/12/29 16:01:46 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.82 2016/12/27 21:52:35 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.83 2016/12/29 16:01:46 christos Exp $");
 #endif
 
 #include 
@@ -117,7 +117,7 @@ anonymize(sym_t *s)
 }
 %}
 
-%expect 88
+%expect 92
 
 %union {
 	int	y_int;
@@ -504,6 +504,7 @@ type_attribute_spec:
 	| T_AT_ALIGNED T_LPARN constant T_RPARN
 	| T_AT_SENTINEL T_LPARN constant T_RPARN
 	| T_AT_FORMAT_ARG T_LPARN constant T_RPARN
+	| T_AT_ALIGNED 
 	| T_AT_MAY_ALIAS
 	| T_AT_NORETURN
 	| T_AT_COLD
@@ -694,6 +695,12 @@ member_declaration_list_with_rbrace:
 	  }
 	;
 
+opt_type_attribute:
+	  /* empty */ {
+	}
+	| type_attribute
+	;
+
 member_declaration_list:
 	  member_declaration {
 		$$ = $1;
@@ -707,17 +714,17 @@ member_declaration:
 	  noclass_declmods deftyp {
 		/* too late, i know, but getsym() compensates it */
 		symtyp = FMOS;
-	  } notype_member_decls {
+	  } notype_member_decls opt_type_attribute {
 		symtyp = FVFT;
 		$$ = $4;
 	  }
 	| noclass_declspecs deftyp {
 		symtyp = FMOS;
-	  } type_member_decls {
+	  } type_member_decls opt_type_attribute {
 		symtyp = FVFT;
 		$$ = $4;
 	  }
-	| noclass_declmods deftyp {
+	| noclass_declmods deftyp opt_type_attribute {
 		symtyp = FVFT;
 		/* struct or union member must be named */
 		if (!Sflag)
@@ -726,7 +733,7 @@ member_declaration:
 		$$ = dcs->d_type->t_str->memb;
 		anonymize($$);
 	  }
-	| noclass_declspecs deftyp {
+	| noclass_declspecs deftyp opt_type_attribute {
 		symtyp = FVFT;
 		/* struct or union member must be named */
 		if (!Sflag)

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 13:46:21 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read_disk.3

Log Message:
Fix return type of two functions to match header.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3

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/libarchive/dist/libarchive/archive_read_disk.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.3 src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.4
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.3	Sat Jul 20 21:40:04 2013
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3	Thu Dec 29 13:46:21 2016
@@ -51,9 +51,9 @@
 .Fn archive_read_disk_set_symlink_physical "struct archive *"
 .Ft int
 .Fn archive_read_disk_set_symlink_hybrid "struct archive *"
-.Ft int
+.Ft const char *
 .Fn archive_read_disk_gname "struct archive *" "gid_t"
-.Ft int
+.Ft const char *
 .Fn archive_read_disk_uname "struct archive *" "uid_t"
 .Ft int
 .Fo archive_read_disk_set_gname_lookup

CVS commit: src/external/bsd/libarchive/dist/libarchive

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 13:46:21 UTC 2016

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read_disk.3

Log Message:
Fix return type of two functions to match header.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3

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

CVS commit: src/sys/uvm

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 29 12:58:38 UTC 2016

Modified Files:
src/sys/uvm: uvm_physseg.c uvm_physseg.h

Log Message:
Protect uvm_physseg_set_avail_{start,end} by UVM_PHYSSEG_LEGACY.
All the ports other than acorn26 do not use them any longer.
Ok cherry


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/uvm/uvm_physseg.c
cvs rdiff -u -r1.6 -r1.7 src/sys/uvm/uvm_physseg.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/uvm/uvm_physseg.c
diff -u src/sys/uvm/uvm_physseg.c:1.5 src/sys/uvm/uvm_physseg.c:1.6
--- src/sys/uvm/uvm_physseg.c:1.5	Sun Dec 25 06:30:58 2016
+++ src/sys/uvm/uvm_physseg.c	Thu Dec 29 12:58:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.c,v 1.5 2016/12/25 06:30:58 cherry Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.6 2016/12/29 12:58:38 rin Exp $ */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -1004,7 +1004,7 @@ uvm_physseg_get_avail_start(uvm_physseg_
 	return HANDLE_TO_PHYSSEG_NODE(upm)->avail_start;
 }
 
-#if defined(PMAP_STEAL_MEMORY)
+#if defined(UVM_PHYSSEG_LEGACY)
 void
 uvm_physseg_set_avail_start(uvm_physseg_t upm, paddr_t avail_start)
 {
@@ -1033,7 +1033,7 @@ void uvm_physseg_set_avail_end(uvm_physs
 	ps->avail_end = avail_end;
 }
 
-#endif /* PMAP_STEAL_MEMORY */
+#endif /* UVM_PHYSSEG_LEGACY */
 
 paddr_t
 uvm_physseg_get_avail_end(uvm_physseg_t upm)

Index: src/sys/uvm/uvm_physseg.h
diff -u src/sys/uvm/uvm_physseg.h:1.6 src/sys/uvm/uvm_physseg.h:1.7
--- src/sys/uvm/uvm_physseg.h:1.6	Mon Dec 26 18:47:00 2016
+++ src/sys/uvm/uvm_physseg.h	Thu Dec 29 12:58:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.h,v 1.6 2016/12/26 18:47:00 cherry Exp $ */
+/* $NetBSD: uvm_physseg.h,v 1.7 2016/12/29 12:58:38 rin Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -135,14 +135,14 @@ uvm_physseg_t uvm_physseg_find(paddr_t, 
 bool uvm_physseg_plug(paddr_t, size_t, uvm_physseg_t *);
 bool uvm_physseg_unplug(paddr_t, size_t);
 
-#if defined(PMAP_STEAL_MEMORY)
+#if defined(UVM_PHYSSEG_LEGACY)
 /*
  * XXX: Legacy: This needs to be upgraded to a full pa management
  * layer.
  */
 void uvm_physseg_set_avail_start(uvm_physseg_t, paddr_t);
 void uvm_physseg_set_avail_end(uvm_physseg_t, paddr_t);
-#endif /* PMAP_STEAL_MEMORY */
+#endif /* UVM_PHYSSEG_LEGACY */
 
 #endif /* _KERNEL */
 

CVS commit: src/sys/uvm

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 29 12:58:38 UTC 2016

Modified Files:
src/sys/uvm: uvm_physseg.c uvm_physseg.h

Log Message:
Protect uvm_physseg_set_avail_{start,end} by UVM_PHYSSEG_LEGACY.
All the ports other than acorn26 do not use them any longer.
Ok cherry


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/uvm/uvm_physseg.c
cvs rdiff -u -r1.6 -r1.7 src/sys/uvm/uvm_physseg.h

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

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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 29 12:54:10 UTC 2016

Modified Files:
src/sys/arch/acorn26/include: pmap.h

Log Message:
define UVM_PHYSSEG_LEGACY for uvm_physseg_set_avail_start
ok cherry


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/include/pmap.h

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

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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 29 12:54:10 UTC 2016

Modified Files:
src/sys/arch/acorn26/include: pmap.h

Log Message:
define UVM_PHYSSEG_LEGACY for uvm_physseg_set_avail_start
ok cherry


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/include/pmap.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/acorn26/include/pmap.h
diff -u src/sys/arch/acorn26/include/pmap.h:1.9 src/sys/arch/acorn26/include/pmap.h:1.10
--- src/sys/arch/acorn26/include/pmap.h:1.9	Wed Jan 14 23:14:48 2009
+++ src/sys/arch/acorn26/include/pmap.h	Thu Dec 29 12:54:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.9 2009/01/14 23:14:48 bjh21 Exp $ */
+/* $NetBSD: pmap.h,v 1.10 2016/12/29 12:54:10 rin Exp $ */
 /*-
  * Copyright (c) 1997, 1998 Ben Harris
  * All rights reserved.
@@ -57,6 +57,8 @@ pmap_remove_all(struct pmap *pmap)
 #define PMAP_UNMAP_POOLPAGE(va)	((va) - (vaddr_t)MEMC_PHYS_BASE)
 #define PMAP_STEAL_MEMORY
 
+#define UVM_PHYSSEG_LEGACY /* for uvm_physseg_set_avail_start */
+
 #endif /* _KERNEL */
 
 #endif

CVS commit: src/distrib/sets/lists/debug

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 12:13:34 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: md.amd64

Log Message:
Add /usr/lib/i386/libiberty_g.a to obsolete list.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/debug/md.amd64

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

Modified files:

Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.91 src/distrib/sets/lists/debug/md.amd64:1.92
--- src/distrib/sets/lists/debug/md.amd64:1.91	Wed Dec 14 12:59:51 2016
+++ src/distrib/sets/lists/debug/md.amd64	Thu Dec 29 12:13:34 2016
@@ -1,6 +1,7 @@
-# $NetBSD: md.amd64,v 1.91 2016/12/14 12:59:51 kre Exp $
+# $NetBSD: md.amd64,v 1.92 2016/12/29 12:13:34 wiz Exp $
 ./usr/lib/i386/12.202++_g.a			comp-c-debuglib		debuglib,compat,12.202xx
 ./usr/lib/i386/libi386_g.a			comp-c-debuglib		debuglib,compat
+./usr/lib/i386/libiberty_g.a			comp-obsolete		obsolete
 ./usr/lib/libx86_64_g.acomp-c-debuglib		debuglib
 ./usr/libdata/debug/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug

CVS commit: src/distrib/sets/lists/debug

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 12:13:34 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: md.amd64

Log Message:
Add /usr/lib/i386/libiberty_g.a to obsolete list.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/debug/md.amd64

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

CVS commit: src/doc

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 29 11:50:23 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
Note about preliminary "G1-ATA" IDE HDD support for dreamcast.


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

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

CVS commit: src/share/man/man2

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 11:50:44 UTC 2016

Modified Files:
src/share/man/man2: siginfo.2

Log Message:
Fix typos.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man2/siginfo.2

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/man2/siginfo.2
diff -u src/share/man/man2/siginfo.2:1.15 src/share/man/man2/siginfo.2:1.16
--- src/share/man/man2/siginfo.2:1.15	Wed Dec 28 21:19:06 2016
+++ src/share/man/man2/siginfo.2	Thu Dec 29 11:50:44 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: siginfo.2,v 1.15 2016/12/28 21:19:06 kamil Exp $
+.\"	$NetBSD: siginfo.2,v 1.16 2016/12/29 11:50:44 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -163,7 +163,7 @@ field contains the pid of the sending pr
 .Fa si_uid
 field contains the user id of the sending process.
 .It SI_NOINFO
-The signal was generated without specifc info available.
+The signal was generated without specific info available.
 .El
 .Pp
 If
@@ -361,7 +361,7 @@ or
 .Dv SI_NOINFO
 are
 .Nx
-extension.
+extensions.
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/man/man2

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Dec 29 11:50:44 UTC 2016

Modified Files:
src/share/man/man2: siginfo.2

Log Message:
Fix typos.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man2/siginfo.2

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

CVS commit: src/doc

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 29 11:50:23 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
Note about preliminary "G1-ATA" IDE HDD support for dreamcast.


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2228 src/doc/CHANGES:1.2229
--- src/doc/CHANGES:1.2228	Sun Dec 25 00:10:33 2016
+++ src/doc/CHANGES	Thu Dec 29 11:50:23 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2228 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2229 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -438,3 +438,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	mips64: Use N64 binaries where kvm is required, fixing fstat, netstat,
 		systat, crash, pstat and kgmon.  [mrg 20161222]
 	OpenSSH: Imported 7.4. [christos 20161224]
+	dreamcast: Add preliminary "G1-ATA" IDE HDD support. [tsutsui 20161229]

CVS commit: src/sys/arch/dreamcast

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 29 11:49:05 UTC 2016

Modified Files:
src/sys/arch/dreamcast/conf: files.dreamcast
Added Files:
src/sys/arch/dreamcast/conf: G1IDE
src/sys/arch/dreamcast/dev/g1: g1bus.c g1bus_bus_mem.c g1busvar.h
gdrom.c wdc_g1.c

Log Message:
WIP "G1-ATA" IDE HDD support.  Not enabled by default.

Demonstrated on NetBSD booth at Open Source Conference 2016 Tokyo Fall
and Kansai Open Source 2016:
 http://mail-index.netbsd.org/netbsd-advocacy/2016/11/09/msg000721.html
 http://mail-index.netbsd.org/netbsd-advocacy/2016/11/16/msg000722.html

See my port-dreamcast@ post for more details:
 http://mail-index.netbsd.org/port-dreamcast/2016/12/18/msg000295.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/dreamcast/conf/files.dreamcast
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/dev/g1/g1bus.c \
src/sys/arch/dreamcast/dev/g1/g1bus_bus_mem.c \
src/sys/arch/dreamcast/dev/g1/g1busvar.h \
src/sys/arch/dreamcast/dev/g1/gdrom.c \
src/sys/arch/dreamcast/dev/g1/wdc_g1.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/dreamcast/conf/files.dreamcast
diff -u src/sys/arch/dreamcast/conf/files.dreamcast:1.30 src/sys/arch/dreamcast/conf/files.dreamcast:1.31
--- src/sys/arch/dreamcast/conf/files.dreamcast:1.30	Wed Feb 20 21:43:33 2008
+++ src/sys/arch/dreamcast/conf/files.dreamcast	Thu Dec 29 11:49:05 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.dreamcast,v 1.30 2008/02/20 21:43:33 drochner Exp $
+#	$NetBSD: files.dreamcast,v 1.31 2016/12/29 11:49:05 tsutsui Exp $
 
 # maxpartitions must be first item in files.${MACHINE}
 maxpartitions 16
@@ -77,9 +77,19 @@ device	pvr: wsemuldisplaydev, rasops16
 attach	pvr at shb
 file	arch/dreamcast/dev/pvr.c			pvr	needs-flag
 
+device	g1bus { }
+attach	g1bus at shb
+file	arch/dreamcast/dev/g1/g1bus.c			g1bus
+file	arch/dreamcast/dev/g1/g1bus_bus_mem.c		g1bus
+
+attach	wdc at g1bus with wdc_g1bus
+file	arch/dreamcast/dev/g1/wdc_g1.c			wdc_g1bus
+
 device	gdrom: disk
 attach	gdrom at shb
 file	arch/dreamcast/dev/gdrom.c			gdrom	needs-flag
+#attach	gdrom at atapibus
+#file	arch/dreamcast/dev/g1/gdrom.c			gdrom	needs-flag
 
 device	g2bus { }
 attach	g2bus at shb

Added files:

Index: src/sys/arch/dreamcast/conf/G1IDE
diff -u /dev/null src/sys/arch/dreamcast/conf/G1IDE:1.1
--- /dev/null	Thu Dec 29 11:49:05 2016
+++ src/sys/arch/dreamcast/conf/G1IDE	Thu Dec 29 11:49:05 2016
@@ -0,0 +1,248 @@
+# $NetBSD: G1IDE,v 1.1 2016/12/29 11:49:05 tsutsui Exp $
+
+include 	"arch/dreamcast/conf/std.dreamcast"
+
+options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+
+maxusers	16		# estimated number of users
+
+# Standard system options
+#options 	INSECURE	# disable kernel security levels
+
+#options 	RTC_OFFSET=-540
+options 	HZ=100		# clock interrupt generates every 1/HZ sec
+options 	NTP		# NTP phase/frequency locked loop
+
+options 	KTRACE		# system call tracing via ktrace(1)
+
+options 	USERCONF	# userconf(4) support
+#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
+options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+
+options 	SYSVMSG		# System V-like message queues
+options 	SYSVSEM		# System V-like semaphores
+options 	SYSVSHM		# System V-like memory sharing
+
+#options 	MODULAR		# new style module(7) framework
+#options 	MODULAR_DEFAULT_AUTOLOAD
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options 	BUFQ_READPRIO
+options 	BUFQ_PRIOCSCAN
+
+# Diagnostic/debugging support options
+options 	DIAGNOSTIC	# cheap kernel consistency checks
+#options 	DEBUG		# expensive debugging checks/support
+options 	DDB		# in-kernel debugger
+#options 	KGDB			# remote debugger
+#options 	"KGDB_DEVNAME=\"scif\"",KGDB_DEVRATE=57600
+#makeoptions	DEBUG="-g"	# compile full symbol table
+makeoptions	COPY_SYMTAB=1
+#options 	SYSCALL_DEBUG
+#options 	UVMHIST
+#options 	UVMHIST_PRINT
+
+# Compatibility options
+options 	COMPAT_16	# NetBSD 1.6,
+options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0,
+options 	COMPAT_40	# NetBSD 4.0,
+options 	COMPAT_50	# NetBSD 5.0,
+options 	COMPAT_60	# NetBSD 6.0, and
+options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
+options 	COMPAT_43	# and 4.3BSD
+#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+
+# Executable format options
+options 	EXEC_COFF	# COFF executables
+
+# File systems
+file-system 	FFS		# UFS
+#file-system	EXT2FS		# second extended file system (linux)
+#file-system	LFS		# log-structured file system
+file-system 	MFS		# memory file system
+file-system 	NFS		# Network File System client
+file-system	CD9660		# CD-ROM file system
+file-system	MSDOSFS		# MS-DOS file system
+file-system	FDESC		# /dev/fd
+file-system 	KERNFS		# 

CVS commit: src/sys/arch/dreamcast

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 29 11:49:05 UTC 2016

Modified Files:
src/sys/arch/dreamcast/conf: files.dreamcast
Added Files:
src/sys/arch/dreamcast/conf: G1IDE
src/sys/arch/dreamcast/dev/g1: g1bus.c g1bus_bus_mem.c g1busvar.h
gdrom.c wdc_g1.c

Log Message:
WIP "G1-ATA" IDE HDD support.  Not enabled by default.

Demonstrated on NetBSD booth at Open Source Conference 2016 Tokyo Fall
and Kansai Open Source 2016:
 http://mail-index.netbsd.org/netbsd-advocacy/2016/11/09/msg000721.html
 http://mail-index.netbsd.org/netbsd-advocacy/2016/11/16/msg000722.html

See my port-dreamcast@ post for more details:
 http://mail-index.netbsd.org/port-dreamcast/2016/12/18/msg000295.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/dreamcast/conf/files.dreamcast
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/dev/g1/g1bus.c \
src/sys/arch/dreamcast/dev/g1/g1bus_bus_mem.c \
src/sys/arch/dreamcast/dev/g1/g1busvar.h \
src/sys/arch/dreamcast/dev/g1/gdrom.c \
src/sys/arch/dreamcast/dev/g1/wdc_g1.c

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

Re: CVS commit: src/sys/kern

[Roy Marples]

On 29/12/16 07:27, David Holland wrote:
> On Wed, Dec 28, 2016 at 07:32:05PM +, Taylor R Campbell wrote:
>  > It's true that moving the kauth call expanded the attack surface a
>  > little bit.  Now we have to worry about:
> 
> When I saw the original commit I wondered it if it was an information
> leak. Maybe it's not, but that's certainly a fourth consideration.

You can get the information from other ways, modstat works fine on mips.
Whether this is in itself a bug is a separate issue.
However, it's a royal PITA to use just to work out if a module is
loaded. Considering that the NPF logic is thus:

1) Load BPFJIT Module
2) If error != EEXIST warn that NPF performance will be impacted because
it cannot load BPFJIT

Moving to a more modular world (which based on PaulG's work we are) then
adding an extra step to check existence prior to loading is more
complexity per module loading code. Simply checking for EPERM won't fly
either because that error can be returned and the module is not loaded.

Now, from an IRC discussion it was also pointed out that my target
platform (ERLITE) does not support loading modules. My retort is that
this makes it even more important to fix the warning NPF generates
because we have to compile it into the kernel directly to eliminate the
warning. But without my patch this fails and confuddles the end user.
This echos the human/computer interaction argument Taylor made earlier.


Roy

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 09:52:00 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c

Log Message:
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling


To generate a diff of this commit:
cvs rdiff -u -r1.28.2.77 -r1.28.2.78 src/sys/dev/usb/xhci.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 09:52:00 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c

Log Message:
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling


To generate a diff of this commit:
cvs rdiff -u -r1.28.2.77 -r1.28.2.78 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.77 src/sys/dev/usb/xhci.c:1.28.2.78
--- src/sys/dev/usb/xhci.c:1.28.2.77	Wed Oct  5 20:55:59 2016
+++ src/sys/dev/usb/xhci.c	Thu Dec 29 09:52:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.28.2.77 2016/10/05 20:55:59 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.28.2.78 2016/12/29 09:52:00 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.77 2016/10/05 20:55:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.78 2016/12/29 09:52:00 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1560,12 +1560,13 @@ xhci_abort_xfer(struct usbd_xfer *xfer, 
 	xfer, xfer->ux_pipe, status, 0);
 
 	KASSERT(mutex_owned(>sc_lock));
+	ASSERT_SLEEPABLE();
 
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		DPRINTFN(4, "xfer %p dying %u", xfer, xfer->ux_status, 0, 0);
 		xfer->ux_status = status;
-		callout_stop(>ux_callout);
+		callout_halt(>ux_callout, >sc_lock);
 		usb_transfer_complete(xfer);
 		return;
 	}
@@ -1592,10 +1593,16 @@ xhci_abort_xfer(struct usbd_xfer *xfer, 
 	xfer->ux_hcflags |= UXFER_ABORTING;
 
 	/*
-	 * Step 1: Stop xfer timeout timer.
+	 * Step 1: When cancelling a transfer make sure the timeout handler
+	 * didn't run or ran to the end and saw the USBD_CANCELLED status.
+	 * Otherwise we must have got here via a timeout.
 	 */
-	xfer->ux_status = status;
-	callout_stop(>ux_callout);
+	if (status == USBD_CANCELLED) {
+		xfer->ux_status = status;
+		callout_halt(>ux_callout, >sc_lock);
+	} else {
+		KASSERT(xfer->ux_status == USBD_TIMEOUT);
+	}
 
 	/*
 	 * Step 2: Stop execution of TD on the ring.
@@ -1879,7 +1886,7 @@ xhci_event_transfer(struct xhci_softc * 
 		 * UF_ENDPOINT_HALT).
 		 */
 		xfer->ux_status = err;
-		callout_stop(>ux_callout);
+		callout_halt(>ux_callout, >sc_lock);
 		xhci_clear_endpoint_stall_async(xfer);
 		return;
 	default:
@@ -3629,17 +3636,18 @@ xhci_device_ctrl_start(struct usbd_xfer 
 	XHCI_TRB_3_IOC_BIT;
 	xhci_trb_put(>xx_trb[i++], parameter, status, control);
 
+	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
+		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
+		xhci_timeout, xfer);
+	}
+	xfer->ux_status = USBD_IN_PROGRESS;
+
 	mutex_enter(>xr_lock);
 	xhci_ring_put(sc, tr, xfer, xx->xx_trb, i);
 	mutex_exit(>xr_lock);
 
 	xhci_db_write_4(sc, XHCI_DOORBELL(xs->xs_idx), dci);
 
-	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
-		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
-		xhci_timeout, xfer);
-	}
-
 	return USBD_IN_PROGRESS;
 }
 
@@ -3745,17 +3753,18 @@ xhci_device_bulk_start(struct usbd_xfer 
 	XHCI_TRB_3_IOC_BIT;
 	xhci_trb_put(>xx_trb[i++], parameter, status, control);
 
+	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
+		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
+		xhci_timeout, xfer);
+	}
+	xfer->ux_status = USBD_IN_PROGRESS;
+
 	mutex_enter(>xr_lock);
 	xhci_ring_put(sc, tr, xfer, xx->xx_trb, i);
 	mutex_exit(>xr_lock);
 
 	xhci_db_write_4(sc, XHCI_DOORBELL(xs->xs_idx), dci);
 
-	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
-		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
-		xhci_timeout, xfer);
-	}
-
 	return USBD_IN_PROGRESS;
 }
 
@@ -3851,17 +3860,18 @@ xhci_device_intr_start(struct usbd_xfer 
 	XHCI_TRB_3_IOC_BIT;
 	xhci_trb_put(>xx_trb[i++], parameter, status, control);
 
+	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
+		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
+		xhci_timeout, xfer);
+	}
+	xfer->ux_status = USBD_IN_PROGRESS;
+
 	mutex_enter(>xr_lock);
 	xhci_ring_put(sc, tr, xfer, xx->xx_trb, i);
 	mutex_exit(>xr_lock);
 
 	xhci_db_write_4(sc, XHCI_DOORBELL(xs->xs_idx), dci);
 
-	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
-		callout_reset(>ux_callout, mstohz(xfer->ux_timeout),
-		xhci_timeout, xfer);
-	}
-
 	return USBD_IN_PROGRESS;
 }
 
@@ -3914,31 +3924,42 @@ xhci_device_intr_close(struct usbd_pipe 
 static void
 xhci_timeout(void *addr)
 {
+	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	struct xhci_xfer * const xx = addr;
 	struct usbd_xfer * const xfer = >xx_xfer;
 	struct xhci_softc * const sc = XHCI_XFER2SC(xfer);
+	bool timeout = false;
 
-	XHCIHIST_FUNC(); XHCIHIST_CALLED();
-
+	mutex_enter(>sc_lock);
 	if (sc->sc_dying) {
+		mutex_exit(>sc_lock);
 		return;
 	}
+	if (xfer->ux_status != USBD_CANCELLED) {
+		xfer->ux_status = USBD_TIMEOUT;
+		timeout = true;
+	}
+	

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:40:27 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Take bus lock while removing a device from the bus list and announce
detach once complete (not before)


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.37 -r1.198.2.38 src/sys/dev/usb/usb_subr.c

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

Modified files:

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.37 src/sys/dev/usb/usb_subr.c:1.198.2.38
--- src/sys/dev/usb/usb_subr.c:1.198.2.37	Thu Dec 29 08:38:19 2016
+++ src/sys/dev/usb/usb_subr.c	Thu Dec 29 08:40:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.198.2.38 2016/12/29 08:40:27 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.38 2016/12/29 08:40:27 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1736,9 +1736,14 @@ usb_disconnect_port(struct usbd_port *up
 		KASSERT(!dev->ud_nifaces_claimed);
 	}
 
-	usbd_add_dev_event(USB_EVENT_DEVICE_DETACH, dev);
+	mutex_enter(dev->ud_bus->ub_lock);
 	dev->ud_bus->ub_devices[dev->ud_addr] = NULL;
 	up->up_dev = NULL;
+	mutex_exit(dev->ud_bus->ub_lock);
+
+	usbd_add_dev_event(USB_EVENT_DEVICE_DETACH, dev);
+
 	usb_free_device(dev);
+
 	return 0;
 }

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:40:27 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Take bus lock while removing a device from the bus list and announce
detach once complete (not before)


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.37 -r1.198.2.38 src/sys/dev/usb/usb_subr.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:38:19 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.36 -r1.198.2.37 src/sys/dev/usb/usb_subr.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:38:19 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.36 -r1.198.2.37 src/sys/dev/usb/usb_subr.c

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

Modified files:

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.36 src/sys/dev/usb/usb_subr.c:1.198.2.37
--- src/sys/dev/usb/usb_subr.c:1.198.2.36	Mon Dec  5 10:55:18 2016
+++ src/sys/dev/usb/usb_subr.c	Thu Dec 29 08:38:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.198.2.36 2016/12/05 10:55:18 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.36 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1160,8 +1160,8 @@ usbd_get_initial_ddesc(struct usbd_devic
  * and attach a driver.
  */
 usbd_status
-usbd_new_device(device_t parent, struct usbd_bus* bus, int depth,
-int speed, int port, struct usbd_port *up)
+usbd_new_device(device_t parent, struct usbd_bus *bus, int depth, int speed,
+int port, struct usbd_port *up)
 {
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	struct usbd_device *dev, *adev;
@@ -1248,7 +1248,7 @@ usbd_new_device(device_t parent, struct 
 
 	/* Establish the default pipe. */
 	err = usbd_setup_pipe_flags(dev, 0, >ud_ep0, USBD_DEFAULT_INTERVAL,
-			  >ud_pipe0, USBD_MPSAFE);
+	>ud_pipe0, USBD_MPSAFE);
 	if (err) {
 		usbd_remove_device(dev, up);
 		return err;

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:36:46 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb.c

Log Message:
Whitespae


To generate a diff of this commit:
cvs rdiff -u -r1.156.2.14 -r1.156.2.15 src/sys/dev/usb/usb.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/usb.c
diff -u src/sys/dev/usb/usb.c:1.156.2.14 src/sys/dev/usb/usb.c:1.156.2.15
--- src/sys/dev/usb/usb.c:1.156.2.14	Fri Jun 10 08:15:22 2016
+++ src/sys/dev/usb/usb.c	Thu Dec 29 08:36:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.156.2.14 2016/06/10 08:15:22 skrll Exp $	*/
+/*	$NetBSD: usb.c,v 1.156.2.15 2016/12/29 08:36:46 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.14 2016/06/10 08:15:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.15 2016/12/29 08:36:46 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -132,7 +132,7 @@ struct usb_softc {
 #if 0
 	device_t	sc_dev;		/* base device */
 #endif
-	struct usbd_bus *sc_bus;		/* USB controller */
+	struct usbd_bus *sc_bus;	/* USB controller */
 	struct usbd_port sc_port;	/* dummy port for root hub */
 
 	struct lwp	*sc_event_thread;

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:36:46 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb.c

Log Message:
Whitespae


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

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

CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:15:18 UTC 2016

Modified Files:
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c

Log Message:
Improve the transfer abort process.


To generate a diff of this commit:
cvs rdiff -u -r1.32.2.29 -r1.32.2.30 src/sys/external/bsd/dwc2/dwc2.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/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.29 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.30
--- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.29	Mon Dec  5 10:55:25 2016
+++ src/sys/external/bsd/dwc2/dwc2.c	Thu Dec 29 08:15:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2.c,v 1.32.2.29 2016/12/05 10:55:25 skrll Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.32.2.30 2016/12/29 08:15:18 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.29 2016/12/05 10:55:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.30 2016/12/29 08:15:18 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -316,24 +316,30 @@ Static void
 dwc2_timeout(void *addr)
 {
 	struct usbd_xfer *xfer = addr;
-	struct dwc2_xfer *dxfer = DWC2_XFER2DXFER(xfer);
-// 	struct dwc2_pipe *dpipe = DWC2_XFER2DPIPE(xfer);
  	struct dwc2_softc *sc = DWC2_XFER2SC(xfer);
+	bool timeout = false;
 
 	DPRINTF("dxfer=%p\n", dxfer);
-
+	mutex_enter(>sc_lock);
 	if (sc->sc_dying) {
-		mutex_enter(>sc_lock);
-		dwc2_abort_xfer(>xfer, USBD_TIMEOUT);
 		mutex_exit(>sc_lock);
 		return;
 	}
+	if (xfer->ux_status != USBD_CANCELLED) {
+		xfer->ux_status = USBD_TIMEOUT;
+		timeout = true;
+	}
+	mutex_exit(>sc_lock);
+
+	if (timeout) {
+		struct usbd_device *dev = xfer->ux_pipe->up_dev;
 
-	/* Execute the abort in a process context. */
-	usb_init_task(>ux_aborttask, dwc2_timeout_task, addr,
-	USB_TASKQ_MPSAFE);
-	usb_add_task(dxfer->xfer.ux_pipe->up_dev, >ux_aborttask,
-	USB_TASKQ_HC);
+		/* Execute the abort in a process context. */
+		usb_init_task(>ux_aborttask, dwc2_timeout_task, addr,
+		USB_TASKQ_MPSAFE);
+		usb_add_task(dev, >ux_aborttask, USB_TASKQ_HC);
+
+	}
 }
 
 Static void
@@ -345,6 +351,7 @@ dwc2_timeout_task(void *addr)
 	DPRINTF("xfer=%p\n", xfer);
 
 	mutex_enter(>sc_lock);
+	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	dwc2_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(>sc_lock);
 }
@@ -455,11 +462,12 @@ dwc2_abort_xfer(struct usbd_xfer *xfer, 
 	DPRINTF("xfer=%p\n", xfer);
 
 	KASSERT(mutex_owned(>sc_lock));
-	KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+	ASSERT_SLEEPABLE();
 
 	if (sc->sc_dying) {
 		xfer->ux_status = status;
-		callout_stop(>ux_callout);
+		callout_halt(>ux_callout, >sc_lock);
+		KASSERT(xfer->ux_status == status);
 		usb_transfer_complete(xfer);
 		return;
 	}
@@ -479,16 +487,26 @@ dwc2_abort_xfer(struct usbd_xfer *xfer, 
 	/*
 	 * Step 1: Make the stack ignore it and stop the callout.
 	 */
-	mutex_spin_enter(>lock);
 	xfer->ux_hcflags |= UXFER_ABORTING;
 
-	xfer->ux_status = status;	/* make software ignore it */
-	callout_stop(>ux_callout);
+	/*
+	 * Step 1: When cancelling a transfer make sure the timeout handler
+	 * didn't run or ran to the end and saw the USBD_CANCELLED status.
+	 * Otherwise we must have got here via a timeout.
+	 */
+	if (status == USBD_CANCELLED) {
+		xfer->ux_status = status;
+		callout_halt(>ux_callout, >sc_lock);
+	} else {
+		KASSERT(xfer->ux_status == USBD_TIMEOUT);
+	}
 
+	mutex_spin_enter(>lock);
 	/* XXXNH suboptimal */
 	TAILQ_FOREACH_SAFE(d, >sc_complete, xnext, tmp) {
 		if (d == dxfer) {
 			TAILQ_REMOVE(>sc_complete, dxfer, xnext);
+			break;
 		}
 	}
 

CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:15:18 UTC 2016

Modified Files:
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c

Log Message:
Improve the transfer abort process.


To generate a diff of this commit:
cvs rdiff -u -r1.32.2.29 -r1.32.2.30 src/sys/external/bsd/dwc2/dwc2.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:04:08 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_urndis.c

Log Message:
Initialise later and tidyup better in the attach routine.


To generate a diff of this commit:
cvs rdiff -u -r1.9.4.13 -r1.9.4.14 src/sys/dev/usb/if_urndis.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 29 08:04:08 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_urndis.c

Log Message:
Initialise later and tidyup better in the attach routine.


To generate a diff of this commit:
cvs rdiff -u -r1.9.4.13 -r1.9.4.14 src/sys/dev/usb/if_urndis.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/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.9.4.13 src/sys/dev/usb/if_urndis.c:1.9.4.14
--- src/sys/dev/usb/if_urndis.c:1.9.4.13	Wed Dec 28 09:45:16 2016
+++ src/sys/dev/usb/if_urndis.c	Thu Dec 29 08:04:08 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urndis.c,v 1.9.4.13 2016/12/28 09:45:16 skrll Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.9.4.14 2016/12/29 08:04:08 skrll Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 
 /*
@@ -21,7 +21,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.13 2016/12/28 09:45:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.14 2016/12/29 08:04:08 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1388,10 +1388,6 @@ urndis_attach(device_t parent, device_t 
 	sc->sc_ifaceno_ctl = if_ctl;
 	if_data = -1;
 
-	mutex_init(>urndis_lock, MUTEX_DEFAULT, IPL_NONE);
-	mutex_init(>urndis_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(>urndis_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
-
 	usb_desc_iter_init(sc->sc_udev, );
 	while ((desc = (const void *)usb_desc_iter_next()) != NULL) {
 
@@ -1480,6 +1476,9 @@ urndis_attach(device_t parent, device_t 
 	return;
 
 found:
+	mutex_init(>urndis_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(>urndis_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(>urndis_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
 
 	ifp = GET_IFP(sc);
 	ifp->if_softc = sc;
@@ -1503,7 +1502,7 @@ found:
 		aprint_error("%s: unable to get hardware address\n",
 		DEVNAME(sc));
 		urndis_stop(ifp);
-		return;
+		goto fail;
 	}
 
 	if (bufsz == ETHER_ADDR_LEN) {
@@ -1515,7 +1514,7 @@ found:
 		aprint_error("%s: invalid address\n", DEVNAME(sc));
 		kmem_free(buf, bufsz);
 		urndis_stop(ifp);
-		return;
+		goto fail;
 	}
 
 	/* Initialize packet filter */
@@ -1526,7 +1525,7 @@ found:
 	sizeof(filter)) != RNDIS_STATUS_SUCCESS) {
 		aprint_error("%s: unable to set data filters\n", DEVNAME(sc));
 		urndis_stop(ifp);
-		return;
+		goto fail;
 	}
 
 	if_initialize(ifp);
@@ -1535,6 +1534,12 @@ found:
 	if_register(ifp);
 	
 	sc->sc_attached = 1;
+	return;
+
+fail:
+	mutex_destroy(>urndis_lock);
+	mutex_destroy(>urndis_txlock);
+	mutex_destroy(>urndis_rxlock);
 }
 
 static int