CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 07:34:53 UTC 2016

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

Log Message:
1323, 1324


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.130 src/doc/CHANGES-7.1:1.1.2.131
--- src/doc/CHANGES-7.1:1.1.2.130	Mon Dec 12 10:22:20 2016
+++ src/doc/CHANGES-7.1	Tue Dec 13 07:34:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.130 2016/12/12 10:22:20 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.131 2016/12/13 07:34:53 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7535,3 +7535,41 @@ share/mk/bsd.own.mk1.875 via patch
 
 	Build xf86-video-nouveau and libdrm_nouveau on x86.
 	[snj, ticket #1305]
+
+lib/libc/time/private.hpatch
+lib/libc/time/zic.cpatch
+
+	Make zic properly parse newer tzdata files.
+	[kre, ticket #1323]
+
+distrib/sets/lists/base/mi			1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3
+external/public-domain/tz/dist/LICENSE  up to 1.1.1.2
+external/public-domain/tz/dist/Makefile up to 1.1.1.16
+external/public-domain/tz/dist/NEWS up to 1.1.1.16
+external/public-domain/tz/dist/README   up to 1.1.1.5
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.6
+external/public-domain/tz/dist/Theory   up to 1.1.1.9
+external/public-domain/tz/dist/africa   up to 1.1.1.9
+external/public-domain/tz/dist/antarctica   up to 1.1.1.7
+external/public-domain/tz/dist/asia up to 1.1.1.15
+external/public-domain/tz/dist/australasia  up to 1.1.1.10
+external/public-domain/tz/dist/backward up to 1.1.1.6
+external/public-domain/tz/dist/backzone up to 1.1.1.10
+external/public-domain/tz/dist/etcetera up to 1.1.1.2
+external/public-domain/tz/dist/europe   up to 1.1.1.16
+external/public-domain/tz/dist/factory  up to 1.1.1.2
+external/public-domain/tz/dist/iso3166.tab  up to 1.1.1.4
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.6
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.7
+external/public-domain/tz/dist/northamerica up to 1.1.1.14
+external/public-domain/tz/dist/southamerica up to 1.1.1.10
+external/public-domain/tz/dist/version  up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.10
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.12
+external/public-domain/tz/share/zoneinfo/Makefile up to 1.3
+external/public-domain/tz/tzdata2netbsd up to 1.11
+
+	Update tzdata to 2016j.
+	[kre, ticket #1324]
+

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 07:35:08 UTC 2016

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

Log Message:
1323, 1324


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

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.11 src/doc/CHANGES-7.0.3:1.1.2.12
--- src/doc/CHANGES-7.0.3:1.1.2.11	Mon Dec 12 07:56:11 2016
+++ src/doc/CHANGES-7.0.3	Tue Dec 13 07:35:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.11 2016/12/12 07:56:11 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.12 2016/12/13 07:35:08 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -165,3 +165,40 @@ usr.sbin/mld6query/mld6.c			1.15
 	PR/51353: Patrick Mackey: mld6query "-r" option is not recognised
 	[riastradh, ticket #1308]
 
+lib/libc/time/private.hpatch
+lib/libc/time/zic.cpatch
+
+	Make zic properly parse newer tzdata files.
+	[kre, ticket #1323]
+
+distrib/sets/lists/base/mi			1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3
+external/public-domain/tz/dist/LICENSE  up to 1.1.1.2
+external/public-domain/tz/dist/Makefile up to 1.1.1.16
+external/public-domain/tz/dist/NEWS up to 1.1.1.16
+external/public-domain/tz/dist/README   up to 1.1.1.5
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.6
+external/public-domain/tz/dist/Theory   up to 1.1.1.9
+external/public-domain/tz/dist/africa   up to 1.1.1.9
+external/public-domain/tz/dist/antarctica   up to 1.1.1.7
+external/public-domain/tz/dist/asia up to 1.1.1.15
+external/public-domain/tz/dist/australasia  up to 1.1.1.10
+external/public-domain/tz/dist/backward up to 1.1.1.6
+external/public-domain/tz/dist/backzone up to 1.1.1.10
+external/public-domain/tz/dist/etcetera up to 1.1.1.2
+external/public-domain/tz/dist/europe   up to 1.1.1.16
+external/public-domain/tz/dist/factory  up to 1.1.1.2
+external/public-domain/tz/dist/iso3166.tab  up to 1.1.1.4
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.6
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.7
+external/public-domain/tz/dist/northamerica up to 1.1.1.14
+external/public-domain/tz/dist/southamerica up to 1.1.1.10
+external/public-domain/tz/dist/version  up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.10
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.12
+external/public-domain/tz/share/zoneinfo/Makefile up to 1.3
+external/public-domain/tz/tzdata2netbsd up to 1.11
+
+	Update tzdata to 2016j.
+	[kre, ticket #1324]
+

CVS commit: [netbsd-7-0] src/lib/libc/time

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 06:41:29 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7-0]: private.h zic.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #1323):
lib/libc/time/private.h: patch
lib/libc/time/zic.c: patch
Make zic properly parse newer tzdata files.


To generate a diff of this commit:
cvs rdiff -u -r1.33.2.1 -r1.33.2.1.2.1 src/lib/libc/time/private.h
cvs rdiff -u -r1.46.2.1 -r1.46.2.1.2.1 src/lib/libc/time/zic.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/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.33.2.1 src/lib/libc/time/private.h:1.33.2.1.2.1
--- src/lib/libc/time/private.h:1.33.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/private.h	Tue Dec 13 06:41:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: private.h,v 1.33.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: private.h,v 1.33.2.1.2.1 2016/12/13 06:41:29 snj Exp $	*/
 
 #ifndef PRIVATE_H
 #define PRIVATE_H
@@ -477,6 +477,17 @@ const char *	scheck(const char * string,
 #define TYPE_SIGNED(type) (/*CONSTCOND*/((type) -1) < 0)
 #endif /* !defined TYPE_SIGNED */
 
+#define TWOS_COMPLEMENT(t) (/*CONSTCOND*/(t) ~ (t) 0 < 0)
+
+/* Max and min values of the integer type T, of which only the bottom
+   B bits are used, and where the highest-order used bit is considered
+   to be a sign bit if T is signed.  */
+#define MAXVAL(t, b) /*LINTED*/	\
+  ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))			\
+	- 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t)
+#define MINVAL(t, b)		\
+  ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
+
 #ifdef LOCALTIME_IMPLEMENTATION
 /* The minimum and maximum finite time values.  */
 static time_t const time_t_min =

Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.46.2.1 src/lib/libc/time/zic.c:1.46.2.1.2.1
--- src/lib/libc/time/zic.c:1.46.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/zic.c	Tue Dec 13 06:41:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: zic.c,v 1.46.2.1.2.1 2016/12/13 06:41:29 snj Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
@@ -10,7 +10,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $");
+__RCSID("$NetBSD: zic.c,v 1.46.2.1.2.1 2016/12/13 06:41:29 snj Exp $");
 #endif /* !defined lint */
 
 #include "private.h"
@@ -88,6 +88,7 @@ struct zone {
 	zic_t		z_gmtoff;
 	const char *	z_rule;
 	const char *	z_format;
+	char		z_format_specifier;
 
 	zic_t		z_stdoff;
 
@@ -145,6 +146,16 @@ static bool	yearistype(int year, const c
 static int	atcomp(const void *avp, const void *bvp);
 static void	updateminmax(zic_t x);
 
+/* Bound on length of what %z can expand to.  */
+enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1 };
+
+/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
+   tz binary files whose POSIX-TZ-style strings contain '<'; see
+   QTBUG-53071 .  This
+   workaround will no longer be needed when Qt 5.6.1 and earlier are
+   obsolete, say in the year 2021.  */
+enum { WORK_AROUND_QTBUG_53071 = 1 };
+
 static int		charcnt;
 static bool		errors;
 static bool		warnings;
@@ -154,7 +165,7 @@ static bool		leapseen;
 static zic_t		leapminyear;
 static zic_t		leapmaxyear;
 static int		linenum;
-static size_t		max_abbrvar_len;
+static size_t		max_abbrvar_len = PERCENT_Z_LEN_BOUND;
 static size_t		max_format_len;
 static zic_t		max_year;
 static zic_t		min_year;
@@ -350,6 +361,7 @@ static const int	len_years[2] = {
 
 static struct attype {
 	zic_t		at;
+	bool		dontmerge;
 	unsigned char	type;
 } *			attypes;
 static zic_t		gmtoffs[TZ_MAX_TYPES];
@@ -588,7 +600,7 @@ _("%s: More than one -L option specified
 noise = true;
 break;
 			case 's':
-warning(_("-s ignored\n"));
+warning(_("-s ignored"));
 break;
 		}
 	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
@@ -641,31 +653,44 @@ _("%s: More than one -L option specified
 	return errors ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-static void
+static bool
 componentcheck(char const *name, char const *component,
 	   char const *component_end)
 {
 	enum { component_len_max = 14 };
-	size_t component_len = component_end - component;
+	ptrdiff_t component_len = component_end - component;
+	if (component_len == 0) {
+	  if (!*name)
+	error (_("empty file name"));
+	  else
+	error (_(component == name
+		 ? "file name '%s' begins with '/'"
+		 : *component_end
+		 ? "file name '%s' contains '//'"
+		 : "file name '%s' ends with '/'"),
+		   name);
+	  return false;
+	}
 	if (0 < component_len && component_len <= 2
 	&& component[0] == '.' && component_end[-1] == '.') {
-		fprintf(stderr, _("%s: file name '%s' contains"
-  " '%.*s' 

CVS commit: [netbsd-7] src/lib/libc/time

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 06:39:13 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7]: private.h zic.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #1323):
lib/libc/time/private.h: patch
lib/libc/time/zic.c: patch
Make zic properly parse newer tzdata files.


To generate a diff of this commit:
cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/lib/libc/time/private.h
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/lib/libc/time/zic.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/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.33.2.1 src/lib/libc/time/private.h:1.33.2.2
--- src/lib/libc/time/private.h:1.33.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/private.h	Tue Dec 13 06:39:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: private.h,v 1.33.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: private.h,v 1.33.2.2 2016/12/13 06:39:13 snj Exp $	*/
 
 #ifndef PRIVATE_H
 #define PRIVATE_H
@@ -477,6 +477,17 @@ const char *	scheck(const char * string,
 #define TYPE_SIGNED(type) (/*CONSTCOND*/((type) -1) < 0)
 #endif /* !defined TYPE_SIGNED */
 
+#define TWOS_COMPLEMENT(t) (/*CONSTCOND*/(t) ~ (t) 0 < 0)
+
+/* Max and min values of the integer type T, of which only the bottom
+   B bits are used, and where the highest-order used bit is considered
+   to be a sign bit if T is signed.  */
+#define MAXVAL(t, b) /*LINTED*/	\
+  ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))			\
+	- 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t)
+#define MINVAL(t, b)		\
+  ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
+
 #ifdef LOCALTIME_IMPLEMENTATION
 /* The minimum and maximum finite time values.  */
 static time_t const time_t_min =

Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.46.2.1 src/lib/libc/time/zic.c:1.46.2.2
--- src/lib/libc/time/zic.c:1.46.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/zic.c	Tue Dec 13 06:39:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: zic.c,v 1.46.2.2 2016/12/13 06:39:13 snj Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
@@ -10,7 +10,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $");
+__RCSID("$NetBSD: zic.c,v 1.46.2.2 2016/12/13 06:39:13 snj Exp $");
 #endif /* !defined lint */
 
 #include "private.h"
@@ -88,6 +88,7 @@ struct zone {
 	zic_t		z_gmtoff;
 	const char *	z_rule;
 	const char *	z_format;
+	char		z_format_specifier;
 
 	zic_t		z_stdoff;
 
@@ -145,6 +146,16 @@ static bool	yearistype(int year, const c
 static int	atcomp(const void *avp, const void *bvp);
 static void	updateminmax(zic_t x);
 
+/* Bound on length of what %z can expand to.  */
+enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1 };
+
+/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
+   tz binary files whose POSIX-TZ-style strings contain '<'; see
+   QTBUG-53071 .  This
+   workaround will no longer be needed when Qt 5.6.1 and earlier are
+   obsolete, say in the year 2021.  */
+enum { WORK_AROUND_QTBUG_53071 = 1 };
+
 static int		charcnt;
 static bool		errors;
 static bool		warnings;
@@ -154,7 +165,7 @@ static bool		leapseen;
 static zic_t		leapminyear;
 static zic_t		leapmaxyear;
 static int		linenum;
-static size_t		max_abbrvar_len;
+static size_t		max_abbrvar_len = PERCENT_Z_LEN_BOUND;
 static size_t		max_format_len;
 static zic_t		max_year;
 static zic_t		min_year;
@@ -350,6 +361,7 @@ static const int	len_years[2] = {
 
 static struct attype {
 	zic_t		at;
+	bool		dontmerge;
 	unsigned char	type;
 } *			attypes;
 static zic_t		gmtoffs[TZ_MAX_TYPES];
@@ -588,7 +600,7 @@ _("%s: More than one -L option specified
 noise = true;
 break;
 			case 's':
-warning(_("-s ignored\n"));
+warning(_("-s ignored"));
 break;
 		}
 	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
@@ -641,31 +653,44 @@ _("%s: More than one -L option specified
 	return errors ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-static void
+static bool
 componentcheck(char const *name, char const *component,
 	   char const *component_end)
 {
 	enum { component_len_max = 14 };
-	size_t component_len = component_end - component;
+	ptrdiff_t component_len = component_end - component;
+	if (component_len == 0) {
+	  if (!*name)
+	error (_("empty file name"));
+	  else
+	error (_(component == name
+		 ? "file name '%s' begins with '/'"
+		 : *component_end
+		 ? "file name '%s' contains '//'"
+		 : "file name '%s' ends with '/'"),
+		   name);
+	  return false;
+	}
 	if (0 < component_len && component_len <= 2
 	&& component[0] == '.' && component_end[-1] == '.') {
-		fprintf(stderr, _("%s: file name '%s' contains"
-  " '%.*s' component"),
-			progname, name, 

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Dec 13 02:05:48 UTC 2016

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

Log Message:
Constify ifp of if_is_deactivated


To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/sys/net/if.c
cvs rdiff -u -r1.231 -r1.232 src/sys/net/if.h

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

Modified files:

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.366 src/sys/net/if.c:1.367
--- src/sys/net/if.c:1.366	Mon Dec 12 03:55:57 2016
+++ src/sys/net/if.c	Tue Dec 13 02:05:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.366 2016/12/12 03:55:57 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.367 2016/12/13 02:05:48 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.366 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.367 2016/12/13 02:05:48 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1151,7 +1151,7 @@ if_deactivate(struct ifnet *ifp)
 }
 
 bool
-if_is_deactivated(struct ifnet *ifp)
+if_is_deactivated(const struct ifnet *ifp)
 {
 
 	return ifp->if_output == if_nulloutput;

Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.231 src/sys/net/if.h:1.232
--- src/sys/net/if.h:1.231	Mon Dec 12 03:55:57 2016
+++ src/sys/net/if.h	Tue Dec 13 02:05:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.h,v 1.231 2016/12/12 03:55:57 ozaki-r Exp $	*/
+/*	$NetBSD: if.h,v 1.232 2016/12/13 02:05:48 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -950,7 +950,7 @@ void	if_register(struct ifnet *);
 void	if_attach(struct ifnet *); /* Deprecated. Use if_initialize and if_register */
 void	if_attachdomain(void);
 void	if_deactivate(struct ifnet *);
-bool	if_is_deactivated(struct ifnet *);
+bool	if_is_deactivated(const struct ifnet *);
 void	if_purgeaddrs(struct ifnet *, int, void (*)(struct ifaddr *));
 void	if_detach(struct ifnet *);
 void	if_down(struct ifnet *);

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Tue Dec 13 00:35:11 UTC 2016

Modified Files:
src/sys/net: if_pppoe.c if_spppsubr.c if_spppvar.h

Log Message:
MP-safe pppoe(4).

Nearly all parts is implemented by Shoichi YAMAGUCHI, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.162 -r1.163 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_spppvar.h

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

Modified files:

Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.119 src/sys/net/if_pppoe.c:1.120
--- src/sys/net/if_pppoe.c:1.119	Fri Nov 18 08:13:02 2016
+++ src/sys/net/if_pppoe.c	Tue Dec 13 00:35:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.119 2016/11/18 08:13:02 knakahara Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.120 2016/12/13 00:35:11 knakahara Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,11 +30,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.119 2016/11/18 08:13:02 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.120 2016/12/13 00:35:11 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
 #include "opt_pppoe.h"
+#include "opt_net_mpsafe.h"
 #endif
 
 #include 
@@ -52,6 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -64,6 +67,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v
 
 #include "ioconf.h"
 
+#ifdef NET_MPSAFE
+#define PPPOE_MPSAFE	1
+#endif
+
 struct pppoehdr {
 	uint8_t vertype;
 	uint8_t code;
@@ -125,12 +132,39 @@ struct pppoetag {
 #define	IFF_PASSIVE	IFF_LINK0	/* wait passively for connection */
 #endif
 
+#define PPPOE_SESSION_LOCK(_sc, _op)	rw_enter(&(_sc)->sc_session_lock, (_op))
+#define PPPOE_SESSION_UNLOCK(_sc)	rw_exit(&(_sc)->sc_session_lock)
+#define PPPOE_SESSION_LOCKED(_sc)	rw_lock_held(&(_sc)->sc_session_lock)
+#define PPPOE_SESSION_WLOCKED(_sc)	rw_write_held(&(_sc)->sc_session_lock)
+#define PPPOE_SESSION_RLOCKED(_sc)	rw_read_held(&(_sc)->sc_session_lock)
+
+#define PPPOE_PARAM_LOCK(_sc)		if ((_sc)->sc_lock) \
+		mutex_enter((_sc)->sc_lock)
+#define PPPOE_PARAM_UNLOCK(_sc)		if ((_sc)->sc_lock) \
+		mutex_exit((_sc)->sc_lock)
+#define PPPOE_PARAM_LOCKED(_sc)		(!(_sc)->sc_lock || \
+		mutex_owned((_sc)->sc_lock))
+#ifdef PPPOE_MPSAFE
+#define DECLARE_SPLNET_VARIABLE
+#define ACQUIRE_SPLNET()	do { } while (0)
+#define RELEASE_SPLNET()	do { } while (0)
+#else
+#define DECLARE_SPLNET_VARIABLE	int __s
+#define ACQUIRE_SPLNET()	do {	\
+	__s = splnet();			\
+} while (0)
+#define RELEASE_SPLNET()	do {	\
+	splx(__s);			\
+} while (0)
+#endif
+
 struct pppoe_softc {
 	struct sppp sc_sppp;		/* contains a struct ifnet as first element */
 	LIST_ENTRY(pppoe_softc) sc_list;
 	struct ifnet *sc_eth_if;	/* ethernet interface we are using */
 
 	int sc_state;			/* discovery phase or session connected */
+	bool sc_state_updating;		/* state update in other components */
 	struct ether_addr sc_dest;	/* hardware address of concentrator */
 	uint16_t sc_session;		/* PPPoE session id */
 
@@ -147,6 +181,8 @@ struct pppoe_softc {
 	callout_t sc_timeout;	/* timeout while not in session state */
 	int sc_padi_retried;		/* number of PADI retries already done */
 	int sc_padr_retried;		/* number of PADR retries already done */
+	krwlock_t sc_session_lock;	/* lock of sc_state, sc_session, and sc_eth_if */
+	kmutex_t *sc_lock;		/* lock of other parameters */
 };
 
 /* incoming traffic will be queued here */
@@ -173,6 +209,9 @@ static int pppoe_ioctl(struct ifnet *, u
 static void pppoe_tls(struct sppp *);
 static void pppoe_tlf(struct sppp *);
 static void pppoe_start(struct ifnet *);
+#ifdef PPPOE_MPSAFE
+static int pppoe_transmit(struct ifnet *, struct mbuf *);
+#endif
 static void pppoe_clear_softc(struct pppoe_softc *, const char *);
 
 /* internal timeout handling */
@@ -191,13 +230,15 @@ static int pppoe_send_padt(struct ifnet 
 static int pppoe_output(struct pppoe_softc *, struct mbuf *);
 
 /* internal helper functions */
-static struct pppoe_softc * pppoe_find_softc_by_session(u_int, struct ifnet *);
-static struct pppoe_softc * pppoe_find_softc_by_hunique(uint8_t *, size_t, struct ifnet *);
+static struct pppoe_softc * pppoe_find_softc_by_session(u_int, struct ifnet *, krw_t);
+static struct pppoe_softc * pppoe_find_softc_by_hunique(uint8_t *, size_t,
+struct ifnet *, krw_t);
 static struct mbuf *pppoe_get_mbuf(size_t len);
 
 static int pppoe_ifattach_hook(void *, struct mbuf **, struct ifnet *, int);
 
 static LIST_HEAD(pppoe_softc_head, pppoe_softc) pppoe_softc_list;
+static krwlock_t pppoe_softc_list_lock;
 
 static int	pppoe_clone_create(struct if_clone *, int);
 static int	pppoe_clone_destroy(struct ifnet *);
@@ -226,10 +267,11 @@ pppoeinit(void)
 {
 
 	LIST_INIT(_softc_list);
+	

CVS commit: src/sys/sys

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Mon Dec 12 21:56:00 UTC 2016

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

Log Message:
Bump for drm2 da_fb_linebytes

Welcome to 7.99.47


To generate a diff of this commit:
cvs rdiff -u -r1.513 -r1.514 src/sys/sys/param.h

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

Modified files:

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.513 src/sys/sys/param.h:1.514
--- src/sys/sys/param.h:1.513	Mon Dec 12 03:59:24 2016
+++ src/sys/sys/param.h	Mon Dec 12 21:56:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.513 2016/12/12 03:59:24 ozaki-r Exp $	*/
+/*	$NetBSD: param.h,v 1.514 2016/12/12 21:56:00 maya Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799004600	/* NetBSD 7.99.46 */
+#define	__NetBSD_Version__	799004700	/* NetBSD 7.99.47 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/share/misc

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Mon Dec 12 20:41:49 UTC 2016

Modified Files:
src/share/misc: acronyms

Log Message:
wtf tfw

Courtesy of i3enedek.


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

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

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.249 src/share/misc/acronyms:1.250
--- src/share/misc/acronyms:1.249	Thu Jul 21 05:07:04 2016
+++ src/share/misc/acronyms	Mon Dec 12 20:41:49 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.249 2016/07/21 05:07:04 dholland Exp $
+$NetBSD: acronyms,v 1.250 2016/12/12 20:41:49 riastradh Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -480,6 +480,7 @@ TCB	taking care of business
 TCO	taken care of
 TCO	total cost of ownership
 TFOA	things falling off aircraft
+TFW	that feel when
 TGIF	thank goodness it's Friday
 THNX	thanks
 THX	thanks

CVS commit: src/bin/ps

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Dec 12 20:35:36 UTC 2016

Modified Files:
src/bin/ps: print.c

Log Message:
Handle functions that use the offset from either kinfo_proc2/kinfo_lwp properly.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/bin/ps/print.c

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

Modified files:

Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.126 src/bin/ps/print.c:1.127
--- src/bin/ps/print.c:1.126	Fri Dec  2 16:59:03 2016
+++ src/bin/ps/print.c	Mon Dec 12 15:35:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.126 2016/12/02 21:59:03 christos Exp $	*/
+/*	$NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #else
-__RCSID("$NetBSD: print.c,v 1.126 2016/12/02 21:59:03 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1342,17 +1342,16 @@ printval(void *bp, VAR *v, enum mode mod
 void
 pvar(struct pinfo *pi, VARENT *ve, enum mode mode)
 {
-	struct kinfo_proc2 *ki = pi->ki;
-	VAR *v;
+	VAR *v = ve->var;
+	char *b = (v->flag & LWP) ? (char *)pi->li : (char *)pi->ki;
 
-	v = ve->var;
-	if (v->flag & UAREA && !ki->p_uvalid) {
+	if ((v->flag & UAREA) && !pi->ki->p_uvalid) {
 		if (mode == PRINTMODE)
 			(void)printf("%*s", v->width, "-");
 		return;
 	}
 
-	(void)printval((char *)ki + v->off, v, mode);
+	(void)printval(b + v->off, v, mode);
 }
 
 void
@@ -1360,8 +1359,9 @@ putimeval(struct pinfo *pi, VARENT *ve, 
 {
 	VAR *v = ve->var;
 	struct kinfo_proc2 *k = pi->ki;
-	ulong secs = *(uint32_t *)((char *)k + v->off);
-	ulong usec = *(uint32_t *)((char *)k + v->off + sizeof (uint32_t));
+	char *b = (v->flag & LWP) ? (char *)pi->li : (char *)pi->ki;
+	ulong secs = *(uint32_t *)(b + v->off);
+	ulong usec = *(uint32_t *)(b + v->off + sizeof (uint32_t));
 	int fmtlen;
 
 	if (!k->p_uvalid) {

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

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Mon Dec 12 19:45:56 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
src/sys/external/bsd/drm2/i915drm: intelfb.c
src/sys/external/bsd/drm2/include/drm: drmfb.h
src/sys/external/bsd/drm2/nouveau: nouveaufb.c

Log Message:
add da_fb_linebytes to drmfb_attach_args and use it to pass linebytes
from nouveau code to drmfb. keep the same linebytes logic for i915.

nvidia hardware needs 256 byte alignment, so aligning to just 64 was
not enough.

fixes broken console with a width of 1440px (PR kern/51181)
ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drmfb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/drm/drmfb.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/nouveau/nouveaufb.c

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

Modified files:

Index: src/sys/external/bsd/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.2 src/sys/external/bsd/drm2/drm/drmfb.c:1.3
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.2	Mon Nov  9 23:11:18 2015
+++ src/sys/external/bsd/drm2/drm/drmfb.c	Mon Dec 12 19:45:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.c,v 1.2 2015/11/09 23:11:18 jmcneill Exp $	*/
+/*	$NetBSD: drmfb.c,v 1.3 2016/12/12 19:45:56 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.2 2015/11/09 23:11:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.3 2016/12/12 19:45:56 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -103,9 +103,7 @@ drmfb_attach(struct drmfb_softc *sc, con
 	prop_dictionary_set_uint32(dict, "width", sizes->surface_width);
 	prop_dictionary_set_uint32(dict, "height", sizes->surface_height);
 	prop_dictionary_set_uint8(dict, "depth", sizes->surface_bpp);
-	prop_dictionary_set_uint16(dict, "linebytes",
-	roundup2((sizes->surface_width * howmany(sizes->surface_bpp, 8)),
-		64));
+	prop_dictionary_set_uint16(dict, "linebytes", da->da_fb_linebytes);
 	prop_dictionary_set_uint32(dict, "address", 0); /* XXX >32-bit */
 	CTASSERT(sizeof(uintptr_t) <= sizeof(uint64_t));
 	prop_dictionary_set_uint64(dict, "virtual_address",

Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.13 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.14
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.13	Sat Apr  4 15:12:39 2015
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c	Mon Dec 12 19:45:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: intelfb.c,v 1.13 2015/04/04 15:12:39 jmcneill Exp $	*/
+/*	$NetBSD: intelfb.c,v 1.14 2016/12/12 19:45:56 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.13 2015/04/04 15:12:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.14 2016/12/12 19:45:56 maya Exp $");
 
 #include 
 #include 
@@ -164,11 +164,14 @@ intelfb_attach_task(struct i915drmkms_ta
 	struct intelfb_softc *const sc = container_of(task,
 	struct intelfb_softc, sc_attach_task);
 	const struct intelfb_attach_args *const ifa = >sc_ifa;
+	const struct drm_fb_helper_surface_size *const sizes = >ifa_fb_sizes;
 	const struct drmfb_attach_args da = {
 		.da_dev = sc->sc_dev,
 		.da_fb_helper = ifa->ifa_fb_helper,
 		.da_fb_sizes = >ifa_fb_sizes,
 		.da_fb_vaddr = bus_space_vaddr(ifa->ifa_fb_bst, sc->sc_fb_bsh),
+		.da_fb_linebytes = roundup2((sizes->surface_width *
+		howmany(sizes->surface_bpp, 8)), 64),
 		.da_params = _drmfb_params,
 	};
 	int error;

Index: src/sys/external/bsd/drm2/include/drm/drmfb.h
diff -u src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1 src/sys/external/bsd/drm2/include/drm/drmfb.h:1.2
--- src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1	Thu Mar  5 17:50:41 2015
+++ src/sys/external/bsd/drm2/include/drm/drmfb.h	Mon Dec 12 19:45:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.h,v 1.1 2015/03/05 17:50:41 riastradh Exp $	*/
+/*	$NetBSD: drmfb.h,v 1.2 2016/12/12 19:45:56 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@ struct drmfb_attach_args {
 	struct drm_fb_helper		*da_fb_helper;
 	const struct drm_fb_helper_surface_size	*da_fb_sizes;
 	void*da_fb_vaddr;
+	uint32_t			da_fb_linebytes;
 	const struct drmfb_params	*da_params;
 };
 

Index: src/sys/external/bsd/drm2/nouveau/nouveaufb.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.3 src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.4
--- src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.3	Sat Oct 17 12:02:44 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveaufb.c	Mon Dec 12 19:45:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveaufb.c,v 1.3 2015/10/17 12:02:44 jmcneill Exp $	*/
+/*	$NetBSD: nouveaufb.c,v 1.4 2016/12/12 19:45:56 

CVS commit: src/external/gpl3/binutils

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 12 19:15:15 UTC 2016

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/ia64: bfd.h bfd_stdint.h
bfdver.h config.h
src/external/gpl3/binutils/lib/libiberty/arch/ia64: config.h defs.mk
src/external/gpl3/binutils/lib/libopcodes/arch/ia64: config.h
src/external/gpl3/binutils/usr.bin/common/arch/ia64: config.h defs.mk
src/external/gpl3/binutils/usr.bin/gas/arch/ia64: config.h
src/external/gpl3/binutils/usr.bin/gprof/arch/ia64: gconfig.h
src/external/gpl3/binutils/usr.bin/ld/arch/ia64: config.h

Log Message:
mknative, binutils 2.27, and ia64.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h \
src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd_stdint.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfdver.h \
src/external/gpl3/binutils/lib/libbfd/arch/ia64/config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/lib/libiberty/arch/ia64/config.h \
src/external/gpl3/binutils/lib/libiberty/arch/ia64/defs.mk
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libopcodes/arch/ia64/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/common/arch/ia64/config.h \
src/external/gpl3/binutils/usr.bin/common/arch/ia64/defs.mk
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/gas/arch/ia64/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/gprof/arch/ia64/gconfig.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/ld/arch/ia64/config.h

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

Modified files:

Index: src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h:1.3 src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h:1.4
--- src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h:1.3	Fri Jan 29 20:39:19 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/ia64/bfd.h	Mon Dec 12 19:15:15 2016
@@ -11,7 +11,7 @@
 
 /* Main header file for the bfd library -- portable access to object files.
 
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 Free Software Foundation, Inc.
 
Contributed by Cygnus Support.
 
@@ -522,7 +522,6 @@ extern void warn_deprecated (const char 
 #define bfd_get_file_flags(abfd) ((abfd)->flags)
 #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
 #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-#define bfd_my_archive(abfd) ((abfd)->my_archive)
 #define bfd_has_map(abfd) ((abfd)->has_armap)
 #define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)
 
@@ -914,6 +913,9 @@ extern bfd_boolean bfd_elf32_arm_get_bfd
 extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
   (bfd *, struct bfd_link_info *);
 
+extern void bfd_elf32_arm_keep_private_stub_output_sections
+  (struct bfd_link_info *);
+
 /* ELF ARM mapping symbol support.  */
 #define BFD_ARM_SPECIAL_SYM_TYPE_MAP	(1 << 0)
 #define BFD_ARM_SPECIAL_SYM_TYPE_TAG	(1 << 1)
@@ -945,7 +947,8 @@ extern void elf32_arm_next_input_section
   (struct bfd_link_info *, struct bfd_section *);
 extern bfd_boolean elf32_arm_size_stubs
   (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
-   struct bfd_section * (*) (const char *, struct bfd_section *, unsigned int),
+   struct bfd_section * (*) (const char *, struct bfd_section *,
+			 struct bfd_section *, unsigned int),
void (*) (void));
 extern bfd_boolean elf32_arm_build_stubs
   (struct bfd_link_info *);
@@ -958,13 +961,6 @@ extern bfd_boolean elf32_arm_fix_exidx_c
 extern bfd_boolean elf32_tic6x_fix_exidx_coverage
 (struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
 
-/* PowerPC @tls opcode transform/validate.  */
-extern unsigned int _bfd_elf_ppc_at_tls_transform
-  (unsigned int, unsigned int);
-/* PowerPC @tprel opcode transform/validate.  */
-extern unsigned int _bfd_elf_ppc_at_tprel_transform
-  (unsigned int, unsigned int);
-
 extern void bfd_elf64_aarch64_init_maps
   (bfd *);
 
@@ -972,10 +968,10 @@ extern void bfd_elf32_aarch64_init_maps
   (bfd *);
 
 extern void bfd_elf64_aarch64_set_options
-  (bfd *, struct bfd_link_info *, int, int, int, int, int);
+  (bfd *, struct bfd_link_info *, int, int, int, int, int, int);
 
 extern void bfd_elf32_aarch64_set_options
-  (bfd *, struct bfd_link_info *, int, int, int, int, int);
+  (bfd *, struct bfd_link_info *, int, int, int, int, int, int);
 
 /* ELF AArch64 mapping symbol support.  */
 #define BFD_AARCH64_SPECIAL_SYM_TYPE_MAP	(1 << 0)
@@ -1436,6 +1432,9 @@ typedef struct bfd_section
  when memory read flag isn't set. */
 #define SEC_COFF_NOREAD 0x4000
 
+  /* Indicate that section has the no read flag set.  */
+#define SEC_ELF_NOREAD 0x8000
+
   

CVS commit: src/sys

[Felix Deichmann]

Module Name:src
Committed By:   flxd
Date:   Mon Dec 12 17:03:41 UTC 2016

Modified Files:
src/sys/arch/alpha/tc: tcasic.c
src/sys/arch/pmax/tc: tcbus.c
src/sys/dev/tc: tc.c

Log Message:
Clean-up (remove redundant declarations, concentrate checks).


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/pmax/tc/tcbus.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/tc/tc.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/alpha/tc/tcasic.c
diff -u src/sys/arch/alpha/tc/tcasic.c:1.44 src/sys/arch/alpha/tc/tcasic.c:1.45
--- src/sys/arch/alpha/tc/tcasic.c:1.44	Mon Feb  6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tcasic.c	Mon Dec 12 17:03:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.44 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.44 2012/02/06 02:14:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $");
 
 #include 
 #include 
@@ -179,7 +179,6 @@ extern void	mfb_cnattach(tc_addr_t);
 extern void	tfb_cnattach(tc_addr_t);
 extern void	px_cnattach(tc_addr_t);
 extern void	pxg_cnattach(tc_addr_t);
-extern int	tc_checkslot(tc_addr_t, char *);
 
 struct cnboards {
 	const char	*cb_tcname;

Index: src/sys/arch/pmax/tc/tcbus.c
diff -u src/sys/arch/pmax/tc/tcbus.c:1.31 src/sys/arch/pmax/tc/tcbus.c:1.32
--- src/sys/arch/pmax/tc/tcbus.c:1.31	Wed Nov 16 19:37:06 2016
+++ src/sys/arch/pmax/tc/tcbus.c	Mon Dec 12 17:03:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcbus.c,v 1.31 2016/11/16 19:37:06 macallan Exp $	*/
+/*	$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.31 2016/11/16 19:37:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $");
 
 #define	_PMAX_BUS_DMA_PRIVATE
 /*
@@ -179,8 +179,6 @@ tc_ds_get_dma_tag(int slot)
 #include 
 #include 
 
-int	tc_checkslot(tc_addr_t, char *);
-
 struct cnboards {
 	const char	*cb_tcname;
 	void	(*cb_cnattach)(tc_addr_t);

Index: src/sys/dev/tc/tc.c
diff -u src/sys/dev/tc/tc.c:1.53 src/sys/dev/tc/tc.c:1.54
--- src/sys/dev/tc/tc.c:1.53	Tue Jul 19 18:27:27 2016
+++ src/sys/dev/tc/tc.c	Mon Dec 12 17:03:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tc.c,v 1.53 2016/07/19 18:27:27 christos Exp $	*/
+/*	$NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.53 2016/07/19 18:27:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $");
 
 #include "opt_tcverbose.h"
 
@@ -209,6 +209,17 @@ static const tc_offset_t tc_slot_romoffs
 static int
 tc_check_romp(const struct tc_rommap *romp)
 {
+
+	switch (romp->tcr_width.v) {
+	case 1:
+	case 2:
+	case 4:
+		break;
+
+	default:
+		return 0;
+	}
+
 	if (romp->tcr_stride.v != 4)
 		return 0;
 
@@ -232,16 +243,6 @@ tc_checkslot(tc_addr_t slotbase, char *n
 		romp = (struct tc_rommap *)
 		(slotbase + tc_slot_romoffs[i]);
 
-		switch (romp->tcr_width.v) {
-		case 1:
-		case 2:
-		case 4:
-			break;
-
-		default:
-			continue;
-		}
-
 		if (!tc_check_romp(romp))
 			continue;
 

CVS commit: src/sys/dev/usb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec 12 16:47:06 UTC 2016

Modified Files:
src/sys/dev/usb: uchcom.c

Log Message:
Followling an advice in a linux forum, don't update LCR1/LCR2.
With this change this CH340 usb/serial based device:
https://www.olimex.com/Products/Breadboarding/BB-CH340T/open-source-hardware
(the chip is written H340T)
works as expected. As I'm not sure if this is needed for older device,
make this change for sc_version 0x30 or newer only.
While there, match USB_PRODUCT_WINCHIPHEAD2_CH341_2 too.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/uchcom.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/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.16 src/sys/dev/usb/uchcom.c:1.17
--- src/sys/dev/usb/uchcom.c:1.16	Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uchcom.c	Mon Dec 12 16:47:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uchcom.c,v 1.16 2016/11/25 12:56:29 skrll Exp $	*/
+/*	$NetBSD: uchcom.c,v 1.17 2016/12/12 16:47:06 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.16 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.17 2016/12/12 16:47:06 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -95,6 +95,7 @@ int	uchcomdebug = 0;
 #define UCHCOM_REG_LCR2		0x25
 
 #define UCHCOM_VER_20		0x20
+#define UCHCOM_VER_30		0x30
 
 #define UCHCOM_BASE_UNKNOWN	0
 #define UCHCOM_BPS_MOD_BASE	2000
@@ -180,6 +181,7 @@ static const struct uchcom_divider_recor
 static const struct usb_devno uchcom_devs[] = {
 	{ USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER },
 	{ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341 },
+	{ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2 },
 };
 #define uchcom_lookup(v, p)	usb_lookup(uchcom_devs, v, p)
 
@@ -572,6 +574,7 @@ update_version(struct uchcom_softc *sc)
 		usbd_errstr(err));
 		return EIO;
 	}
+	DPRINTF(("%s: update_version %d\n", device_xname(sc->sc_dev), sc->sc_version));
 
 	return 0;
 }
@@ -717,50 +720,52 @@ set_dte_rate(struct uchcom_softc *sc, ui
 static int
 set_line_control(struct uchcom_softc *sc, tcflag_t cflag)
 {
-	usbd_status err;
-	uint8_t lcr1val = 0, lcr2val = 0;
+	if (sc->sc_version < UCHCOM_VER_30) {
+		usbd_status err;
+		uint8_t lcr1val = 0, lcr2val = 0;
 
-	err = read_reg(sc, UCHCOM_REG_LCR1, , UCHCOM_REG_LCR2, );
-	if (err) {
-		aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
-		usbd_errstr(err));
-		return EIO;
-	}
+		err = read_reg(sc, UCHCOM_REG_LCR1, , UCHCOM_REG_LCR2, );
+		if (err) {
+			aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
+			usbd_errstr(err));
+			return EIO;
+		}
 
-	lcr1val &= ~UCHCOM_LCR1_MASK;
-	lcr2val &= ~UCHCOM_LCR2_MASK;
+		lcr1val &= ~UCHCOM_LCR1_MASK;
+		lcr2val &= ~UCHCOM_LCR2_MASK;
 
-	/*
-	 * XXX: it is difficult to handle the line control appropriately:
-	 *   - CS8, !CSTOPB and any parity mode seems ok, but
-	 *   - the chip doesn't have the function to calculate parity
-	 * in !CS8 mode.
-	 *   - it is unclear that the chip supports CS5,6 mode.
-	 *   - it is unclear how to handle stop bits.
-	 */
-
-	switch (ISSET(cflag, CSIZE)) {
-	case CS5:
-	case CS6:
-	case CS7:
-		return EINVAL;
-	case CS8:
-		break;
-	}
+		/*
+		 * XXX: it is difficult to handle the line control appropriately:
+		 *   - CS8, !CSTOPB and any parity mode seems ok, but
+		 *   - the chip doesn't have the function to calculate parity
+		 * in !CS8 mode.
+		 *   - it is unclear that the chip supports CS5,6 mode.
+		 *   - it is unclear how to handle stop bits.
+		 */
+
+		switch (ISSET(cflag, CSIZE)) {
+		case CS5:
+		case CS6:
+		case CS7:
+			return EINVAL;
+		case CS8:
+			break;
+		}
 
-	if (ISSET(cflag, PARENB)) {
-		lcr1val |= UCHCOM_LCR1_PARENB;
-		if (ISSET(cflag, PARODD))
-			lcr2val |= UCHCOM_LCR2_PARODD;
-		else
-			lcr2val |= UCHCOM_LCR2_PAREVEN;
-	}
+		if (ISSET(cflag, PARENB)) {
+			lcr1val |= UCHCOM_LCR1_PARENB;
+			if (ISSET(cflag, PARODD))
+lcr2val |= UCHCOM_LCR2_PARODD;
+			else
+lcr2val |= UCHCOM_LCR2_PAREVEN;
+		}
 
-	err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
-	if (err) {
-		aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
-		usbd_errstr(err));
-		return EIO;
+		err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
+		if (err) {
+			aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
+			usbd_errstr(err));
+			return EIO;
+		}
 	}
 
 	return 0;

CVS commit: src/sys/dev/usb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec 12 16:43:14 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen for USB_PRODUCT_WINCHIPHEAD2_CH341_2


To generate a diff of this commit:
cvs rdiff -u -r1.718 -r1.719 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.719 -r1.720 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.718 src/sys/dev/usb/usbdevs.h:1.719
--- src/sys/dev/usb/usbdevs.h:1.718	Sat Nov 26 09:37:39 2016
+++ src/sys/dev/usb/usbdevs.h	Mon Dec 12 16:43:14 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.718 2016/11/26 09:37:39 skrll Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.719 2016/12/12 16:43:14 bouyer Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.727 2016/11/26 09:36:43 skrll Exp
+ *	NetBSD: usbdevs,v 1.728 2016/12/12 16:41:08 bouyer Exp
  */
 
 /*
@@ -3391,7 +3391,8 @@
 
 /* WinChipHead products */
 #define	USB_PRODUCT_WINCHIPHEAD_CH341SER	0x5523		/* CH341/CH340 USB-Serial Bridge */
-#define	USB_PRODUCT_WINCHIPHEAD2_CH341	0x7523		/* CH341 serial/parallel */
+#define	USB_PRODUCT_WINCHIPHEAD2_CH341	0x7523		/* CH341 USB-Serial Bridge */
+#define	USB_PRODUCT_WINCHIPHEAD2_CH341_2	0x5523		/* CH341 USB-Serial Bridge */
 
 /* Wistron NeWeb products */
 #define	USB_PRODUCT_WISTRONNEWEB_WNC0600	0x0326		/* WNC-0600USB */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.719 src/sys/dev/usb/usbdevs_data.h:1.720
--- src/sys/dev/usb/usbdevs_data.h:1.719	Sat Nov 26 09:37:39 2016
+++ src/sys/dev/usb/usbdevs_data.h	Mon Dec 12 16:43:14 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.719 2016/11/26 09:37:39 skrll Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.720 2016/12/12 16:43:14 bouyer Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.727 2016/11/26 09:36:43 skrll Exp
+ *	NetBSD: usbdevs,v 1.728 2016/12/12 16:41:08 bouyer Exp
  */
 
 /*
@@ -4587,15 +4587,17 @@ static const uint16_t usb_products[] = {
 	USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER, 
 	19140, 16875, 1764, 0,
 	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341, 
-	19152, 19158, 0,
+	19152, 16875, 1764, 0,
+	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2, 
+	19152, 16875, 1764, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600, 
-	19174, 0,
+	19158, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR045G, 
 	5185, 4718, 5193, 5158, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, 
-	19186, 0,
+	19170, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_O8494, 
-	19193, 19201, 0,
+	19177, 19185, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1, 
 	6763, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF, 
@@ -4605,7 +4607,7 @@ static const uint16_t usb_products[] = {
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF, 
 	6763, 0,
 	USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING, 
-	19209, 19217, 0,
+	19193, 19201, 0,
 	USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM, 
 	672, 5627, 2890, 0,
 	USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_MODEM_1, 
@@ -4615,53 +4617,53 @@ static const uint16_t usb_products[] = {
 	USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_2, 
 	5185, 4718, 5193, 5158, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256, 
-	19224, 16389, 16380, 0,
+	19208, 16389, 16380, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU1000, 
-	19230, 16389, 16424, 0,
+	19214, 16389, 16424, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU2000, 
-	19237, 16389, 16424, 0,
+	19221, 16389, 16424, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU500, 
-	19244, 16389, 16424, 0,
+	19228, 16389, 16424, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UW500, 
-	19250, 4718, 7014, 16380, 0,
+	19234, 4718, 7014, 16380, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF6, 
-	19256, 16389, 16424, 19263, 0,
+	19240, 16389, 16424, 19247, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF7, 
-	19275, 16389, 16424, 19263, 0,
+	19259, 16389, 16424, 19247, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF8, 
-	19282, 16389, 16424, 19263, 0,
+	19266, 16389, 16424, 19247, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96, 
-	19289, 16389, 16380, 0,
+	19273, 16389, 16380, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX16, 
-	19294, 16389, 16380, 0,
+	19278, 16389, 16380, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_S08, 
-	19299, 16389, 5719, 0,
+	19283, 16389, 5719, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP150, 
-	19303, 14208, 

CVS commit: src/sys/dev/usb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Dec 12 16:41:08 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Rename "CH341 serial/parallel" to "CH341 USB-Serial Bridge", and
add a second device id for this chip.
>From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.727 -r1.728 src/sys/dev/usb/usbdevs

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/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.727 src/sys/dev/usb/usbdevs:1.728
--- src/sys/dev/usb/usbdevs:1.727	Sat Nov 26 09:36:43 2016
+++ src/sys/dev/usb/usbdevs	Mon Dec 12 16:41:08 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.727 2016/11/26 09:36:43 skrll Exp $
+$NetBSD: usbdevs,v 1.728 2016/12/12 16:41:08 bouyer Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3384,7 +3384,8 @@ product WESTERN EXTHDD		0x0400	External 
 
 /* WinChipHead products */
 product WINCHIPHEAD CH341SER	0x5523	CH341/CH340 USB-Serial Bridge
-product WINCHIPHEAD2 CH341	0x7523	CH341 serial/parallel
+product WINCHIPHEAD2 CH341	0x7523	CH341 USB-Serial Bridge
+product WINCHIPHEAD2 CH341_2	0x5523	CH341 USB-Serial Bridge
 
 /* Wistron NeWeb products */
 product WISTRONNEWEB WNC0600	0x0326	WNC-0600USB

CVS commit: src/external/cddl/dtracetoolkit/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Dec 12 16:30:03 UTC 2016

Modified Files:
src/external/cddl/dtracetoolkit/dist: dexplorer errinfo hotkernel rwtop

Log Message:
simple path fixes


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/cddl/dtracetoolkit/dist/dexplorer \
src/external/cddl/dtracetoolkit/dist/errinfo \
src/external/cddl/dtracetoolkit/dist/hotkernel \
src/external/cddl/dtracetoolkit/dist/rwtop

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

Modified files:

Index: src/external/cddl/dtracetoolkit/dist/dexplorer
diff -u src/external/cddl/dtracetoolkit/dist/dexplorer:1.1.1.1 src/external/cddl/dtracetoolkit/dist/dexplorer:1.2
--- src/external/cddl/dtracetoolkit/dist/dexplorer:1.1.1.1	Wed Sep 30 18:01:06 2015
+++ src/external/cddl/dtracetoolkit/dist/dexplorer	Mon Dec 12 11:30:03 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/bin/ksh
 #
 # dexplorer - DTrace system explorer, runs a collection of scripts.
 # Written using DTrace (Solaris 10 3/05).
@@ -7,7 +7,7 @@
 # many areas of the system, and places the output in a meaningful directory
 # structure that is tar'd and gzip'd.
 #
-# $Id: dexplorer,v 1.1.1.1 2015/09/30 22:01:06 christos Exp $
+# $Id: dexplorer,v 1.2 2016/12/12 16:30:03 christos Exp $
 #
 # USAGE:	dexplorer [-yDT] [-d outputdir] [-i interval]
 #
@@ -64,7 +64,7 @@ tar=1	# create tar file
 delete=1# delete output dirs
 dtrace=/usr/sbin/dtrace			# path to dtrace
 root=.	# default output dir
-PATH=/usr/bin:/usr/sbin			# safe path
+PATH=/bin:/sbin:/usr/bin:/usr/sbin		# safe path
 dir=de_`uname -n`_`date +%Y%m%d%H%M`	# OUTPUT FILENAME
 samples=20# max number of tests
 current=0# current sample
Index: src/external/cddl/dtracetoolkit/dist/errinfo
diff -u src/external/cddl/dtracetoolkit/dist/errinfo:1.1.1.1 src/external/cddl/dtracetoolkit/dist/errinfo:1.2
--- src/external/cddl/dtracetoolkit/dist/errinfo:1.1.1.1	Wed Sep 30 18:01:06 2015
+++ src/external/cddl/dtracetoolkit/dist/errinfo	Mon Dec 12 11:30:03 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/pkg/bin/perl
 #
 # errinfo - report on syscall failures and print errno error messages.
 #	Written using Perl and DTrace (Solaris 10 03/05)
@@ -9,7 +9,7 @@
 # and prints details for all syscall failures along with their message,
 # whether the failing program is already printing this info or not.
 #
-# $Id: errinfo,v 1.1.1.1 2015/09/30 22:01:06 christos Exp $
+# $Id: errinfo,v 1.2 2016/12/12 16:30:03 christos Exp $
 #
 # USAGE:	errinfo [-ch] [-p PID] [-n name]
 #
Index: src/external/cddl/dtracetoolkit/dist/hotkernel
diff -u src/external/cddl/dtracetoolkit/dist/hotkernel:1.1.1.1 src/external/cddl/dtracetoolkit/dist/hotkernel:1.2
--- src/external/cddl/dtracetoolkit/dist/hotkernel:1.1.1.1	Wed Sep 30 18:01:06 2015
+++ src/external/cddl/dtracetoolkit/dist/hotkernel	Mon Dec 12 11:30:03 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/pkg/bin/perl -w
 #
 # hotkernel - sample on-CPU kernel-level functions and modules.
 # Written using Perl and DTrace (Solaris 10 03/05)
@@ -9,7 +9,7 @@
 # the hottest. See Notes/ALLexclusive_notes.txt for an explanation of
 # exclusive time.
 #
-# $Id: hotkernel,v 1.1.1.1 2015/09/30 22:01:06 christos Exp $
+# $Id: hotkernel,v 1.2 2016/12/12 16:30:03 christos Exp $
 #
 # USAGE:hotkernel [-hm]
 #
Index: src/external/cddl/dtracetoolkit/dist/rwtop
diff -u src/external/cddl/dtracetoolkit/dist/rwtop:1.1.1.1 src/external/cddl/dtracetoolkit/dist/rwtop:1.2
--- src/external/cddl/dtracetoolkit/dist/rwtop:1.1.1.1	Wed Sep 30 18:01:06 2015
+++ src/external/cddl/dtracetoolkit/dist/rwtop	Mon Dec 12 11:30:03 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/bin/ksh
 #
 # rwtop - display top read/write bytes by process.
 # Written using DTrace (Solaris 10 3/05).
@@ -6,7 +6,7 @@
 # This is measuring reads and writes at the application level. This matches
 # read and write system calls.
 #
-# $Id: rwtop,v 1.1.1.1 2015/09/30 22:01:06 christos Exp $
+# $Id: rwtop,v 1.2 2016/12/12 16:30:03 christos Exp $
 #
 # USAGE:	rwtop [-cC] [-j|-Z] [-n name] [-p pid]
 #		  [-t top] [interval [count]]

CVS commit: src

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Mon Dec 12 15:58:45 UTC 2016

Modified Files:
src/libexec/telnetd: state.c
src/sys/arch/amiga/dev: siop2_script.ss siop_script.ss
src/sys/arch/arc/dti: btl.c
src/sys/arch/pmax/ibus: sii.c
src/sys/dev/i2c: hytp14reg.h
src/sys/dev/microcode/siop: osiop.ss
src/sys/dev/qbus: if_qt.c
src/sys/net: slcompress.h
src/sys/netbt: l2cap_upper.c
src/sys/netisdn: i4b_ioctl.h

Log Message:
acknowleg -> acknowledg, proceedure -> procedure.
only comments were changed.

from miod


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/libexec/telnetd/state.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/siop2_script.ss
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/siop_script.ss
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/ibus/sii.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/hytp14reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/siop/osiop.ss
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/qbus/if_qt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/net/slcompress.h
cvs rdiff -u -r1.18 -r1.19 src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netisdn/i4b_ioctl.h

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

Modified files:

Index: src/libexec/telnetd/state.c
diff -u src/libexec/telnetd/state.c:1.29 src/libexec/telnetd/state.c:1.30
--- src/libexec/telnetd/state.c:1.29	Mon Jan  9 16:36:48 2012
+++ src/libexec/telnetd/state.c	Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $	*/
+/*	$NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $");
+__RCSID("$NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $");
 #endif
 #endif /* not lint */
 
@@ -401,14 +401,14 @@ gotiac:			switch (c) {
  * Finally, there is one catch.  If we send a negative response to a
  * positive request, my_state will be the positive while want_state will
  * remain negative.  my_state will revert to negative when the negative
- * acknowlegment arrives from the peer.  Thus, my_state generally tells
+ * acknowledgment arrives from the peer.  Thus, my_state generally tells
  * us not only the last negotiated state, but also tells us what the peer
  * wants to be doing as well.  It is important to understand this difference
  * as we may wish to be processing data streams based on our desired state
  * (want_state) or based on what the peer thinks the state is (my_state).
  *
  * This all works fine because if the peer sends a positive request, the data
- * that we receive prior to negative acknowlegment will probably be affected
+ * that we receive prior to negative acknowledgment will probably be affected
  * by the positive state, and we can process it as such (if we can; if we
  * can't then it really doesn't matter).  If it is that important, then the
  * peer probably should be buffering until this option state negotiation

Index: src/sys/arch/amiga/dev/siop2_script.ss
diff -u src/sys/arch/amiga/dev/siop2_script.ss:1.7 src/sys/arch/amiga/dev/siop2_script.ss:1.8
--- src/sys/arch/amiga/dev/siop2_script.ss:1.7	Wed Oct 21 23:53:38 2009
+++ src/sys/arch/amiga/dev/siop2_script.ss	Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: siop2_script.ss,v 1.7 2009/10/21 23:53:38 snj Exp $
+;	$NetBSD: siop2_script.ss,v 1.8 2016/12/12 15:58:44 maya Exp $
 
 ;
 ; Copyright (c) 1998 Michael L. Hitch
@@ -146,7 +146,7 @@ wait_reselect:
 	INT err9, WHEN NOT MSG_IN	; didn't get IDENTIFY
 	MOVE FROM ds_Msg, WHEN MSG_IN
 	INT err3			; let host know about reconnect
-	CLEAR ACK			; acknowlege the message
+	CLEAR ACK			; acknowledge the message
 	JUMP REL(switch)
 
 

Index: src/sys/arch/amiga/dev/siop_script.ss
diff -u src/sys/arch/amiga/dev/siop_script.ss:1.5 src/sys/arch/amiga/dev/siop_script.ss:1.6
--- src/sys/arch/amiga/dev/siop_script.ss:1.5	Wed Oct 21 23:53:38 2009
+++ src/sys/arch/amiga/dev/siop_script.ss	Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: siop_script.ss,v 1.5 2009/10/21 23:53:38 snj Exp $
+;	$NetBSD: siop_script.ss,v 1.6 2016/12/12 15:58:44 maya Exp $
 
 ;
 ; Copyright (c) 1995 Michael L. Hitch
@@ -141,7 +141,7 @@ wait_reselect:
 	INT err9, WHEN NOT MSG_IN	; didn't get IDENTIFY
 	MOVE FROM ds_Msg, WHEN MSG_IN
 	INT err3			; let host know about reconnect
-	CLEAR ACK			; acknowlege the message
+	CLEAR ACK			; acknowledge the message
 	JUMP REL(switch)
 
 

Index: src/sys/arch/arc/dti/btl.c
diff -u src/sys/arch/arc/dti/btl.c:1.26 src/sys/arch/arc/dti/btl.c:1.27
--- src/sys/arch/arc/dti/btl.c:1.26	Sat Oct 18 08:33:24 2014
+++ src/sys/arch/arc/dti/btl.c	Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: btl.c,v 1.26 2014/10/18 08:33:24 snj Exp 

CVS commit: src/sys/modules/spkr_synth

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Mon Dec 12 13:31:13 UTC 2016

Modified Files:
src/sys/modules/spkr_synth: spkr_synth.ioconf

Log Message:
Fix path to files.audio.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/spkr_synth/spkr_synth.ioconf

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

Modified files:

Index: src/sys/modules/spkr_synth/spkr_synth.ioconf
diff -u src/sys/modules/spkr_synth/spkr_synth.ioconf:1.1 src/sys/modules/spkr_synth/spkr_synth.ioconf:1.2
--- src/sys/modules/spkr_synth/spkr_synth.ioconf:1.1	Sat Dec 10 00:39:40 2016
+++ src/sys/modules/spkr_synth/spkr_synth.ioconf	Mon Dec 12 13:31:13 2016
@@ -1,9 +1,9 @@
-# $NetBSD: spkr_synth.ioconf,v 1.1 2016/12/10 00:39:40 pgoyette Exp $
+# $NetBSD: spkr_synth.ioconf,v 1.2 2016/12/12 13:31:13 nat Exp $
 
 ioconf spkr
 
 include "conf/files"
-include "conf/files.audio"
+include "dev/files.audio"
 
 pseudo-root audio*
 

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Dec 12 13:17:56 UTC 2016

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

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.132.4.14 -r1.132.4.15 src/sys/dev/usb/if_aue.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_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.4.14 src/sys/dev/usb/if_aue.c:1.132.4.15
--- src/sys/dev/usb/if_aue.c:1.132.4.14	Mon Dec 12 13:15:39 2016
+++ src/sys/dev/usb/if_aue.c	Mon Dec 12 13:17:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.132.4.14 2016/12/12 13:15:39 skrll Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.132.4.15 2016/12/12 13:17:56 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.14 2016/12/12 13:15:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.15 2016/12/12 13:17:56 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -811,8 +811,6 @@ aue_attach(device_t parent, device_t sel
 		return;
 	}
 
-
-
 	/* Reset the adapter. */
 	aue_reset(sc);
 

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Dec 12 13:15:39 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_aue.c if_auereg.h if_axe.c if_axen.c
if_axenreg.h if_axereg.h if_cdce.c if_cdcereg.h if_cue.c
if_cuereg.h if_udav.c if_udavreg.h

Log Message:
WIP MPification


To generate a diff of this commit:
cvs rdiff -u -r1.132.4.13 -r1.132.4.14 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.25.24.3 -r1.25.24.4 src/sys/dev/usb/if_auereg.h
cvs rdiff -u -r1.67.4.12 -r1.67.4.13 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.3.6.12 -r1.3.6.13 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.1.12.2 -r1.1.12.3 src/sys/dev/usb/if_axenreg.h
cvs rdiff -u -r1.16.6.4 -r1.16.6.5 src/sys/dev/usb/if_axereg.h
cvs rdiff -u -r1.38.14.9 -r1.38.14.10 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.7.24.4 -r1.7.24.5 src/sys/dev/usb/if_cdcereg.h
cvs rdiff -u -r1.68.4.12 -r1.68.4.13 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.18.24.4 -r1.18.24.5 src/sys/dev/usb/if_cuereg.h
cvs rdiff -u -r1.43.4.11 -r1.43.4.12 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.9.16.4 -r1.9.16.5 src/sys/dev/usb/if_udavreg.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/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.4.13 src/sys/dev/usb/if_aue.c:1.132.4.14
--- src/sys/dev/usb/if_aue.c:1.132.4.13	Mon Dec  5 10:55:18 2016
+++ src/sys/dev/usb/if_aue.c	Mon Dec 12 13:15:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.132.4.13 2016/12/05 10:55:18 skrll Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.132.4.14 2016/12/12 13:15:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -71,14 +71,13 @@
  * TODO:
  * better error messages from rxstat
  * split out if_auevar.h
- * add thread to avoid register reads from interrupt context
  * more error checks
  * investigate short rx problem
  * proper cleanup on errors
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.13 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.14 2016/12/12 13:15:39 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -217,11 +216,11 @@ extern struct cfdriver aue_cd;
 CFATTACH_DECL_NEW(aue, sizeof(struct aue_softc), aue_match, aue_attach,
 aue_detach, aue_activate);
 
-Static void aue_multithread(void *);
-
 Static void aue_reset_pegasus_II(struct aue_softc *);
 Static int aue_tx_list_init(struct aue_softc *);
+Static void aue_tx_list_free(struct aue_softc *);
 Static int aue_rx_list_init(struct aue_softc *);
+Static void aue_rx_list_free(struct aue_softc *);
 Static int aue_newbuf(struct aue_softc *, struct aue_chain *, struct mbuf *);
 Static int aue_send(struct aue_softc *, struct mbuf *, int);
 Static void aue_intr(struct usbd_xfer *, void *, usbd_status);
@@ -230,11 +229,14 @@ Static void aue_txeof(struct usbd_xfer *
 Static void aue_tick(void *);
 Static void aue_tick_task(void *);
 Static void aue_start(struct ifnet *);
+Static void aue_start_locked(struct ifnet *);
 Static int aue_ioctl(struct ifnet *, u_long, void *);
-Static void aue_init(void *);
-Static void aue_stop(struct aue_softc *);
+Static int aue_ifflags_cb(struct ethercom *);
+Static int aue_init(struct ifnet *);
+Static int aue_init_locked(struct ifnet *);
+Static void aue_stop(struct ifnet *, int);
+Static void aue_stop_locked(struct ifnet *, int);
 Static void aue_watchdog(struct ifnet *);
-Static int aue_openpipes(struct aue_softc *);
 Static int aue_ifmedia_upd(struct ifnet *);
 
 Static int aue_eeprom_getword(struct aue_softc *, int);
@@ -723,7 +725,6 @@ aue_attach(device_t parent, device_t sel
 	struct aue_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	char			*devinfop;
-	int			s;
 	u_char			eaddr[ETHER_ADDR_LEN];
 	struct ifnet		*ifp;
 	struct mii_data		*mii;
@@ -755,6 +756,9 @@ aue_attach(device_t parent, device_t sel
 	usb_init_task(>aue_tick_task, aue_tick_task, sc, 0);
 	usb_init_task(>aue_stop_task, (void (*)(void *))aue_stop, sc, 0);
 	mutex_init(>aue_mii_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(>aue_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(>aue_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(>aue_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
 
 	err = usbd_device2interface_handle(dev, AUE_IFACE_IDX, );
 	if (err) {
@@ -764,13 +768,8 @@ aue_attach(device_t parent, device_t sel
 	sc->aue_closing = 0;
 
 	mutex_init(>aue_mcmtx, MUTEX_DRIVER, IPL_NET);
-	cv_init(>aue_domc, "auemc");
 	cv_init(>aue_closemc, "auemccl");
 
-	err = kthread_create(PRI_NONE, 0, NULL,
-		aue_multithread, sc, >aue_thread,
-		"%s-mc", device_xname(sc->aue_dev));
-
 	if (err) {
 		aprint_error_dev(self,
 		"creating multicast configuration thread\n");
@@ -813,7 +812,6 @@ aue_attach(device_t parent, device_t sel
 	}
 
 
-	s = splnet();
 
 	/* Reset the adapter. */
 	aue_reset(sc);
@@ -833,6 +831,8 @@ aue_attach(device_t parent, device_t sel
 	ifp->if_softc = sc;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = 

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

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Mon Dec 12 13:13:12 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: ad.aarch64

Log Message:
Add missing files in distribution file lists to fix evbarm64-aarch64 build

Add ./usr/libdata/ldscripts/aarch64elf{,b}.xd{,c,w}

Tested with MKLLVM=yes and HAVE_LLVM=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/ad.aarch64

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/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.12 src/distrib/sets/lists/comp/ad.aarch64:1.13
--- src/distrib/sets/lists/comp/ad.aarch64:1.12	Tue Oct 11 08:04:23 2016
+++ src/distrib/sets/lists/comp/ad.aarch64	Mon Dec 12 13:13:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.12 2016/10/11 08:04:23 mrg Exp $
+# $NetBSD: ad.aarch64,v 1.13 2016/12/12 13:13:11 kamil Exp $
 ./usr/include/aarch64comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -144,6 +144,9 @@
 ./usr/libdata/ldscripts/aarch64elf.x		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elf.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elf.xc		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elf.xd		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elf.xdc		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elf.xdw		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elf.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elf.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elf.xs		-unknown-		binutils
@@ -154,6 +157,9 @@
 ./usr/libdata/ldscripts/aarch64elfb.x		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elfb.xbn		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elfb.xc		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elfb.xd		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elfb.xdc		-unknown-		binutils
+./usr/libdata/ldscripts/aarch64elfb.xdw		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elfb.xn		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elfb.xr		-unknown-		binutils
 ./usr/libdata/ldscripts/aarch64elfb.xs		-unknown-		binutils

CVS commit: src/share/man/man4

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Mon Dec 12 11:49:27 UTC 2016

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

Log Message:
Update audio man page with regard to audio changes.
OK wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/share/man/man4/audio.4

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

Modified files:

Index: src/share/man/man4/audio.4
diff -u src/share/man/man4/audio.4:1.72 src/share/man/man4/audio.4:1.73
--- src/share/man/man4/audio.4:1.72	Tue Sep  6 01:17:48 2011
+++ src/share/man/man4/audio.4	Mon Dec 12 11:49:27 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.4,v 1.72 2011/09/06 01:17:48 jmcneill Exp $
+.\"	$NetBSD: audio.4,v 1.73 2016/12/12 11:49:27 nat Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 5, 2011
+.Dd December 11, 2016
 .Dt AUDIO 4
 .Os
 .Sh NAME
@@ -67,11 +67,16 @@ operations as
 .Pa /dev/sound ,
 but no other operations.
 .Pp
-In contrast to
 .Pa /dev/sound
-which has the exclusive open property
+and
+.Pa /dev/audio
+can be opened at
+.Em any
+time and audio sources of different precision and playback
+parameters i.e frequency will be mixed and played back simultaneously.
+.Pp
 .Pa /dev/audioctl
-can be opened at any time and can be used to manipulate the audio device
+can be used to manipulate the audio device
 while it is in use.
 .Sh SAMPLING DEVICES
 When
@@ -84,16 +89,67 @@ recording (playing) unpaused and playing
 When
 .Pa /dev/sound
 is opened, it maintains the previous audio sample mode and
-record/playback mode.
+record/playback mode most recently set on
+.Pa /dev/sound
+by any open channel.
 In all other respects
 .Pa /dev/audio
 and
 .Pa /dev/sound
 are identical.
+.Sh VIRTUAL CHANNELS
+Any process may open a sampling device at a given time.
+There is a constraint of
+.Em one
+device per process and file descriptors may
+.Em not
+be shared between processes.
+.Pp
+Virtual channels are converted to a common format, signed linear encoding,
+frequency channels and precision.
+These can be modified to taste by the following
+.Xr sysctl 8
+variables.
+.Pp
+.Bl -tag -width -compact
+.It hw.driverN.precision
+.It hw.driverN.frequency
+.It hw.driverN.channels
+.It hw.driverN.saturate
+.El
 .Pp
-Only one process may hold open a sampling device at a given time
-(although file descriptors may be shared between processes once the
-first open completes).
+Where
+.Em driverN
+corresponds to the underlying audio device driver and device number.
+e.g In the case of an hdafg supported device the variables would be:
+hw.hdafg0.channels, hw.hdafg0.precision, hw.hdafg0.frequency.
+.Pp
+For best results, values close to the underlying hardware should be chosen.
+These variables may only be changed when the sampling device is not in use.
+.Pp
+An additional
+.Xr sysctl 8
+variable controls how the samples are combined, hw.driverN.saturate.
+.Pp
+By default it is set to true.
+This means that volumes are not adjusted for each channel to be mixed.
+All virtual channels will use the
+.Em maximum
+set master volume unless the virtual channel volume is lowered by the user.
+.Pp
+If set to false the channels are
+.Em divided
+evenly in volume with respect to the master volume.
+.Pp
+Each virtual channel has a corresponding mixer:
+.Bl -tag -width -compact
+.It outputs.dacN  Output volume
+.It inputs.micN   Recording volume
+.El
+.Pp
+Where N is the virtual channel number.
+e.g ouputs.dac0 controlling playback volume and outputs.mic0 controlling
+recording volume for the first virtual channel.
 .Pp
 On a half-duplex device, writes while recording is in progress will be
 immediately discarded.
@@ -177,6 +233,17 @@ The following
 commands are supported on the sample devices:
 .Pp
 .Bl -tag -width indent
+.It Dv AUDIO_SETPROC (struct audio_pid)
+This command will select the audio device opened by pid.
+.Bd -literal
+struct audio_pid {
+pid_t   pid;
+lwpid_t lwpid;
+};
+.Ed
+.Pp
+Currently the lpwid value is
+.Em ignored .
 .It Dv AUDIO_FLUSH
 This command stops all playback and recording, clears all queued
 buffers, resets error counters, and restarts recording and playback as
@@ -682,7 +749,8 @@ string values.
 .Xr ioctl 2 ,
 .Xr ossaudio 3 ,
 .Xr midi 4 ,
-.Xr radio 4
+.Xr radio 4 ,
+.Xr sysctl 8
 .Ss ISA bus
 .Xr aria 4 ,
 .Xr ess 4 ,
@@ -716,7 +784,8 @@ string values.
 .Ss USB
 .Xr uaudio 4
 .Sh BUGS
-If the device is used in
 .Xr mmap 2
-it is currently always mapped for writing (playing) due to
-VM system weirdness.
+currently does not work and should be avoided.
+.Sh HISTORY
+Support for virtual channels and mixing first appeared in
+.Nx 8.0 .

CVS commit: src/sys/dev

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Dec 12 10:46:39 UTC 2016

Modified Files:
src/sys/dev: spkr_synth.c

Log Message:
Mark bell_thread as static and dead.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/spkr_synth.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/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.5 src/sys/dev/spkr_synth.c:1.6
--- src/sys/dev/spkr_synth.c:1.5	Fri Dec  9 13:26:11 2016
+++ src/sys/dev/spkr_synth.c	Mon Dec 12 10:46:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spkr_synth.c,v 1.5 2016/12/09 13:26:11 christos Exp $	*/
+/*	$NetBSD: spkr_synth.c,v 1.6 2016/12/12 10:46:39 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.5 2016/12/09 13:26:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.6 2016/12/12 10:46:39 joerg Exp $");
 
 #include 
 #include 
@@ -55,7 +55,7 @@ struct vbell_args {
 	bool dying;
 };
 
-void bell_thread(void *);
+static void bell_thread(void *) __dead;
 static int beep_sysctl_device(SYSCTLFN_PROTO);
 
 #include 

CVS commit: src/tests/lib/libc/gen/exect

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Dec 12 10:34:55 UTC 2016

Modified Files:
src/tests/lib/libc/gen/exect: t_exect.c

Log Message:
sig_atomic_t does not include volatile. Prevent static analysis from
understanding that the test function is dead.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/exect/t_exect.c

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

Modified files:

Index: src/tests/lib/libc/gen/exect/t_exect.c
diff -u src/tests/lib/libc/gen/exect/t_exect.c:1.5 src/tests/lib/libc/gen/exect/t_exect.c:1.6
--- src/tests/lib/libc/gen/exect/t_exect.c:1.5	Sun Dec 11 03:38:09 2016
+++ src/tests/lib/libc/gen/exect/t_exect.c	Mon Dec 12 10:34:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_exect.c,v 1.5 2016/12/11 03:38:09 kamil Exp $	*/
+/*	$NetBSD: t_exect.c,v 1.6 2016/12/12 10:34:55 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@ ATF_TC_HEAD(t_exect_null, tc)
 	"Tests an empty exect(2) executing");
 }
 
-static sig_atomic_t caught = 0;
+static volatile sig_atomic_t caught = 0;
 
 static void
 sigtrap_handler(int sig, siginfo_t *info, void *ctx)
@@ -66,8 +66,9 @@ ATF_TC_BODY(t_exect_null, tc)
 	 * designed and implemented and is breaking tests - skip it
 	 * unconditionally for all ports.
 	 */
-
-	atf_tc_skip("exect(3) misdesigned and hangs - PR port-amd64/51700");
+	/* Prevent static analysis from requiring t_exec_null to be __dead. */
+	if (!caught) 
+		atf_tc_skip("exect(3) misdesigned and hangs - PR port-amd64/51700");
 
 	ATF_REQUIRE(sigemptyset(_mask) == 0);
 	act.sa_sigaction = sigtrap_handler;

CVS commit: [netbsd-7] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 10:22:20 UTC 2016

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

Log Message:
Update for ticket 1304.


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.129 src/doc/CHANGES-7.1:1.1.2.130
--- src/doc/CHANGES-7.1:1.1.2.129	Mon Dec 12 09:34:08 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 10:22:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.129 2016/12/12 09:34:08 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.130 2016/12/12 10:22:20 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7381,9 +7381,137 @@ sys/external/bsd/drm2/ttm/ttm_bus_dma.c	
 - i915: avoid taking locks during interrupts
 	[snj, ticket #1280]
 
+xsrc/external/mit/xf86-video-nouveau/dist/COPYING patch
+xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog patch
+xsrc/external/mit/xf86-video-nouveau/dist/INSTALL patch
+xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 patch
+xsrc/external/mit/xf86-video-nouveau/dist/compile patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.guess patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.h.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.sub patch
+xsrc/external/mit/xf86-video-nouveau/dist/configure patch
+xsrc/external/mit/xf86-video-nouveau/dist/configure.ac patch
+xsrc/external/mit/xf86-video-nouveau/dist/depcomp patch
+xsrc/external/mit/xf86-video-nouveau/dist/install-sh patch	
+xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh patch
+xsrc/external/mit/xf86-video-nouveau/dist/missing patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c	patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_type.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy85b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy90b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copya0b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_local.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_dma.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_rop.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_shadow.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Dec 12 10:13:00 UTC 2016

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

Log Message:
Improve wording. Fix typo. Remove superfluous Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/cgd.4

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

Modified files:

Index: src/share/man/man4/cgd.4
diff -u src/share/man/man4/cgd.4:1.20 src/share/man/man4/cgd.4:1.21
--- src/share/man/man4/cgd.4:1.20	Sun Dec 11 00:24:48 2016
+++ src/share/man/man4/cgd.4	Mon Dec 12 10:13:00 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgd.4,v 1.20 2016/12/11 00:24:48 alnsn Exp $
+.\" $NetBSD: cgd.4,v 1.21 2016/12/12 10:13:00 wiz Exp $
 .\"
 .\" Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -71,9 +71,9 @@ in
 mode.
 .Tn AES-XTS
 uses a 128 bit blocksize and can accept keys of length 256 or 512.
-Note that
+Note that an
 .Tn AES-XTS
-key is made of two
+key consists of two
 .Tn AES
 keys of equal size.
 The second key is used solely to encrypt the block number of the physical
@@ -174,7 +174,6 @@ and their associated data structures are
 .In dev/cgdvar.h
 header.
 .Sh WARNINGS
-.Pp
 It goes without saying that if you forget the passphrase that you used
 to configure a
 .Nm ,
@@ -192,7 +191,7 @@ mode to plaintext blocks of their choice
 The
 .Tn
 XTS mode isn't vulnerable to this particular attack but a lack of
-integrity should be taken into accout when evaluating security risks.
+integrity should be taken into account when evaluating security risks.
 .Sh FILES
 .Bl -tag -width indentxxx
 .It /dev/{,r}cgd*

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Dec 12 10:10:06 UTC 2016

Modified Files:
src/share/man/man9: dksubr.9

Log Message:
New sentence, new line.
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/dksubr.9

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/man9/dksubr.9
diff -u src/share/man/man9/dksubr.9:1.3 src/share/man/man9/dksubr.9:1.4
--- src/share/man/man9/dksubr.9:1.3	Sat Dec 10 09:49:00 2016
+++ src/share/man/man9/dksubr.9	Mon Dec 12 10:10:05 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dksubr.9,v 1.3 2016/12/10 09:49:00 mlelstv Exp $
+.\"	$NetBSD: dksubr.9,v 1.4 2016/12/12 10:10:05 wiz Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -219,7 +219,8 @@ to cooperate with
 .It Fn dk_getdefaultlabel
 Compute a common default disklabel for all disk drivers.
 Some drivers provide device specific information or assign specific
-disk formats to partitions. Such drivers may implement the
+disk formats to partitions.
+Such drivers may implement the
 .Nm d_label
 callback that is called by
 .Nm dk_getdefaultlabel
@@ -257,7 +258,8 @@ and starts queue processing as appropria
 The driver minphys routine limits the buffer
 .Nm b_bcount
 to the maximum size for an I/O transfer supported by the driver
-and hardware. It also calls
+and hardware.
+It also calls
 .Nm minphys
 to apply the platform limit.
 .It Fn d_open
@@ -268,7 +270,8 @@ The driver close routine.
 Issues a single I/O request, called by
 .Nm dk_start .
 .It Fn d_iosize
-Truncate I/O size to the driver limit. This is similar to
+Truncate I/O size to the driver limit.
+This is similar to
 .Nm minphys
 but operates on an integer value instead of a buffer.
 .It Fn d_dumpblocks
@@ -282,11 +285,11 @@ Issue a single I/O request to invalidate
 .It Fn d_firstopen
 Private initialization when first user opens the driver.
 .Sh SEE ALSO
-.Xr driver 9 ,
-.Xr disk 9 ,
-.Xr cprng 9 ,
+.Xr cgd 4 ,
 .Xr ld 4 ,
-.Xr cgd 4 .
+.Xr cprng 9 ,
+.Xr disk 9 ,
+.Xr driver 9
 .Sh HISTORY
 The
 .Nx

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Dec 12 10:09:52 UTC 2016

Modified Files:
src/share/man/man9: disk.9

Log Message:
Fix xref.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/share/man/man9/disk.9

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/man9/disk.9
diff -u src/share/man/man9/disk.9:1.41 src/share/man/man9/disk.9:1.42
--- src/share/man/man9/disk.9:1.41	Sat Dec 10 09:49:00 2016
+++ src/share/man/man9/disk.9	Mon Dec 12 10:09:52 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: disk.9,v 1.41 2016/12/10 09:49:00 mlelstv Exp $
+.\"	$NetBSD: disk.9,v 1.42 2016/12/12 10:09:52 wiz Exp $
 .\"
 .\" Copyright (c) 1995, 1996 Jason R. Thorpe.
 .\" All rights reserved.
@@ -541,7 +541,7 @@ and
 .Xr ccd 4 ,
 .Xr dm 4 ,
 .Xr vnd 4 ,
-.Xr dksubr 4
+.Xr dksubr 9
 .Sh HISTORY
 The
 .Nx

CVS commit: src/libexec/identd

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Dec 12 10:07:48 UTC 2016

Modified Files:
src/libexec/identd: identd.8

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/libexec/identd/identd.8

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

Modified files:

Index: src/libexec/identd/identd.8
diff -u src/libexec/identd/identd.8:1.21 src/libexec/identd/identd.8:1.22
--- src/libexec/identd/identd.8:1.21	Sat Dec 10 05:43:11 2016
+++ src/libexec/identd/identd.8	Mon Dec 12 10:07:48 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: identd.8,v 1.21 2016/12/10 05:43:11 christos Exp $
+.\" $NetBSD: identd.8,v 1.22 2016/12/12 10:07:48 wiz Exp $
 .\"
 .\" This software is in the public domain.
 .\" Written by Peter Postma 
@@ -236,7 +236,7 @@ will need access to either
 (ipfilter),
 .Pa /dev/pf
 (pf), or
-.Pa /dev/npf.
+.Pa /dev/npf .
 Since it's not a good idea to run
 .Nm
 under root, you'll need to adjust group owner/permissions to the device(s)

CVS commit: [netbsd-7] src/external/mit/xorg

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 10:01:17 UTC 2016

Added Files:
src/external/mit/xorg/lib/libdrm_nouveau [netbsd-7]: Makefile
shlib_version
src/external/mit/xorg/server/drivers/xf86-video-nouveau [netbsd-7]:
Makefile

Log Message:
Add three miissing files for ticket #1305 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/xorg/lib/libdrm_nouveau/Makefile \
src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
cvs rdiff -u -r0 -r1.6.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile

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

Added files:

Index: src/external/mit/xorg/lib/libdrm_nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,25 @@
+#  $NetBSD: Makefile,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+.include 
+
+LIB=	drm_nouveau
+.PATH: ${X11SRCDIR.drm}
+.PATH: ${X11SRCDIR.drm}/nouveau
+
+SRCS=	nouveau.c \
+	pushbuf.c \
+	bufctx.c \
+	abi16.c
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
+
+LIBDPLIBS=	drm	${.CURDIR}/../libdrm
+
+PKGCONFIG=	libdrm_nouveau
+PKGDIST=	drm
+
+.include "../libdrm/Makefile.defines"
+
+.include 
+.include 
Index: src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/shlib_version	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+#
+major=2
+minor=0

Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,51 @@
+#	$NetBSD: Makefile,v 1.6.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+DRIVER=		xf86-video-nouveau
+DRIVER_NAME=	nouveau_drv
+
+SRCS=		nouveau_copy.c \
+		nouveau_copy85b5.c \
+		nouveau_copy90b5.c \
+		nouveau_copya0b5.c \
+		nouveau_exa.c \
+		nouveau_xv.c \
+		nouveau_dri2.c \
+		nouveau_present.c \
+		nouveau_sync.c \
+		nouveau_wfb.c \
+		nv_accel_common.c \
+		nv_driver.c \
+		nv_shadow.c \
+		nv04_exa.c \
+		nv04_xv_ovl.c \
+		nv04_xv_blit.c \
+		nv10_exa.c \
+		nv10_xv_ovl.c \
+		nv30_exa.c \
+		nv30_xv_tex.c \
+		nv40_exa.c \
+		nv40_xv_tex.c \
+		nv50_accel.c \
+		nv50_exa.c \
+		nv50_xv.c \
+		nvc0_accel.c \
+		nvc0_exa.c \
+		nvc0_xv.c \
+		drmmode_display.c \
+		vl_hwmc.c
+
+LIBDPLIBS+=	drm_nouveau ${.CURDIR}/../../../lib/libdrm_nouveau
+
+MAN=		nouveau.4
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+
+CPPFLAGS+=	-DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
+CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_MINOR}
+CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
+CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
+
+.include "../Makefile.xf86-driver"
+
+# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
+DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog

CVS commit: src/tests/net/if_pppoe

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Mon Dec 12 09:56:59 UTC 2016

Modified Files:
src/tests/net/if_pppoe: t_pppoe.sh

Log Message:
fix accidentally if_pppoe atf failure depends on cpu workload.

advised by s-yamaguchi@IIJ, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/net/if_pppoe/t_pppoe.sh

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

Modified files:

Index: src/tests/net/if_pppoe/t_pppoe.sh
diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.14 src/tests/net/if_pppoe/t_pppoe.sh:1.15
--- src/tests/net/if_pppoe/t_pppoe.sh:1.14	Fri Dec  2 06:19:50 2016
+++ src/tests/net/if_pppoe/t_pppoe.sh	Mon Dec 12 09:56:58 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_pppoe.sh,v 1.14 2016/12/02 06:19:50 knakahara Exp $
+#	$NetBSD: t_pppoe.sh,v 1.15 2016/12/12 09:56:58 knakahara Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -114,8 +114,14 @@ wait_for_disconnected()
 	local n=$WAITTIME
 
 	for i in $(seq $n); do
-		$HIJACKING pppoectl -d pppoe0 | grep -q "state = session"
-		[ $? -eq 0 ] || return
+		$HIJACKING pppoectl -d pppoe0 | grep -q "state = initial"
+		[ $? = 0 ] && return
+		# If PPPoE client is disconnected by PPPoE server and then
+		# the client kicks callout of pppoe_timeout(), the client
+		# state is changed to PPPOE_STATE_PADI_SENT while padi retrying.
+		$HIJACKING pppoectl -d pppoe0 | grep -q "state = PADI sent"
+		[ $? = 0 ] && return
+
 		sleep 1
 	done
 

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nouveau/dist

[SAITOH Masanobu]

Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:55:30 UTC 2016

Added Files:
xsrc/external/mit/xf86-video-nouveau/dist [netbsd-7]: COPYING ChangeLog
INSTALL Makefile.am Makefile.in aclocal.m4 compile config.guess
config.h.in config.sub configure configure.ac depcomp install-sh
ltmain.sh missing
xsrc/external/mit/xf86-video-nouveau/dist/man [netbsd-7]: Makefile.am
Makefile.in nouveau.man
xsrc/external/mit/xf86-video-nouveau/dist/src [netbsd-7]: Makefile.am
Makefile.in compat-api.h drmmode_display.c nouveau_copy.c
nouveau_copy.h nouveau_copy85b5.c nouveau_copy90b5.c
nouveau_copya0b5.c nouveau_dri2.c nouveau_exa.c nouveau_local.h
nouveau_present.c nouveau_present.h nouveau_sync.c nouveau_sync.h
nouveau_wfb.c nouveau_xv.c nv04_accel.h nv04_exa.c nv04_xv_blit.c
nv04_xv_ovl.c nv10_exa.c nv10_xv_ovl.c nv30_exa.c nv30_xv_tex.c
nv40_exa.c nv40_xv_tex.c nv50_accel.c nv50_accel.h nv50_exa.c
nv50_xv.c nv_accel_common.c nv_const.h nv_dma.h nv_driver.c
nv_include.h nv_proto.h nv_rop.h nv_shadow.c nv_type.h nvc0_accel.c
nvc0_accel.h nvc0_exa.c nvc0_xv.c vl_hwmc.c vl_hwmc.h
xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs [netbsd-7]:
nv01_2d.xml.h nv10_3d.xml.h nv30-40_3d.xml.h nv50_2d.xml.h
nv50_3d.xml.h nv50_defs.xml.h nv50_texture.h nv_3ddefs.xml.h
nv_m2mf.xml.h nv_object.xml.h nvc0_3d.xml.h nvc0_m2mf.xml.h
xsrc/external/mit/xf86-video-nouveau/dist/src/shader [netbsd-7]:
Makefile exac8nvc0.fp exac8nvc0.fpc exac8nve0.fp exac8nve0.fpc
exac8nvf0.fp exac8nvf0.fpc exacanvc0.fp exacanvc0.fpc exacanve0.fp
exacanve0.fpc exacanvf0.fp exacanvf0.fpc exacmnvc0.fp exacmnvc0.fpc
exacmnve0.fp exacmnve0.fpc exacmnvf0.fp exacmnvf0.fpc exas8nvc0.fp
exas8nvc0.fpc exas8nve0.fp exas8nve0.fpc exas8nvf0.fp exas8nvf0.fpc
exasanvc0.fp exasanvc0.fpc exasanve0.fp exasanve0.fpc exasanvf0.fp
exasanvf0.fpc exascnvc0.fp exascnvc0.fpc exascnve0.fp exascnve0.fpc
exascnvf0.fp exascnvf0.fpc videonvc0.fp videonvc0.fpc videonve0.fp
videonve0.fpc videonvf0.fp videonvf0.fpc xfrm2nvc0.vp xfrm2nvc0.vpc
xfrm2nve0.vp xfrm2nve0.vpc xfrm2nvf0.vp xfrm2nvf0.vpc

Log Message:
r-sync-to-head for ticket #1304 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/COPYING \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog \
xsrc/external/mit/xf86-video-nouveau/dist/INSTALL \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-nouveau/dist/compile \
xsrc/external/mit/xf86-video-nouveau/dist/config.guess \
xsrc/external/mit/xf86-video-nouveau/dist/config.h.in \
xsrc/external/mit/xf86-video-nouveau/dist/config.sub \
xsrc/external/mit/xf86-video-nouveau/dist/configure \
xsrc/external/mit/xf86-video-nouveau/dist/configure.ac \
xsrc/external/mit/xf86-video-nouveau/dist/depcomp \
xsrc/external/mit/xf86-video-nouveau/dist/install-sh \
xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh \
xsrc/external/mit/xf86-video-nouveau/dist/missing
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h \

CVS commit: [netbsd-7] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:34:08 UTC 2016

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

Log Message:
Ticket 1280, 1304 and 1305.


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.128 src/doc/CHANGES-7.1:1.1.2.129
--- src/doc/CHANGES-7.1:1.1.2.128	Mon Dec 12 08:08:33 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 09:34:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.128 2016/12/12 08:08:33 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.129 2016/12/12 09:34:08 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7348,3 +7348,62 @@ usr.sbin/mld6query/mld6.c			1.15
 	PR/51353: Patrick Mackey: mld6query "-r" option is not recognised
 	[riastradh, ticket #1308]
 
+sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c 1.4
+sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c 1.11
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c 1.5
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nv40.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c 1.7
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dp.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c 1.4
+sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c 1.8
+sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c	1.7
+sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_driver.h 1.3
+sys/external/bsd/drm2/drm/drm_vma_manager.c	1.4
+sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h 1.14
+sys/external/bsd/drm2/include/drm/ttm/ttm_page_alloc.h 1.2
+sys/external/bsd/drm2/nouveau/nouveau_pci.c	1.8
+sys/external/bsd/drm2/ttm/ttm_bus_dma.c		1.2
+
+	DRMKMS fixes:
+	- nouveau:
+	  + fix non-DEBUG builds
+	  + misc cleanup
+  + use bus_space_subregion to get fifo channels out of mmio
+	registers
+- suspend/resume improvements
+- make sure rbtrees are empty on destruction
+- i915: avoid taking locks during interrupts
+	[snj, ticket #1280]
+
+xsrc/external/mit/xorg-server/dist/include/list.h	1.3
+
+	Add list_append() macro that xf86-video-nouveau 1.0.11 wants.
+	[snj, ticket #1304]
+
+distrib/sets/lists/xbase/md.amd64		1.15 via patch
+distrib/sets/lists/xbase/md.i386		1.29
+distrib/sets/lists/xcomp/md.amd64		1.43 via patch
+distrib/sets/lists/xcomp/md.i386		1.48 via patch
+distrib/sets/lists/xcomp/mi			1.175
+distrib/sets/lists/xdebug/md.amd64		1.22 via patch
+distrib/sets/lists/xdebug/md.i386		1.21 via patch
+distrib/sets/lists/xserver/md.amd64		1.85-1.87
+distrib/sets/lists/xserver/md.i386		1.103-1.105
+external/mit/xorg/lib/Makefile			1.36
+external/mit/xorg/lib/gallium/Makefile		1.8
+external/mit/xorg/lib/gallium/Makefile		1.9
+external/mit/xorg/lib/libdrm/drm/Makefile	1.7
+external/mit/xorg/lib/libdrm_nouveau/Makefile	1.1
+external/mit/xorg/lib/libdrm_nouveau/shlib_version 1.1
+external/mit/xorg/server/drivers/Makefile	1.70
+external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile 1.1, 1.2 via patch
+share/mk/bsd.own.mk1.875 via patch
+
+	Build xf86-video-nouveau and libdrm_nouveau on x86.
+	[snj, ticket #1305]

CVS commit: [netbsd-7] src

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:32:35 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xcomp [netbsd-7]: md.amd64 md.i386 mi
src/distrib/sets/lists/xdebug [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xserver [netbsd-7]: md.amd64 md.i386
src/external/mit/xorg/lib [netbsd-7]: Makefile
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
src/external/mit/xorg/lib/libdrm/drm [netbsd-7]: Makefile
src/external/mit/xorg/server/drivers [netbsd-7]: Makefile
src/share/mk [netbsd-7]: bsd.own.mk

Log Message:
Pull up following revision(s) (requested by snj in ticket #1305):
distrib/sets/lists/xbase/md.amd64: revision 1.15 via patch
distrib/sets/lists/xbase/md.i386: revision 1.29
distrib/sets/lists/xcomp/md.amd64: revision 1.43 via patch
distrib/sets/lists/xcomp/md.i386: revision 1.48 via patch
distrib/sets/lists/xcomp/mi: revision 1.175
distrib/sets/lists/xdebug/md.amd64: revision 1.22 via patch
distrib/sets/lists/xdebug/md.i386: revision 1.21 via patch
distrib/sets/lists/xserver/md.amd64: revisions 1.85-1.87
distrib/sets/lists/xserver/md.i386: revision 1.103-1.105
external/mit/xorg/lib/Makefile: revision 1.36
external/mit/xorg/lib/gallium/Makefile: revision 1.8, 1.9
external/mit/xorg/lib/libdrm/drm/Makefile: revision 1.7
external/mit/xorg/lib/libdrm_nouveau/Makefile: revision 1.1
external/mit/xorg/lib/libdrm_nouveau/shlib_version: revision 1.1
external/mit/xorg/server/drivers/Makefile: revision 1.70
external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile: revisions 
1.1, 1.2 via patch
share/mk/bsd.own.mk: revision 1.875 via patch
Build xf86-video-nouveau and libdrm_nouveau on x86.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.27 -r1.27.4.1 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.38 -r1.38.2.1 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.152.2.6 -r1.152.2.7 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.6.4.4 -r1.6.4.5 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.73.4.3 -r1.73.4.4 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.63.10.2 -r1.63.10.3 \
src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.829.2.9 -r1.829.2.10 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.11 src/distrib/sets/lists/xbase/md.amd64:1.11.4.1
--- src/distrib/sets/lists/xbase/md.amd64:1.11	Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.amd64	Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.11 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.amd64,v 1.11.4.1 2016/12/12 09:32:34 msaitoh Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -14,4 +14,7 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0		-unknown-		xorg
 ./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete

Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.27 src/distrib/sets/lists/xbase/md.i386:1.27.4.1
--- src/distrib/sets/lists/xbase/md.i386:1.27	Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.i386	Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.27 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.i386,v 1.27.4.1 2016/12/12 09:32:34 msaitoh Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -14,4 +14,7 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0		-unknown-		xorg
 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

[SAITOH Masanobu]

Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:17:36 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: list.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #1304):
external/mit/xorg-server/dist/include/list.h: revision 1.3
add list_append() macro that xf86-video-nouveau 1.0.11 wants.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xorg-server/dist/include/list.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/include/list.h
diff -u xsrc/external/mit/xorg-server/dist/include/list.h:1.2 xsrc/external/mit/xorg-server/dist/include/list.h:1.2.2.1
--- xsrc/external/mit/xorg-server/dist/include/list.h:1.2	Sat Mar 22 04:17:25 2014
+++ xsrc/external/mit/xorg-server/dist/include/list.h	Mon Dec 12 09:17:36 2016
@@ -100,4 +100,10 @@ list_is_empty(const struct list *head)
 	 >member != (head);	\
 	 pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
 
+static inline void
+list_append(struct list *entry, struct list *head)
+{
+__list_add(entry, head, head->next);
+}
+
 #endif

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:13:43 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gpu_error.c
src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_bo.c
nouveau_connector.c nouveau_dp.c nouveau_gem.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/core [netbsd-7]:
nouveau_core_object.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device 
[netbsd-7]:
nouveau_engine_device_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp [netbsd-7]:
nouveau_engine_disp_nvd0.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo [netbsd-7]:
nouveau_engine_fifo_base.c nouveau_engine_fifo_nv40.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit 
[netbsd-7]:
nouveau_subdev_devinit_nv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm [netbsd-7]:
nouveau_subdev_mxm_mxms.c nouveau_subdev_mxm_nv50.c
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_ttm.c
src/sys/external/bsd/drm2/dist/drm/ttm [netbsd-7]: ttm_tt.c
src/sys/external/bsd/drm2/dist/include/drm/ttm [netbsd-7]:
ttm_bo_driver.h
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_vma_manager.c
src/sys/external/bsd/drm2/include/drm [netbsd-7]: drm_wait_netbsd.h
src/sys/external/bsd/drm2/include/drm/ttm [netbsd-7]: ttm_page_alloc.h
src/sys/external/bsd/drm2/nouveau [netbsd-7]: nouveau_pci.c
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bus_dma.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1280):
sys/external/bsd/drm2/ttm/ttm_bus_dma.c: revision 1.2
sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h: revision 1.14
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dp.c: revision 1.2
sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c: revision 1.7

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:
 revision 1.11

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nv40.c:
 revision 1.2
sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_driver.h: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c: revision 1.8
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c: revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c: revision 1.4

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c:
 revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c: revision 1.7
sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c: 
revision 1.3
sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c: revision 1.4

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c:
 revision 1.2

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c:
 revision 1.3

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c:
 revision 1.3

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c:
 revision 1.5
sys/external/bsd/drm2/include/drm/ttm/ttm_page_alloc.h: revision 1.2
sys/external/bsd/drm2/drm/drm_vma_manager.c: revision 1.4
sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.8
- fix non-debug build
- Use %"PRIx8", not %hx, for uint8_t.  %hx is for unsigned short.
- Flush unused function. Found by joerg.
- Make sure rbtrees are empty on desctruction.
  If related to PR kern/51076, might help catch the bug a bit earlier.
- revert rev 1.6.  we don't have access to those files as normal files
  and possible will get them directly elsewhere soon.
  (if i hack my nouveau to ignore fireware failure, it end up having
  a vaguely working console and slowly working X, which is better than
  the current situation.)
- Avoid possible null pointer dereference. Found by Coverity, CID 709895.
- Mark fallthrough to suppress Coverity complaints.
  CID 143119
  CID 143120
  CID 143121
  CID 143122
  CID 143123
  CID 143124
- Sanity-check that the encoder we found is not null.
  I think the previous code guarantees that finding this encoder should
  work, so this should be a moot point. CID 145720.
- Mark intended fallthrough to suppress Coverity CID 201378.
- Mark fallthrough with a comment to appease Coverity, CID 703385.
- Make it clearer to Coverity that there's no array overrun. CID 989067.
- Rework ttm tt swapin/swapout logic.
  Rather than handling `swapping in/out' here, per se, we let uvm do
  that, we interpret `swap out' as `deactivate pages', and we add
  generic ttm operations to wire and unwire pages, for the ttm_tt
  driver to use.
  This fixes certain graphics buffer eviction logic, which enables
  

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 08:08:33 UTC 2016

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

Log Message:
tickets 1301-1303, 1306-1308


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.127 src/doc/CHANGES-7.1:1.1.2.128
--- src/doc/CHANGES-7.1:1.1.2.127	Fri Dec  9 05:41:31 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 08:08:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.127 2016/12/09 05:41:31 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.128 2016/12/12 08:08:33 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7216,3 +7216,135 @@ sys/edv/pci/pcidevs_data.h			regen
 	i82567V-3 is not ICH9 but ICH8.
 	[msaitoh, ticket #1300]
 
+sys/dev/mii/atphy.c1.18
+sys/dev/mii/ihphy.c1.10
+sys/dev/mii/ikphy.c1.12
+sys/dev/mii/inphy.c1.55
+sys/dev/mii/makphy.c1.42
+
+	Set mii_mpd{oui,model,rev}. It's required to check
+	the values in wm(4) correctly.
+	[msaitoh, ticket #1301]
+
+sys/dev/pci/if_wm.c1.390, 1.392-1.395, 1.397, 1.419-1.425, 1.427-1.428, 1.430-1.435, 1.437-1.453 via patch
+sys/dev/pci/if_wmreg.h1.89-1.93 via patch
+sys/dev/pci/if_wmvar.h1.31-1.32
+sys/dev/mii/mii.h1.19-1.20
+sys/dev/mii/igphyreg.h1.7-1.10
+sys/dev/mii/ikphyreg.h1.3
+sys/dev/mii/inbmphyreg.h			1.4-1.9
+
+	Update wm(4) up to if_wm.c rev. 1.453 except MSI/MSI-X, multiqueue and
+	NET_MPSAFE:
+	- Add I219 support. It's not stable so it's disabled by default.
+	- wm_gate_hw_phy_config_ich8lan() is for younger than PCH2.
+	- Drop the host wakeup bit after resetting PHY on PCH and newer
+	  devices.
+	- Increase delay while toggling LANPHYPC
+	- Move call of wm_reset() in wm_attach() after setting PHY and NVM
+	  related flags because those flags are used in wm_reset().
+	- Use mutex for NVM access on ICH8 and newer devices. Same as FreeBSD.
+	- Rewrite PHY related lock stuff. Almost the same as FreeBSD.
+	  This change will fix a bug that PHY read/write fail on some cases.
+	- Increase delay in wm_phy_resetisblocked(). Same as FreeBSD.
+	- Use semaphore in wm_hv_phy_workaround_ich8lan() and
+	  wm_k1_gig_workaround_hv()
+	- Use wm_gii_mdic_readreg/writereg() in wm_access_phy_wakeup_reg_bm()
+	  because these functions are called with taking lock.
+	- 82567V_3 is BME1000_E_2(bm). Tested with Advantech AIMB-212 1st
+	  Ethernet port.
+	- Use wm_gmii_82544_{read,write}reg() on non-82567 ICH8, 9 and 10.
+	- Remove an 82578 workaround which was for PCH rev < 3. FreeBSD
+	  removed this workaround in r228386.
+	- Add an 82578 workaround which is for PHY rev < 2. From FreeBSD and
+	  Linux.
+	- Fix wm(4) input drop packet counter. WMREG_RNBC is incremented when
+	  there is no available buffers in host memory. However, ethernet
+	  controller can receive packets in such case if there is space in
+	  phy's FIFO. That is, ethernet controller drops packet only if there
+	  is no available buffers *and* there is no space in phy's FIFO. So,
+	  the number of dropped packets should be added WMREG_MPC only.
+	- Use MII_ADDRMASK.
+	- Define WMPHY_I217, WMPHY_VF and WMPHY_210.
+	- Use BME1000_PHY_PAGE_SELECT in wm_gmii_bm_{read,write}reg(). This
+	  change has no effect because GG82563_PHY_PAGE_SELECT and
+	  BME1000_PHY_PAGE_SELECT have the same value.
+	- Fix PHY access on  82567(ICH8 or ICH10), 82574 and 82583:
+	  - Use wm_gmii_bm_{read,write}reg() on 82574 and 82573.
+	  - Issue page select correctly on BM PHYs.
+	- Fix workaround which did dummy read BM_WUC register. This code was
+	  changed to drop BM_WUC_HOST_WU_BIT of BM_PROT_GEN_CFG register in
+	  FreeBSD r228386. The code was added rev. 1.149, but the location was
+	  not the best.
+	- wm_gmii_hv_{read/write}reg*(): USE PHY address 1 for some special
+	  registers.
+	- Add check code for an 82578 workaround. Not completed yet.
+	- wm_release_hw_control(): Remove extra line. No any effect.
+	- Add "10/100" into non-gigabit devices' name.
+	- Call wm_enable_wakeup() in wm_detach() and wm_suspend(). Now wake on
+	  lan works on Thinkpad X61(ICH8).
+	- Fix wm_access_phy_wakeup_reg_bm(). This change has no effect because
+	  this function is used for WUC register and our driver currenlty
+	  doesn't access to it.
+	- Call wm_enable_phy_wakeup() on PCH2 and newer, too. Now these devices
+	  can do WOL. Tested with Thinkpad X220(PCH2).
+	- Set CTRL_MEHE correctly (PCH_{LPT,SPT} only).
+	- Add three workarounds for PCH_{LPT,SPT}.
+	- Fix a bug that 8257[56], 82580, I35[04] and I21[01] didn't use
+	  wm_{get,release}_hw_control() correctly.
+	- Sync wm_smbustopci() with Linux and FreeBSD. This change effects PCH
+	  and newer devices.
+	- Move the location of wm_smbustopci() call.
+	- Fix flag check in wm_get_wakeup()
+	  - 8254[17]* and