CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 07:34:31 UTC 2018

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Get rid of unnecessary ifdef for IFT_IEEE80211


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/netinet6/nd6_nbr.c

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

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 07:34:31 UTC 2018

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Get rid of unnecessary ifdef for IFT_IEEE80211


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.141 src/sys/netinet6/nd6_nbr.c:1.142
--- src/sys/netinet6/nd6_nbr.c:1.141	Wed Jan 10 07:11:38 2018
+++ src/sys/netinet6/nd6_nbr.c	Wed Jan 10 07:34:31 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.141 2018/01/10 07:11:38 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.142 2018/01/10 07:34:31 ozaki-r Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.141 2018/01/10 07:11:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.142 2018/01/10 07:34:31 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1383,9 +1383,7 @@ nd6_dad_duplicated(struct ifaddr *ifa)
 		case IFT_FDDI:
 		case IFT_ATM:
 		case IFT_IEEE1394:
-#ifdef IFT_IEEE80211
 		case IFT_IEEE80211:
-#endif
 			in6 = ia->ia_addr.sin6_addr;
 			if (in6_get_hw_ifid(ifp, ) == 0 &&
 			IN6_ARE_ADDR_EQUAL(>ia_addr.sin6_addr, )) {

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 07:11:38 UTC 2018

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Fix a deadlock on callout_halt of nd6_dad_timer

We must not call callout_halt of nd6_dad_timer with holding nd6_dad_lock because
the lock is taken in nd6_dad_timer. Once softnet_lock goes away, we can pass the
lock to callout_halt, but for now we cannot.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.140 src/sys/netinet6/nd6_nbr.c:1.141
--- src/sys/netinet6/nd6_nbr.c:1.140	Tue Dec 26 02:26:45 2017
+++ src/sys/netinet6/nd6_nbr.c	Wed Jan 10 07:11:38 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.140 2017/12/26 02:26:45 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.141 2018/01/10 07:11:38 ozaki-r Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.140 2017/12/26 02:26:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.141 2018/01/10 07:11:38 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1356,9 +1356,6 @@ nd6_dad_duplicated(struct ifaddr *ifa)
 	ia->ia6_flags &= ~IN6_IFF_TENTATIVE;
 	ia->ia6_flags |= IN6_IFF_DUPLICATED;
 
-	/* We are done with DAD, with duplicated address found. (failure) */
-	nd6_dad_stoptimer(dp);
-
 	log(LOG_ERR, "%s: DAD complete for %s - duplicate found\n",
 	if_name(ifp), IN6_PRINT(ip6buf, >ia_addr.sin6_addr));
 	log(LOG_ERR, "%s: manual intervention required\n",
@@ -1404,6 +1401,9 @@ nd6_dad_duplicated(struct ifaddr *ifa)
 	TAILQ_REMOVE(, dp, dad_list);
 	mutex_exit(_dad_lock);
 
+	/* We are done with DAD, with duplicated address found. (failure) */
+	nd6_dad_stoptimer(dp);
+
 	kmem_intr_free(dp, sizeof(*dp));
 	ifafree(ifa);
 }

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 07:11:38 UTC 2018

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Fix a deadlock on callout_halt of nd6_dad_timer

We must not call callout_halt of nd6_dad_timer with holding nd6_dad_lock because
the lock is taken in nd6_dad_timer. Once softnet_lock goes away, we can pass the
lock to callout_halt, but for now we cannot.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet6/nd6_nbr.c

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

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 07:08:35 UTC 2018

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
 Print Intel cpuid 7 %edx.

Example output of cpuctl -v identify 0:

+cpu0: 0007:  27ab  0c00
(snip)
+cpu0: SEF edx 0xc00


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.sbin/cpuctl/arch/i386.c

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

Modified files:

Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.78 src/usr.sbin/cpuctl/arch/i386.c:1.79
--- src/usr.sbin/cpuctl/arch/i386.c:1.78	Thu Oct 19 03:09:55 2017
+++ src/usr.sbin/cpuctl/arch/i386.c	Wed Jan 10 07:08:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.78 2017/10/19 03:09:55 msaitoh Exp $	*/
+/*	$NetBSD: i386.c,v 1.79 2018/01/10 07:08:35 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.78 2017/10/19 03:09:55 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.79 2018/01/10 07:08:35 msaitoh Exp $");
 #endif /* not lint */
 
 #include 
@@ -1900,6 +1900,12 @@ identifycpu(int fd, const char *cpuname)
 	if (cpu_vendor == CPUVENDOR_INTEL)
 		print_bits(cpuname, "features6", CPUID_SEF_FLAGS1,
 		ci->ci_feat_val[6]);
+
+	if ((cpu_vendor == CPUVENDOR_INTEL) && (ci->ci_cpuid_level >= 7)) {
+		x86_cpuid(7, descs);
+		print_bits(cpuname, "SEF edx", CPUID_SEF_FLAGS2, descs[3]);
+	}
+
 	print_bits(cpuname, "xsave features", XCR0_FLAGS1, ci->ci_feat_val[7]);
 	print_bits(cpuname, "xsave instructions", CPUID_PES1_FLAGS,
 	ci->ci_feat_val[8]);

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 07:08:35 UTC 2018

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
 Print Intel cpuid 7 %edx.

Example output of cpuctl -v identify 0:

+cpu0: 0007:  27ab  0c00
(snip)
+cpu0: SEF edx 0xc00


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.sbin/cpuctl/arch/i386.c

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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 07:04:54 UTC 2018

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

Log Message:
 Add Intel cpuid 7 %edx IBRS(IBPB Speculation Control) and
STIBP(STIBP Speculation Control) from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.106 src/sys/arch/x86/include/specialreg.h:1.107
--- src/sys/arch/x86/include/specialreg.h:1.106	Wed Jan 10 04:45:24 2018
+++ src/sys/arch/x86/include/specialreg.h	Wed Jan 10 07:04:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.106 2018/01/10 04:45:24 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.107 2018/01/10 07:04:54 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -394,9 +394,12 @@
 /* %edx */
 #define CPUID_SEF_AVX512_4VNNIW	__BIT(2)
 #define CPUID_SEF_AVX512_4FMAPS	__BIT(3)
+#define CPUID_SEF_IBRS		__BIT(26) /* IBRS / IBPB Speculation Control */
+#define CPUID_SEF_STIBP		__BIT(27) /* STIBP Speculation Control */
 
 #define CPUID_SEF_FLAGS2	"\20" \
-"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS"
+"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \
+	"\33" "IBRS"	"\34" "STIBP"
 
 /*
  * CPUID Processor extended state Enumeration Fn000d

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 07:04:54 UTC 2018

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

Log Message:
 Add Intel cpuid 7 %edx IBRS(IBPB Speculation Control) and
STIBP(STIBP Speculation Control) from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/x86/include/specialreg.h

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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 04:45:24 UTC 2018

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

Log Message:
 Add comment.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/x86/include/specialreg.h

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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan 10 04:45:24 UTC 2018

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

Log Message:
 Add comment.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.105 src/sys/arch/x86/include/specialreg.h:1.106
--- src/sys/arch/x86/include/specialreg.h:1.105	Thu Oct 19 06:29:16 2017
+++ src/sys/arch/x86/include/specialreg.h	Wed Jan 10 04:45:24 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.105 2017/10/19 06:29:16 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.106 2018/01/10 04:45:24 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -325,37 +325,37 @@
  */
 
 /* %ebx */
-#define CPUID_SEF_FSGSBASE	__BIT(0)
-#define CPUID_SEF_TSC_ADJUST	__BIT(1)
-#define CPUID_SEF_SGX		__BIT(2)
-#define CPUID_SEF_BMI1		__BIT(3)
-#define CPUID_SEF_HLE		__BIT(4)
-#define CPUID_SEF_AVX2		__BIT(5)
-#define CPUID_SEF_FDPEXONLY	__BIT(6)
-#define CPUID_SEF_SMEP		__BIT(7)
-#define CPUID_SEF_BMI2		__BIT(8)
-#define CPUID_SEF_ERMS		__BIT(9)
-#define CPUID_SEF_INVPCID	__BIT(10)
-#define CPUID_SEF_RTM		__BIT(11)
-#define CPUID_SEF_QM		__BIT(12)
-#define CPUID_SEF_FPUCSDS	__BIT(13)
-#define CPUID_SEF_MPX		__BIT(14)
-#define CPUID_SEF_PQE		__BIT(15)
-#define CPUID_SEF_AVX512F	__BIT(16)
-#define CPUID_SEF_AVX512DQ	__BIT(17)
-#define CPUID_SEF_RDSEED	__BIT(18)
-#define CPUID_SEF_ADX		__BIT(19)
-#define CPUID_SEF_SMAP		__BIT(20)
-#define CPUID_SEF_AVX512_IFMA	__BIT(21)
-#define CPUID_SEF_CLFLUSHOPT	__BIT(23)
-#define CPUID_SEF_CLWB		__BIT(24)
-#define CPUID_SEF_PT		__BIT(25)
-#define CPUID_SEF_AVX512PF	__BIT(26)
-#define CPUID_SEF_AVX512ER	__BIT(27)
-#define CPUID_SEF_AVX512CD	__BIT(28)
-#define CPUID_SEF_SHA		__BIT(29)
-#define CPUID_SEF_AVX512BW	__BIT(30)
-#define CPUID_SEF_AVX512VL	__BIT(31)
+#define CPUID_SEF_FSGSBASE	__BIT(0)  /* {RD,WR}{FS,GS}BASE */
+#define CPUID_SEF_TSC_ADJUST	__BIT(1)  /* IA32_TSC_ADJUST MSR support */
+#define CPUID_SEF_SGX		__BIT(2)  /* Software Guard Extentions */
+#define CPUID_SEF_BMI1		__BIT(3)  /* advanced bit manipulation ext. 1st grp */
+#define CPUID_SEF_HLE		__BIT(4)  /* Hardware Lock Elision */
+#define CPUID_SEF_AVX2		__BIT(5)  /* Advanced Vector Extensions 2 */
+#define CPUID_SEF_FDPEXONLY	__BIT(6)  /* x87FPU Data ptr updated only on x87exp */
+#define CPUID_SEF_SMEP		__BIT(7)  /* Supervisor-Mode Excecution Prevention */
+#define CPUID_SEF_BMI2		__BIT(8)  /* advanced bit manipulation ext. 2nd grp */
+#define CPUID_SEF_ERMS		__BIT(9)  /* Enhanced REP MOVSB/STOSB */
+#define CPUID_SEF_INVPCID	__BIT(10) /* INVPCID instruction */
+#define CPUID_SEF_RTM		__BIT(11) /* Restricted Transactional Memory */
+#define CPUID_SEF_QM		__BIT(12) /* Resource Director Technology Monitoring */
+#define CPUID_SEF_FPUCSDS	__BIT(13) /* Deprecate FPU CS and FPU DS values */
+#define CPUID_SEF_MPX		__BIT(14) /* Memory Protection Extensions */
+#define CPUID_SEF_PQE		__BIT(15) /* Resource Director Technology Allocation */
+#define CPUID_SEF_AVX512F	__BIT(16) /* AVX-512 Foundation */
+#define CPUID_SEF_AVX512DQ	__BIT(17) /* AVX-512 Double/Quadword */
+#define CPUID_SEF_RDSEED	__BIT(18) /* RDSEED instruction */
+#define CPUID_SEF_ADX		__BIT(19) /* ADCX/ADOX instructions */
+#define CPUID_SEF_SMAP		__BIT(20) /* Supervisor-Mode Access Prevention */
+#define CPUID_SEF_AVX512_IFMA	__BIT(21) /* AVX-512 Integer Fused Multiply Add */
+#define CPUID_SEF_CLFLUSHOPT	__BIT(23) /* Cache Line FLUSH OPTimized */
+#define CPUID_SEF_CLWB		__BIT(24) /* Cache Line Write Back */
+#define CPUID_SEF_PT		__BIT(25) /* Processor Trace */
+#define CPUID_SEF_AVX512PF	__BIT(26) /* AVX-512 PreFetch */
+#define CPUID_SEF_AVX512ER	__BIT(27) /* AVX-512 Exponential and Reciprocal */
+#define CPUID_SEF_AVX512CD	__BIT(28) /* AVX-512 Conflict Detection */
+#define CPUID_SEF_SHA		__BIT(29) /* SHA Extensions */
+#define CPUID_SEF_AVX512BW	__BIT(30) /* AVX-512 Byte and Word */
+#define CPUID_SEF_AVX512VL	__BIT(31) /* AVX-512 Vector Length */
 
 #define CPUID_SEF_FLAGS	"\20" \
 	"\1" "FSGSBASE"	"\2" "TSCADJUST" "\3" "SGX"	"\4" "BMI1"	\
@@ -368,20 +368,20 @@
 	"\35" "AVX512CD""\36" "SHA"	"\37" "AVX512BW" "\40" "AVX512VL"
 
 /* %ecx */
-#define CPUID_SEF_PREFETCHWT1	__BIT(0)
-#define CPUID_SEF_AVX512_VBMI	__BIT(1)
-#define CPUID_SEF_UMIP		__BIT(2)
-#define CPUID_SEF_PKU		__BIT(3)
-#define CPUID_SEF_OSPKE		__BIT(4)
-#define CPUID_SEF_AVX512_VBMI2	__BIT(6)
+#define CPUID_SEF_PREFETCHWT1	__BIT(0)  /* PREFETCHWT1 instruction */
+#define CPUID_SEF_AVX512_VBMI	__BIT(1)  /* AVX-512 Vector Byte Manipulation */
+#define CPUID_SEF_UMIP		__BIT(2)  /* User-Mode Instruction prevention */
+#define CPUID_SEF_PKU		__BIT(3)  /* Protection Keys for User-mode pages */
+#define CPUID_SEF_OSPKE		

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 02:50:26 UTC 2018

Modified Files:
src/sys/kern: uipc_domain.c
src/sys/rump/librump/rumpnet: rump_net.c
src/sys/sys: domain.h

Log Message:
Don't start callouts for domains before attaching domains on rump kernels

On rump kernels, the callouts for domains, pffasttimo and pfslowtimo, started
before domains were attached. Normally the callouts were dispatched after
domain attaches (initializations) finished, however, under load the callouts
could be executed prior to the attaches, resulting in that the callouts accessed
unallocated or uninitialized resources.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpnet/rump_net.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/domain.h

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

Modified files:

Index: src/sys/kern/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.100 src/sys/kern/uipc_domain.c:1.101
--- src/sys/kern/uipc_domain.c:1.100	Sat Sep  9 14:41:19 2017
+++ src/sys/kern/uipc_domain.c	Wed Jan 10 02:50:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_domain.c,v 1.100 2017/09/09 14:41:19 joerg Exp $	*/
+/*	$NetBSD: uipc_domain.c,v 1.101 2018/01/10 02:50:26 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.100 2017/09/09 14:41:19 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.101 2018/01/10 02:50:26 ozaki-r Exp $");
 
 #include 
 #include 
@@ -84,6 +84,17 @@ static void sysctl_net_setup(void);
 static struct domain domain_dummy;
 __link_set_add_rodata(domains,domain_dummy);
 
+static void
+domain_init_timers(void)
+{
+
+	callout_init(_ch, CALLOUT_MPSAFE);
+	callout_init(_ch, CALLOUT_MPSAFE);
+
+	callout_reset(_ch, 1, pffasttimo, NULL);
+	callout_reset(_ch, 1, pfslowtimo, NULL);
+}
+
 void
 domaininit(bool attach)
 {
@@ -108,13 +119,20 @@ domaininit(bool attach)
 		}
 		if (rt_domain)
 			domain_attach(rt_domain);
+
+		domain_init_timers();
 	}
+}
 
-	callout_init(_ch, CALLOUT_MPSAFE);
-	callout_init(_ch, CALLOUT_MPSAFE);
+/*
+ * Must be called only if domaininit has been called with false and
+ * after all domains have been attached.
+ */
+void
+domaininit_post(void)
+{
 
-	callout_reset(_ch, 1, pffasttimo, NULL);
-	callout_reset(_ch, 1, pfslowtimo, NULL);
+	domain_init_timers();
 }
 
 void

Index: src/sys/rump/librump/rumpnet/rump_net.c
diff -u src/sys/rump/librump/rumpnet/rump_net.c:1.20 src/sys/rump/librump/rumpnet/rump_net.c:1.21
--- src/sys/rump/librump/rumpnet/rump_net.c:1.20	Tue Jan 17 02:03:09 2017
+++ src/sys/rump/librump/rumpnet/rump_net.c	Wed Jan 10 02:50:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_net.c,v 1.20 2017/01/17 02:03:09 christos Exp $	*/
+/*	$NetBSD: rump_net.c,v 1.21 2018/01/10 02:50:26 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rump_net.c,v 1.20 2017/01/17 02:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_net.c,v 1.21 2018/01/10 02:50:26 ozaki-r Exp $");
 
 #include 
 
@@ -56,4 +56,6 @@ RUMP_COMPONENT(RUMP__FACTION_NET)
 	rump_component_init(RUMP_COMPONENT_NET_ROUTE);
 	rump_component_init(RUMP_COMPONENT_NET_IF);
 	rump_component_init(RUMP_COMPONENT_NET_IFCFG);
+
+	domaininit_post();
 }

Index: src/sys/sys/domain.h
diff -u src/sys/sys/domain.h:1.33 src/sys/sys/domain.h:1.34
--- src/sys/sys/domain.h:1.33	Thu Sep 21 07:15:35 2017
+++ src/sys/sys/domain.h	Wed Jan 10 02:50:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: domain.h,v 1.33 2017/09/21 07:15:35 ozaki-r Exp $	*/
+/*	$NetBSD: domain.h,v 1.34 2018/01/10 02:50:26 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -103,6 +103,7 @@ STAILQ_HEAD(domainhead,domain);
 extern struct domainhead domains;
 void domain_attach(struct domain *);
 void domaininit(bool);
+void domaininit_post(void);
 #endif
 
 #endif /* !_SYS_DOMAIN_H_ */

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 02:50:26 UTC 2018

Modified Files:
src/sys/kern: uipc_domain.c
src/sys/rump/librump/rumpnet: rump_net.c
src/sys/sys: domain.h

Log Message:
Don't start callouts for domains before attaching domains on rump kernels

On rump kernels, the callouts for domains, pffasttimo and pfslowtimo, started
before domains were attached. Normally the callouts were dispatched after
domain attaches (initializations) finished, however, under load the callouts
could be executed prior to the attaches, resulting in that the callouts accessed
unallocated or uninitialized resources.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpnet/rump_net.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/domain.h

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jan 10 01:49:05 UTC 2018

Modified Files:
src/sys/arch/sparc/sparc: memecc.c

Log Message:
s/level 25/level 15/ -- there's nothing higher than 15 on sparc, and
this is talking about NMI.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/sparc/memecc.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/sparc/sparc/memecc.c
diff -u src/sys/arch/sparc/sparc/memecc.c:1.16 src/sys/arch/sparc/sparc/memecc.c:1.17
--- src/sys/arch/sparc/sparc/memecc.c:1.16	Sat Oct 19 19:40:23 2013
+++ src/sys/arch/sparc/sparc/memecc.c	Wed Jan 10 01:49:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: memecc.c,v 1.16 2013/10/19 19:40:23 mrg Exp $	*/
+/*	$NetBSD: memecc.c,v 1.17 2018/01/10 01:49:05 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.16 2013/10/19 19:40:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.17 2018/01/10 01:49:05 mrg Exp $");
 
 #include 
 #include 
@@ -114,7 +114,7 @@ memecc_attach(device_t parent, device_t 
 }
 
 /*
- * Called if the MEMORY ERROR bit is set after a level 25 interrupt.
+ * Called if the MEMORY ERROR bit is set after a level 15 interrupt.
  */
 int
 memecc_error(void)

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jan 10 01:49:05 UTC 2018

Modified Files:
src/sys/arch/sparc/sparc: memecc.c

Log Message:
s/level 25/level 15/ -- there's nothing higher than 15 on sparc, and
this is talking about NMI.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/sparc/memecc.c

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

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 01:22:26 UTC 2018

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

Log Message:
Check MP-safety in ifa_insert and ifa_remove only for IFEF_MPSAFE drivers

Eventually the assertions should pass for all drivers, however, at this point
it's too eager.

Fix PR kern/52895


To generate a diff of this commit:
cvs rdiff -u -r1.417 -r1.418 src/sys/net/if.c

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

Modified files:

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.417 src/sys/net/if.c:1.418
--- src/sys/net/if.c:1.417	Tue Dec 26 02:01:35 2017
+++ src/sys/net/if.c	Wed Jan 10 01:22:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.417 2017/12/26 02:01:35 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.418 2018/01/10 01:22:26 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.417 2017/12/26 02:01:35 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.418 2018/01/10 01:22:26 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1793,12 +1793,13 @@ ifa_insert(struct ifnet *ifp, struct ifa
 	ifa->ifa_ifp = ifp;
 
 	/*
+	 * Check MP-safety for IFEF_MPSAFE drivers.
 	 * Check !IFF_RUNNING for initialization routines that normally don't
 	 * take IFNET_LOCK but it's safe because there is no competitor.
 	 * XXX there are false positive cases because IFF_RUNNING can be off on
 	 * if_stop.
 	 */
-	KASSERT(!ISSET(ifp->if_flags, IFF_RUNNING) ||
+	KASSERT(!if_is_mpsafe(ifp) || !ISSET(ifp->if_flags, IFF_RUNNING) ||
 	IFNET_LOCKED(ifp));
 
 	TAILQ_INSERT_TAIL(>if_addrlist, ifa, ifa_list);
@@ -1814,10 +1815,11 @@ ifa_remove(struct ifnet *ifp, struct ifa
 
 	KASSERT(ifa->ifa_ifp == ifp);
 	/*
+	 * Check MP-safety for IFEF_MPSAFE drivers.
 	 * if_is_deactivated indicates ifa_remove is called form if_detach
 	 * where is safe even if IFNET_LOCK isn't held.
 	 */
-	KASSERT(if_is_deactivated(ifp) || IFNET_LOCKED(ifp));
+	KASSERT(!if_is_mpsafe(ifp) || if_is_deactivated(ifp) || IFNET_LOCKED(ifp));
 
 	TAILQ_REMOVE(>if_addrlist, ifa, ifa_list);
 	IFADDR_WRITER_REMOVE(ifa);

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jan 10 01:22:26 UTC 2018

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

Log Message:
Check MP-safety in ifa_insert and ifa_remove only for IFEF_MPSAFE drivers

Eventually the assertions should pass for all drivers, however, at this point
it's too eager.

Fix PR kern/52895


To generate a diff of this commit:
cvs rdiff -u -r1.417 -r1.418 src/sys/net/if.c

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

CVS commit: src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Jan  9 22:58:45 UTC 2018

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

Log Message:
KASSERT() that kthread_join()'s target is expecting to be joined.

As discussed on IRC.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_kthread.c

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

CVS commit: src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Jan  9 22:58:45 UTC 2018

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

Log Message:
KASSERT() that kthread_join()'s target is expecting to be joined.

As discussed on IRC.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_kthread.c

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

Modified files:

Index: src/sys/kern/kern_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.42 src/sys/kern/kern_kthread.c:1.43
--- src/sys/kern/kern_kthread.c:1.42	Fri Apr 21 15:10:34 2017
+++ src/sys/kern/kern_kthread.c	Tue Jan  9 22:58:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_kthread.c,v 1.42 2017/04/21 15:10:34 christos Exp $	*/
+/*	$NetBSD: kern_kthread.c,v 1.43 2018/01/09 22:58:45 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.42 2017/04/21 15:10:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.43 2018/01/09 22:58:45 pgoyette Exp $");
 
 #include 
 #include 
@@ -194,6 +194,7 @@ kthread_join(lwp_t *l)
 {
 
 	KASSERT((l->l_flag & LW_SYSTEM) != 0);
+	KASSERT((l->l_pflag & LP_MUSTJOIN) != 0);
 
 	/*
 	 * - Wait if some other thread has occupied the target.

CVS commit: src/lib/libkvm

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan  9 21:17:46 UTC 2018

Modified Files:
src/lib/libkvm: kvm_getprocs.3

Log Message:
Correct the signature of kvm_getproc2(3) in the man-page.

The elemsize argument is of type "size_t", not "int".

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libkvm/kvm_getprocs.3

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

Modified files:

Index: src/lib/libkvm/kvm_getprocs.3
diff -u src/lib/libkvm/kvm_getprocs.3:1.16 src/lib/libkvm/kvm_getprocs.3:1.17
--- src/lib/libkvm/kvm_getprocs.3:1.16	Sun Oct 22 14:25:33 2017
+++ src/lib/libkvm/kvm_getprocs.3	Tue Jan  9 21:17:45 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm_getprocs.3,v 1.16 2017/10/22 14:25:33 abhinav Exp $
+.\"	$NetBSD: kvm_getprocs.3,v 1.17 2018/01/09 21:17:45 kamil Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd February 10, 2004
+.Dd January 9, 2018
 .Dt KVM_GETPROCS 3
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@
 .Ft char **
 .Fn kvm_getenvv "kvm_t *kd" "const struct kinfo_proc *p" "int nchr"
 .Ft struct kinfo_proc2 *
-.Fn kvm_getproc2 "kvm_t *kd" "int op" "int arg" "int elemsize" "int *cnt"
+.Fn kvm_getproc2 "kvm_t *kd" "int op" "int arg" "size_t elemsize" "int *cnt"
 .Ft char **
 .Fn kvm_getargv2 "kvm_t *kd" "const struct kinfo_proc2 *p" "int nchr"
 .Ft char **

CVS commit: src/lib/libkvm

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan  9 21:17:46 UTC 2018

Modified Files:
src/lib/libkvm: kvm_getprocs.3

Log Message:
Correct the signature of kvm_getproc2(3) in the man-page.

The elemsize argument is of type "size_t", not "int".

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libkvm/kvm_getprocs.3

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

CVS commit: src/lib/libkvm

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan  9 21:13:59 UTC 2018

Modified Files:
src/lib/libkvm: kvm_getlwps.3

Log Message:
Correct the signature of kvm_getlwps(3) in the man-page.

The elemsize argument is of type "size_t", not "int *".

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libkvm/kvm_getlwps.3

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

Modified files:

Index: src/lib/libkvm/kvm_getlwps.3
diff -u src/lib/libkvm/kvm_getlwps.3:1.7 src/lib/libkvm/kvm_getlwps.3:1.8
--- src/lib/libkvm/kvm_getlwps.3:1.7	Sat Jan 23 00:43:43 2016
+++ src/lib/libkvm/kvm_getlwps.3	Tue Jan  9 21:13:59 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm_getlwps.3,v 1.7 2016/01/23 00:43:43 dholland Exp $
+.\"	$NetBSD: kvm_getlwps.3,v 1.8 2018/01/09 21:13:59 kamil Exp $
 .\"
 .\"Copyright (c) 2002 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 February 10, 2004
+.Dd January 9, 2018
 .Dt KVM_GETLWPS 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .In sys/sysctl.h
 .\" .Fa kvm_t *kd
 .Ft struct kinfo_lwp *
-.Fn kvm_getlwps "kvm_t *kd" "int pid" "unsigned long procaddr" "int *elemsize" "int *cnt"
+.Fn kvm_getlwps "kvm_t *kd" "int pid" "unsigned long procaddr" "size_t elemsize" "int *cnt"
 .Sh DESCRIPTION
 .Fn kvm_getlwps
 returns the set of LWPs belonging to the process specified by

CVS commit: src/lib/libkvm

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan  9 21:13:59 UTC 2018

Modified Files:
src/lib/libkvm: kvm_getlwps.3

Log Message:
Correct the signature of kvm_getlwps(3) in the man-page.

The elemsize argument is of type "size_t", not "int *".

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libkvm/kvm_getlwps.3

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

CVS commit: src/sys

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Tue Jan  9 20:55:43 UTC 2018

Modified Files:
src/sys/compat/aoutm68k: aoutm68k_exec.c
src/sys/compat/freebsd: freebsd_exec.c
src/sys/compat/ibcs2: ibcs2_exec.c
src/sys/compat/linux/common: linux_exec.c
src/sys/compat/linux32/common: linux32_exec.c
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/compat/osf1: osf1_exec.c
src/sys/compat/sunos: sunos_exec.c
src/sys/compat/sunos32: sunos32_exec.c
src/sys/compat/svr4: svr4_exec.c
src/sys/compat/svr4_32: svr4_32_exec.c
src/sys/compat/ultrix: ultrix_misc.c
src/sys/kern: kern_exec.c
src/sys/sys: proc.h

Log Message:
remove struct emul's e_fault.

It used to be used by COMPAT_IRIX for the purpose of overriding
uvm_fault (only implemented in MIPS), now removed.

Ride 8.99.12 version bump.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/aoutm68k/aoutm68k_exec.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/freebsd/freebsd_exec.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/ibcs2/ibcs2_exec.c
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/common/linux_exec.c
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux32/common/linux32_exec.c
cvs rdiff -u -r1.213 -r1.214 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/osf1/osf1_exec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/sunos/sunos_exec.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/sunos32/sunos32_exec.c
cvs rdiff -u -r1.66 -r1.67 src/sys/compat/svr4/svr4_exec.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/svr4_32/svr4_32_exec.c
cvs rdiff -u -r1.122 -r1.123 src/sys/compat/ultrix/ultrix_misc.c
cvs rdiff -u -r1.454 -r1.455 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.343 -r1.344 src/sys/sys/proc.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/compat/aoutm68k/aoutm68k_exec.c
diff -u src/sys/compat/aoutm68k/aoutm68k_exec.c:1.27 src/sys/compat/aoutm68k/aoutm68k_exec.c:1.28
--- src/sys/compat/aoutm68k/aoutm68k_exec.c:1.27	Sun Feb 19 21:06:36 2012
+++ src/sys/compat/aoutm68k/aoutm68k_exec.c	Tue Jan  9 20:55:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: aoutm68k_exec.c,v 1.27 2012/02/19 21:06:36 rmind Exp $	*/
+/*	$NetBSD: aoutm68k_exec.c,v 1.28 2018/01/09 20:55:42 maya Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_exec.c,v 1.27 2012/02/19 21:06:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_exec.c,v 1.28 2018/01/09 20:55:42 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
@@ -81,7 +81,6 @@ struct emul emul_netbsd_aoutm68k = {
 	.e_lwp_exit =		NULL,
 	.e_syscall_intern =	aoutm68k_syscall_intern,
 	.e_sysctlovly =		NULL,
-	.e_fault =		NULL,
 	.e_vm_default_addr =	uvm_default_mapaddr,
 	.e_usertrap =		NULL,
 	.e_ucsize =		0,

Index: src/sys/compat/freebsd/freebsd_exec.c
diff -u src/sys/compat/freebsd/freebsd_exec.c:1.39 src/sys/compat/freebsd/freebsd_exec.c:1.40
--- src/sys/compat/freebsd/freebsd_exec.c:1.39	Tue Aug  8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_exec.c	Tue Jan  9 20:55:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_exec.c,v 1.39 2017/08/08 08:04:06 maxv Exp $	*/
+/*	$NetBSD: freebsd_exec.c,v 1.40 2018/01/09 20:55:42 maya Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: freebsd_exec.c,v 1.39 2017/08/08 08:04:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_exec.c,v 1.40 2018/01/09 20:55:42 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
@@ -95,7 +95,6 @@ struct emul emul_freebsd = {
 	.e_syscall_intern =	syscall,
 #endif
 	.e_sysctlovly =		NULL,
-	.e_fault =		NULL,
 	.e_vm_default_addr =	uvm_default_mapaddr,
 	.e_usertrap =		NULL,
 	.e_ucsize =		0,

Index: src/sys/compat/ibcs2/ibcs2_exec.c
diff -u src/sys/compat/ibcs2/ibcs2_exec.c:1.76 src/sys/compat/ibcs2/ibcs2_exec.c:1.77
--- src/sys/compat/ibcs2/ibcs2_exec.c:1.76	Sun Feb 19 21:06:37 2012
+++ src/sys/compat/ibcs2/ibcs2_exec.c	Tue Jan  9 20:55:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_exec.c,v 1.76 2012/02/19 21:06:37 rmind Exp $	*/
+/*	$NetBSD: ibcs2_exec.c,v 1.77 2018/01/09 20:55:42 maya Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1998 Scott Bartram
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.76 2012/02/19 21:06:37 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.77 2018/01/09 20:55:42 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
@@ -109,7 +109,6 @@ struct emul emul_ibcs2 = {
 	.e_syscall_intern =	syscall,
 #endif
 	.e_sysctlovly =		NULL,
-	.e_fault =		NULL,
 	.e_vm_default_addr =	uvm_default_mapaddr,
 	.e_usertrap =		NULL,
 	.e_ucsize =		0,

Index: src/sys/compat/linux/common/linux_exec.c
diff -u 

CVS commit: src/sys

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Tue Jan  9 20:55:43 UTC 2018

Modified Files:
src/sys/compat/aoutm68k: aoutm68k_exec.c
src/sys/compat/freebsd: freebsd_exec.c
src/sys/compat/ibcs2: ibcs2_exec.c
src/sys/compat/linux/common: linux_exec.c
src/sys/compat/linux32/common: linux32_exec.c
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/compat/osf1: osf1_exec.c
src/sys/compat/sunos: sunos_exec.c
src/sys/compat/sunos32: sunos32_exec.c
src/sys/compat/svr4: svr4_exec.c
src/sys/compat/svr4_32: svr4_32_exec.c
src/sys/compat/ultrix: ultrix_misc.c
src/sys/kern: kern_exec.c
src/sys/sys: proc.h

Log Message:
remove struct emul's e_fault.

It used to be used by COMPAT_IRIX for the purpose of overriding
uvm_fault (only implemented in MIPS), now removed.

Ride 8.99.12 version bump.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/aoutm68k/aoutm68k_exec.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/freebsd/freebsd_exec.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/ibcs2/ibcs2_exec.c
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/common/linux_exec.c
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux32/common/linux32_exec.c
cvs rdiff -u -r1.213 -r1.214 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/osf1/osf1_exec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/sunos/sunos_exec.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/sunos32/sunos32_exec.c
cvs rdiff -u -r1.66 -r1.67 src/sys/compat/svr4/svr4_exec.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/svr4_32/svr4_32_exec.c
cvs rdiff -u -r1.122 -r1.123 src/sys/compat/ultrix/ultrix_misc.c
cvs rdiff -u -r1.454 -r1.455 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.343 -r1.344 src/sys/sys/proc.h

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

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 19:52:29 UTC 2018

Modified Files:
src/sys/net: route.c route.h
src/sys/sys: param.h

Log Message:
Use a queue of deferred entries to delete routes instead of a fixed stack
of 10. Otherwise we can overflow in route deletions from the rexmit timer.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/net/route.c
cvs rdiff -u -r1.116 -r1.117 src/sys/net/route.h
cvs rdiff -u -r1.556 -r1.557 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/net/route.c
diff -u src/sys/net/route.c:1.202 src/sys/net/route.c:1.203
--- src/sys/net/route.c:1.202	Thu Jan  4 20:53:15 2018
+++ src/sys/net/route.c	Tue Jan  9 14:52:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.202 2018/01/05 01:53:15 christos Exp $	*/
+/*	$NetBSD: route.c,v 1.203 2018/01/09 19:52:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.202 2018/01/05 01:53:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.203 2018/01/09 19:52:29 christos Exp $");
 
 #include 
 #ifdef RTFLUSH_DEBUG
@@ -255,7 +255,7 @@ static struct {
 	struct workqueue	*wq;
 	struct work		wk;
 	kmutex_t		lock;
-	struct rtentry		*queue[10];
+	SLIST_HEAD(, rtentry)	queue;
 } rt_free_global __cacheline_aligned;
 
 /* psref for rtentry */
@@ -458,6 +458,8 @@ rt_init(void)
 #endif
 
 	mutex_init(_free_global.lock, MUTEX_DEFAULT, IPL_SOFTNET);
+	SLIST_INIT(_free_global.queue);
+
 	rt_psref_class = psref_class_create("rtentry", IPL_SOFTNET);
 
 	error = workqueue_create(_free_global.wq, "rt_free",
@@ -687,20 +689,19 @@ static void
 rt_free_work(struct work *wk, void *arg)
 {
 
-restart:
-	mutex_enter(_free_global.lock);
-	for (size_t i = 0; i < __arraycount(rt_free_global.queue); i++) {
-		if (rt_free_global.queue[i] == NULL)
-			continue;
-		struct rtentry *rt = rt_free_global.queue[i];
-		rt_free_global.queue[i] = NULL;
-		mutex_exit(_free_global.lock);
+	for (;;) {
+		struct rtentry *rt;
 
+		mutex_enter(_free_global.lock);
+		if ((rt = SLIST_FIRST(_free_global.queue)) == NULL) {
+			mutex_exit(_free_global.lock);
+			return;
+		}
+		SLIST_REMOVE_HEAD(_free_global.queue, rt_free);
+		mutex_exit(_free_global.lock);
 		atomic_dec_uint(>rt_refcnt);
 		_rt_free(rt);
-		goto restart;
 	}
-	mutex_exit(_free_global.lock);
 }
 
 void
@@ -714,16 +715,9 @@ rt_free(struct rtentry *rt)
 		return;
 	}
 
-	size_t i;
 	mutex_enter(_free_global.lock);
-	for (i = 0; i < __arraycount(rt_free_global.queue); i++) {
-		if (rt_free_global.queue[i] == NULL)
-			break;
-	}
-
-	KASSERT(i < __arraycount(rt_free_global.queue));
-	rt_free_global.queue[i] = rt;
 	rt_ref(rt);
+	SLIST_INSERT_HEAD(_free_global.queue, rt, rt_free);
 	mutex_exit(_free_global.lock);
 	workqueue_enqueue(rt_free_global.wq, _free_global.wk, NULL);
 }

Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.116 src/sys/net/route.h:1.117
--- src/sys/net/route.h:1.116	Sun Dec 17 23:11:13 2017
+++ src/sys/net/route.h	Tue Jan  9 14:52:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.h,v 1.116 2017/12/18 04:11:13 ozaki-r Exp $	*/
+/*	$NetBSD: route.h,v 1.117 2018/01/09 19:52:29 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -124,7 +124,8 @@ struct rtentry {
 	struct	sockaddr *rt_tag;	/* route tagging info */
 #ifdef _KERNEL
 	kcondvar_t rt_cv;
-	struct psref_target	rt_psref;
+	struct psref_target rt_psref;
+	SLIST_ENTRY(rtentry) rt_free;	/* queue of deferred frees */
 #endif
 };
 

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.556 src/sys/sys/param.h:1.557
--- src/sys/sys/param.h:1.556	Wed Jan  3 20:42:25 2018
+++ src/sys/sys/param.h	Tue Jan  9 14:52:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.556 2018/01/04 01:42:25 christos Exp $	*/
+/*	$NetBSD: param.h,v 1.557 2018/01/09 19:52:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	899001100	/* NetBSD 8.99.11 */
+#define	__NetBSD_Version__	899001200	/* NetBSD 8.99.12 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 19:52:29 UTC 2018

Modified Files:
src/sys/net: route.c route.h
src/sys/sys: param.h

Log Message:
Use a queue of deferred entries to delete routes instead of a fixed stack
of 10. Otherwise we can overflow in route deletions from the rexmit timer.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/net/route.c
cvs rdiff -u -r1.116 -r1.117 src/sys/net/route.h
cvs rdiff -u -r1.556 -r1.557 src/sys/sys/param.h

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

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:39:51 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
tickets 479-485


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-8.0

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-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.99 src/doc/CHANGES-8.0:1.1.2.100
--- src/doc/CHANGES-8.0:1.1.2.99	Sun Jan  7 09:32:36 2018
+++ src/doc/CHANGES-8.0	Tue Jan  9 19:39:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.99 2018/01/07 09:32:36 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.100 2018/01/09 19:39:51 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -8830,3 +8830,51 @@ sys/arch/macppc/conf/GENERIC			1.337
 	console is garbled.  PR port-macppc/52712
 	[sevan, ticket #470]
 
+sys/netatalk/aarp.c1.40
+
+	Pull up the mbuf, not to read past its end.
+	[maxv, ticket #479]
+
+sys/net/if_ethersubr.c1.249
+
+	Make sure the packet can contain an LLC structure.
+	[maxv, ticket #480]
+
+sys/netinet6/ip6_flow.c1.36
+
+	Fix a use-after-free in the IPv6 forwarding code.
+	[maxv, ticket #481]
+
+external/bsd/nvi/usr.bin/recover/virecover	1.4
+
+	Don't get stuck reading named pipes; only try to read plain
+	files in order to send mail.
+	[christos, ticket #482]
+
+etc/etc.i386/MAKEDEV.conf			1.26
+
+	Create NVMe devices on i386.
+	[msaitoh, ticket #483]
+
+sys/netinet6/ip6_forward.c			1.89-1.90
+
+	Fix two uses-after-free of mbuf by ip6flow_create.
+	[ozaki-r, ticket #484]
+
+sys/dev/auconv.c1.32-1.35
+sys/dev/auconv.h1.20-1.21
+sys/dev/mulaw.c	1.33
+sys/dev/mulaw.h	1.25
+
+	- Improve LINEAR_LINEARN macro - inparticular BE/LE conversions.
+	  PR kern/52586.
+	- Allow maxused to be an odd number of bytes.  This makes single
+	  byte conversions work.  PR kern/52586.
+	- Remove 24 bit in a 32 bit container filters.
+	- Replace LINEARN_TO_LINEARN macro with individual optimized
+	  functions for 8, 16, 24 and 32 bits linear to linear conversions.
+	  PR kern/52586.
+	- mulaw/alaw_to_linearN macros replaced with individual faster
+	  filters.  NFC.
+	[nat, ticket #485]
+

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:39:51 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
tickets 479-485


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-8.0

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

CVS commit: [netbsd-8] src/sys/dev

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:35:03 UTC 2018

Modified Files:
src/sys/dev [netbsd-8]: auconv.c auconv.h mulaw.c mulaw.h

Log Message:
Pull up following revision(s) (requested by nat in ticket #485):
sys/dev/auconv.c: 1.32-1.35
sys/dev/auconv.h: 1.20-1.21
sys/dev/mulaw.c: 1.33
sys/dev/mulaw.h: 1.25
Improve LINEAR_LINEARN macro - inparticular BE/LE conversions.
Addresses part of PR kern/52586 analyzed and reported by isaki@.
--
Allow maxused to be an odd number of bytes.  This makes single byte
conversions work for the test described in the PR.
Addresses another part of PR kern/52586.
--
Remove 24 bit in a 32 bit container filters.
At present this filter did not work well and has caused problems with
the audio mixer disabled for hdaudio(4).
These filters may return when they are fixed.
--
Replace LINEARN_TO_LINEARN macro with individual optimized functions for
8, 16, 24 and 32 bits linear to linear conversions.
Addresses PR kern/52586.
--
mulaw/alaw_to_linearN macros replaced with individual faster filters.
NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/sys/dev/auconv.c
cvs rdiff -u -r1.16.42.2 -r1.16.42.3 src/sys/dev/auconv.h
cvs rdiff -u -r1.28.42.2 -r1.28.42.3 src/sys/dev/mulaw.c
cvs rdiff -u -r1.20.80.1 -r1.20.80.2 src/sys/dev/mulaw.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/auconv.c
diff -u src/sys/dev/auconv.c:1.26.2.3 src/sys/dev/auconv.c:1.26.2.4
--- src/sys/dev/auconv.c:1.26.2.3	Tue Aug  1 23:23:00 2017
+++ src/sys/dev/auconv.c	Tue Jan  9 19:35:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: auconv.c,v 1.26.2.3 2017/08/01 23:23:00 snj Exp $	*/
+/*	$NetBSD: auconv.c,v 1.26.2.4 2018/01/09 19:35:03 snj Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.26.2.3 2017/08/01 23:23:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.26.2.4 2018/01/09 19:35:03 snj Exp $");
 
 #include 
 #include 
@@ -113,6 +113,7 @@ struct conv_table {
 	stream_filter_factory_t *play_conv;
 	stream_filter_factory_t *rec_conv;
 };
+
 #define TABLE_LIST(prec, valid, target) \
 	{AUDIO_ENCODING_SLINEAR_LE, prec, valid,			\
 	 linear##target##_##target##_to_linear##prec,			\
@@ -141,7 +142,6 @@ struct conv_table {
  */
 static const struct conv_table s8_table[] = {
 	TABLE_LIST(32, 32, 8)
-	TABLE_LIST(24, 32, 8)
 	TABLE_LIST(24, 24, 8)
 	TABLE_LIST(16, 16, 8)
 	TABLE_LIST(8, 8, 8)
@@ -151,7 +151,6 @@ static const struct conv_table s8_table[
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u8_table[] = {
 	TABLE_LIST(32, 32, 8)
-	TABLE_LIST(24, 32, 8)
 	TABLE_LIST(24, 24, 8)
 	TABLE_LIST(16, 16, 8)
 	TABLE_LIST(8, 8, 8)
@@ -161,7 +160,6 @@ static const struct conv_table u8_table[
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table s16le_table[] = {
 	TABLE_LIST(32, 32, 16)
-	TABLE_LIST(24, 32, 16)
 	TABLE_LIST(24, 24, 16)
 	TABLE_LIST(16, 16, 16)
 	TABLE_LIST(8, 8, 16)
@@ -171,7 +169,6 @@ static const struct conv_table s16le_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table s16be_table[] = {
 	TABLE_LIST(32, 32, 16)
-	TABLE_LIST(24, 32, 16)
 	TABLE_LIST(24, 24, 16)
 	TABLE_LIST(16, 16, 16)
 	TABLE_LIST(8, 8, 16)
@@ -181,7 +178,6 @@ static const struct conv_table s16be_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u16le_table[] = {
 	TABLE_LIST(32, 32, 16)
-	TABLE_LIST(24, 32, 16)
 	TABLE_LIST(24, 24, 16)
 	TABLE_LIST(16, 16, 16)
 	TABLE_LIST(8, 8, 16)
@@ -191,7 +187,6 @@ static const struct conv_table u16le_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u16be_table[] = {
 	TABLE_LIST(32, 32, 16)
-	TABLE_LIST(24, 32, 16)
 	TABLE_LIST(24, 24, 16)
 	TABLE_LIST(16, 16, 16)
 	TABLE_LIST(8, 8, 16)
@@ -202,7 +197,6 @@ static const struct conv_table u16be_tab
 #ifdef notdef
 static const struct conv_table s24le_table[] = {
 	TABLE_LIST(32, 32, 24)
-	TABLE_LIST(24, 32, 24)
 	TABLE_LIST(24, 24, 24)
 	TABLE_LIST(16, 16, 24)
 	TABLE_LIST(8, 8, 24)
@@ -212,7 +206,6 @@ static const struct conv_table s24le_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table s24be_table[] = {
 	TABLE_LIST(32, 32, 24)
-	TABLE_LIST(24, 32, 24)
 	TABLE_LIST(24, 24, 24)
 	TABLE_LIST(16, 16, 24)
 	TABLE_LIST(8, 8, 24)
@@ -222,7 +215,6 @@ static const struct conv_table s24be_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u24le_table[] = {
 	TABLE_LIST(32, 32, 24)
-	TABLE_LIST(24, 32, 24)
 	TABLE_LIST(24, 24, 24)
 	TABLE_LIST(16, 16, 24)
 	TABLE_LIST(8, 8, 24)
@@ -232,7 +224,6 @@ static const struct conv_table u24le_tab
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u24be_table[] = {
 	TABLE_LIST(32, 32, 24)
-	TABLE_LIST(24, 32, 24)
 	TABLE_LIST(24, 24, 24)
 	TABLE_LIST(16, 16, 24)
 	TABLE_LIST(8, 8, 24)
@@ -243,7 +234,6 @@ static const struct conv_table u24be_tab
 

CVS commit: [netbsd-8] src/sys/dev

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:35:03 UTC 2018

Modified Files:
src/sys/dev [netbsd-8]: auconv.c auconv.h mulaw.c mulaw.h

Log Message:
Pull up following revision(s) (requested by nat in ticket #485):
sys/dev/auconv.c: 1.32-1.35
sys/dev/auconv.h: 1.20-1.21
sys/dev/mulaw.c: 1.33
sys/dev/mulaw.h: 1.25
Improve LINEAR_LINEARN macro - inparticular BE/LE conversions.
Addresses part of PR kern/52586 analyzed and reported by isaki@.
--
Allow maxused to be an odd number of bytes.  This makes single byte
conversions work for the test described in the PR.
Addresses another part of PR kern/52586.
--
Remove 24 bit in a 32 bit container filters.
At present this filter did not work well and has caused problems with
the audio mixer disabled for hdaudio(4).
These filters may return when they are fixed.
--
Replace LINEARN_TO_LINEARN macro with individual optimized functions for
8, 16, 24 and 32 bits linear to linear conversions.
Addresses PR kern/52586.
--
mulaw/alaw_to_linearN macros replaced with individual faster filters.
NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/sys/dev/auconv.c
cvs rdiff -u -r1.16.42.2 -r1.16.42.3 src/sys/dev/auconv.h
cvs rdiff -u -r1.28.42.2 -r1.28.42.3 src/sys/dev/mulaw.c
cvs rdiff -u -r1.20.80.1 -r1.20.80.2 src/sys/dev/mulaw.h

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

CVS commit: [netbsd-8] src/sys/netinet6

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:30:45 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_forward.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #484):
sys/netinet6/ip6_forward.c: 1.89-1.90
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)


To generate a diff of this commit:
cvs rdiff -u -r1.87.2.1 -r1.87.2.2 src/sys/netinet6/ip6_forward.c

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

CVS commit: [netbsd-8] src/sys/netinet6

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:30:45 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_forward.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #484):
sys/netinet6/ip6_forward.c: 1.89-1.90
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)


To generate a diff of this commit:
cvs rdiff -u -r1.87.2.1 -r1.87.2.2 src/sys/netinet6/ip6_forward.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/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.87.2.1 src/sys/netinet6/ip6_forward.c:1.87.2.2
--- src/sys/netinet6/ip6_forward.c:1.87.2.1	Sat Oct 21 19:43:54 2017
+++ src/sys/netinet6/ip6_forward.c	Tue Jan  9 19:30:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_forward.c,v 1.87.2.1 2017/10/21 19:43:54 snj Exp $	*/
+/*	$NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.1 2017/10/21 19:43:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -415,8 +415,8 @@ ip6_forward(struct mbuf *m, int srcrt)
 			/* Need to release rt here */
 			rtcache_unref(rt, ro);
 			rt = NULL;
-			if (m->m_flags & M_CANFASTFWD)
-ip6flow_create(ro, m);
+			if (mcopy->m_flags & M_CANFASTFWD)
+ip6flow_create(ro, mcopy);
 #endif
 			if (mcopy)
 goto freecopy;

CVS commit: [netbsd-8] src/etc/etc.i386

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:29:02 UTC 2018

Modified Files:
src/etc/etc.i386 [netbsd-8]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #483):
etc/etc.i386/MAKEDEV.conf: revision 1.26
Add NVMe devices.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.24.1 src/etc/etc.i386/MAKEDEV.conf

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

CVS commit: [netbsd-8] src/etc/etc.i386

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:29:02 UTC 2018

Modified Files:
src/etc/etc.i386 [netbsd-8]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #483):
etc/etc.i386/MAKEDEV.conf: revision 1.26
Add NVMe devices.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.24.1 src/etc/etc.i386/MAKEDEV.conf

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

Modified files:

Index: src/etc/etc.i386/MAKEDEV.conf
diff -u src/etc/etc.i386/MAKEDEV.conf:1.25 src/etc/etc.i386/MAKEDEV.conf:1.25.24.1
--- src/etc/etc.i386/MAKEDEV.conf:1.25	Sun Sep 23 01:15:17 2012
+++ src/etc/etc.i386/MAKEDEV.conf	Tue Jan  9 19:29:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.25 2012/09/23 01:15:17 chs Exp $
+# $NetBSD: MAKEDEV.conf,v 1.25.24.1 2018/01/09 19:29:02 snj Exp $
 
 # As of 2005-03-15, the "init" case must not create more than 1024 entries.
 all_md)
@@ -13,6 +13,10 @@ all_md)
 	makedev cgd0 cgd1
 	makedev amr0 iop0 mfi0 mlx0 mly0 dpti0 dpt0 twe0 icp0
 	makedev ed0 ed1
+	makedev nvme0 nvme0ns1 nvme0ns2 nvme0ns3 nvme0ns4
+	makedev nvme1 nvme1ns1 nvme1ns2 nvme1ns3 nvme1ns4
+	makedev nvme2 nvme2ns1 nvme2ns2 nvme2ns3 nvme2ns4
+	makedev nvme3 nvme3ns1 nvme3ns2 nvme3ns3 nvme3ns4
 	makedev raid0 raid1 raid2 raid3
 	makedev ld0 ld1 ld2 ld3
 	makedev xbd0 xbd1 xbd2 xbd3 xen

CVS commit: [netbsd-8] src/external/bsd/nvi/usr.bin/recover

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:27:41 UTC 2018

Modified Files:
src/external/bsd/nvi/usr.bin/recover [netbsd-8]: virecover

Log Message:
Pull up following revision(s) (requested by christos in ticket #482):
external/bsd/nvi/usr.bin/recover/virecover: revision 1.4
Don't get stuck reading named pipes; only try to read plain files in
order to send mail.


To generate a diff of this commit:
cvs rdiff -u -r1.1.22.1 -r1.1.22.2 \
src/external/bsd/nvi/usr.bin/recover/virecover

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

Modified files:

Index: src/external/bsd/nvi/usr.bin/recover/virecover
diff -u src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.1 src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.2
--- src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.1	Mon Nov  6 09:37:24 2017
+++ src/external/bsd/nvi/usr.bin/recover/virecover	Tue Jan  9 19:27:41 2018
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: virecover,v 1.1.22.1 2017/11/06 09:37:24 snj Exp $
+#	$NetBSD: virecover,v 1.1.22.2 2018/01/09 19:27:41 snj Exp $
 #
 #	@(#)recover.in	8.8 (Berkeley) 10/10/96
 #
@@ -17,13 +17,13 @@ for i in $RECDIR/vi.*; do
 	esac
 
 	# Only test files that are readable.
-	if ! [ -f "$i" ] || ! [ -r "$i" ]; then
+	if [ ! -f "$i" ] || [ ! -r "$i" ]; then
 		continue
 	fi
 
 	# Unmodified nvi editor backup files either have the
 	# execute bit set or are zero length.  Delete them.
-	if [ -x "$i" ] || ! [ -s "$i" ]; then
+	if [ -x "$i" ] || [ ! -s "$i" ]; then
 		rm -f "$i"
 	fi
 done
@@ -36,8 +36,8 @@ for i in $RECDIR/recover.*; do
 	$RECDIR/recover.\*) continue;;
 	esac
 
-	# Only test files that are readable.
-	if ! [ -r "$i" ]; then
+	# Only test plain files that are readable.
+	if [ ! -f "$i" ] || [ ! -r "$i" ]; then
 		continue
 	fi
 

CVS commit: [netbsd-8] src/external/bsd/nvi/usr.bin/recover

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:27:41 UTC 2018

Modified Files:
src/external/bsd/nvi/usr.bin/recover [netbsd-8]: virecover

Log Message:
Pull up following revision(s) (requested by christos in ticket #482):
external/bsd/nvi/usr.bin/recover/virecover: revision 1.4
Don't get stuck reading named pipes; only try to read plain files in
order to send mail.


To generate a diff of this commit:
cvs rdiff -u -r1.1.22.1 -r1.1.22.2 \
src/external/bsd/nvi/usr.bin/recover/virecover

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

CVS commit: [netbsd-8] src/sys/netinet6

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:24:44 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_flow.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #481):
sys/netinet6/ip6_flow.c: revision 1.36
Fix use-after-free: if m_pullup fails the (freed) mbuf is pushed on the
ip6_pktq queue and re-processed later. Return 1 to say "processed and
freed".


To generate a diff of this commit:
cvs rdiff -u -r1.34.8.1 -r1.34.8.2 src/sys/netinet6/ip6_flow.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/netinet6/ip6_flow.c
diff -u src/sys/netinet6/ip6_flow.c:1.34.8.1 src/sys/netinet6/ip6_flow.c:1.34.8.2
--- src/sys/netinet6/ip6_flow.c:1.34.8.1	Tue Jan  2 10:20:34 2018
+++ src/sys/netinet6/ip6_flow.c	Tue Jan  9 19:24:44 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_flow.c,v 1.34.8.1 2018/01/02 10:20:34 snj Exp $	*/
+/*	$NetBSD: ip6_flow.c,v 1.34.8.2 2018/01/09 19:24:44 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.34.8.1 2018/01/02 10:20:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.34.8.2 2018/01/09 19:24:44 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -285,12 +285,8 @@ ip6flow_fastforward(struct mbuf **mp)
 
 	if (IP6_HDR_ALIGNED_P(mtod(m, const void *)) == 0) {
 		if ((m = m_copyup(m, sizeof(struct ip6_hdr),
-(max_linkhdr + 3) & ~3)) == NULL) {
-			goto out;
-		}
-		*mp = m;
-	} else if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
-		if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+		(max_linkhdr + 3) & ~3)) == NULL) {
+			ret = 1;
 			goto out;
 		}
 		*mp = m;

CVS commit: [netbsd-8] src/sys/netinet6

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:24:44 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_flow.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #481):
sys/netinet6/ip6_flow.c: revision 1.36
Fix use-after-free: if m_pullup fails the (freed) mbuf is pushed on the
ip6_pktq queue and re-processed later. Return 1 to say "processed and
freed".


To generate a diff of this commit:
cvs rdiff -u -r1.34.8.1 -r1.34.8.2 src/sys/netinet6/ip6_flow.c

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

CVS commit: [netbsd-8] src/sys/net

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:23:04 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_ethersubr.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #480):
sys/net/if_ethersubr.c: revision 1.249
Make sure we have an llc structure in the packet, and don't read past the
end of the mbuf if we don't. I'm wondering whether we should not pull up
instead, but whatever.


To generate a diff of this commit:
cvs rdiff -u -r1.242.6.2 -r1.242.6.3 src/sys/net/if_ethersubr.c

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

CVS commit: [netbsd-8] src/sys/net

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:23:04 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_ethersubr.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #480):
sys/net/if_ethersubr.c: revision 1.249
Make sure we have an llc structure in the packet, and don't read past the
end of the mbuf if we don't. I'm wondering whether we should not pull up
instead, but whatever.


To generate a diff of this commit:
cvs rdiff -u -r1.242.6.2 -r1.242.6.3 src/sys/net/if_ethersubr.c

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

Modified files:

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.242.6.2 src/sys/net/if_ethersubr.c:1.242.6.3
--- src/sys/net/if_ethersubr.c:1.242.6.2	Tue Jan  2 10:20:33 2018
+++ src/sys/net/if_ethersubr.c	Tue Jan  9 19:23:04 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.242.6.2 2018/01/02 10:20:33 snj Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.242.6.3 2018/01/09 19:23:04 snj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.2 2018/01/02 10:20:33 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.3 2018/01/09 19:23:04 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -833,6 +833,9 @@ ether_input(struct ifnet *ifp, struct mb
 		}
 	} else {
 #if defined (LLC) || defined (NETATALK)
+		if (m->m_len < ehlen + sizeof(struct llc)) {
+			goto dropanyway;
+		}
 		l = (struct llc *)(eh+1);
 		switch (l->llc_dsap) {
 #ifdef NETATALK
@@ -869,8 +872,8 @@ ether_input(struct ifnet *ifp, struct mb
 goto dropanyway;
 			}
 			break;
-		dropanyway:
 #endif
+		dropanyway:
 		default:
 			m_freem(m);
 			return;

CVS commit: [netbsd-8] src/sys/netatalk

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:20:17 UTC 2018

Modified Files:
src/sys/netatalk [netbsd-8]: aarp.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #479):
sys/netatalk/aarp.c: revision 1.40
Mmh, pull up the packet to ether_aarp, otherwise we're reading past the
end of the mbuf.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/netatalk/aarp.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/netatalk/aarp.c
diff -u src/sys/netatalk/aarp.c:1.39 src/sys/netatalk/aarp.c:1.39.8.1
--- src/sys/netatalk/aarp.c:1.39	Mon Aug  1 03:15:30 2016
+++ src/sys/netatalk/aarp.c	Tue Jan  9 19:20:17 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: aarp.c,v 1.39 2016/08/01 03:15:30 ozaki-r Exp $	*/
+/*	$NetBSD: aarp.c,v 1.39.8.1 2018/01/09 19:20:17 snj Exp $	*/
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.39 2016/08/01 03:15:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.39.8.1 2018/01/09 19:20:17 snj Exp $");
 
 #include "opt_mbuftrace.h"
 
@@ -351,6 +351,11 @@ at_aarpinput(struct ifnet *ifp, struct m
 	struct psref	psref;
 	struct ifaddr *ifa;
 
+	/* We should also check ar_hln and ar_pln. */
+	if ((m = m_pullup(m, sizeof(struct ether_aarp))) == NULL) {
+		return;
+	}
+
 	ea = mtod(m, struct ether_aarp *);
 
 	/* Check to see if from my hardware address */

CVS commit: [netbsd-8] src/sys/netatalk

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan  9 19:20:17 UTC 2018

Modified Files:
src/sys/netatalk [netbsd-8]: aarp.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #479):
sys/netatalk/aarp.c: revision 1.40
Mmh, pull up the packet to ether_aarp, otherwise we're reading past the
end of the mbuf.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/netatalk/aarp.c

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

CVS commit: src/sys/dev/usb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 17:58:10 UTC 2018

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

Log Message:
tidy up debugging (make it compile with the 'ALL' kernel)


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

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

CVS commit: src/sys/dev/usb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 17:58:10 UTC 2018

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

Log Message:
tidy up debugging (make it compile with the 'ALL' kernel)


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/usb/ukbd.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/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.140 src/sys/dev/usb/ukbd.c:1.141
--- src/sys/dev/usb/ukbd.c:1.140	Mon Dec 18 13:58:00 2017
+++ src/sys/dev/usb/ukbd.c	Tue Jan  9 12:58:09 2018
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.140 2017/12/18 18:58:00 jmcneill Exp $*/
+/*  $NetBSD: ukbd.c,v 1.141 2018/01/09 17:58:09 christos Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.140 2017/12/18 18:58:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.141 2018/01/09 17:58:09 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -457,7 +457,7 @@ ukbd_attach(device_t parent, device_t se
 	}
 
 	if (sc->sc_console_keyboard) {
-		DPRINTF(("ukbd_attach: console keyboard sc=%p\n", sc));
+		DPRINTF(("%s: console keyboard sc=%p\n", __func__, sc));
 		wskbd_cnattach(_consops, sc, _keymapdata);
 		ukbd_enable(sc, 1);
 	}
@@ -499,13 +499,12 @@ ukbd_enable(void *v, int on)
 	/* Should only be called to change state */
 	if ((sc->sc_flags & FLAG_ENABLED) != 0 && on != 0) {
 #ifdef DIAGNOSTIC
-		printf("ukbd_enable: %s: bad call on=%d\n",
-		   device_xname(sc->sc_hdev.sc_dev), on);
+		aprint_error_dev(sc->sc_hdev.sc_dev, "bad call on=%d\n", on);
 #endif
 		return EBUSY;
 	}
 
-	DPRINTF(("ukbd_enable: sc=%p on=%d\n", sc, on));
+	DPRINTF(("%s: sc=%p on=%d\n", __func__, sc, on));
 	if (on) {
 		sc->sc_flags |= FLAG_ENABLED;
 		return uhidev_open(>sc_hdev);
@@ -546,7 +545,7 @@ ukbd_detach(device_t self, int flags)
 	struct ukbd_softc *sc = device_private(self);
 	int rv = 0;
 
-	DPRINTF(("ukbd_detach: sc=%p flags=%d\n", sc, flags));
+	DPRINTF(("%s: sc=%p flags=%d\n", __func__, sc, flags));
 
 	pmf_device_deregister(self);
 
@@ -756,7 +755,7 @@ ukbd_decode(struct ukbd_softc *sc, struc
 #endif
 
 	if (isset(ud->keys, KEY_ERROR)) {
-		DPRINTF(("ukbd_intr: KEY_ERROR\n"));
+		DPRINTF(("%s: KEY_ERROR\n", __func__));
 		return;		/* ignore  */
 	}
 
@@ -784,7 +783,7 @@ ukbd_decode(struct ukbd_softc *sc, struc
 		return;
 
 	if (sc->sc_flags & FLAG_POLLING) {
-		DPRINTFN(1,("ukbd_intr: pollchar = 0x%03x\n", ibuf[0]));
+		DPRINTFN(1,("%s: pollchar = 0x%03x\n", __func__, ibuf[0]));
 		memcpy(sc->sc_pollchars, ibuf, nkeys * sizeof(uint16_t));
 		sc->sc_npollchar = nkeys;
 		return;
@@ -823,7 +822,7 @@ ukbd_decode(struct ukbd_softc *sc, struc
 sc->sc_rep[npress++] = c & 0x7f;
 			}
 #endif
-			DPRINTFN(1,("ukbd_intr: raw = %s0x%02x\n",
+			DPRINTFN(1,("%s: raw = %s0x%02x\n", __func__,
 c & 0x80 ? "0xe0 " : "",
 cbuf[j]));
 			j++;
@@ -859,7 +858,7 @@ ukbd_set_leds(void *v, int leds)
 	struct ukbd_softc *sc = v;
 	struct usbd_device *udev = sc->sc_hdev.sc_parent->sc_udev;
 
-	DPRINTF(("ukbd_set_leds: sc=%p leds=%d, sc_leds=%d\n",
+	DPRINTF(("%s: sc=%p leds=%d, sc_leds=%d\n", __func__,
 		 sc, leds, sc->sc_leds));
 
 	if (sc->sc_dying)
@@ -925,7 +924,7 @@ ukbd_ioctl(void *v, u_long cmd, void *da
 		return 0;
 #if defined(WSDISPLAY_COMPAT_RAWKBD)
 	case WSKBDIO_SETMODE:
-		DPRINTF(("ukbd_ioctl: set raw = %d\n", *(int *)data));
+		DPRINTF(("%s: set raw = %d\n", __func__, *(int *)data));
 		sc->sc_rawkbd = *(int *)data == WSKBD_RAW;
 #if defined(UKBD_REPEAT)
 		callout_stop(>sc_rawrepeat_ch);
@@ -962,7 +961,7 @@ ukbd_cngetc(void *v, u_int *type, int *d
 	} else
 		broken = 0;
 
-	DPRINTFN(0,("ukbd_cngetc: enter\n"));
+	DPRINTFN(0,("%s: enter\n", __func__));
 	sc->sc_flags |= FLAG_POLLING;
 	if (sc->sc_npollchar <= 0)
 		usbd_dopoll(sc->sc_hdev.sc_parent->sc_iface);
@@ -974,11 +973,11 @@ ukbd_cngetc(void *v, u_int *type, int *d
 		   sc->sc_npollchar * sizeof(uint16_t));
 		*type = c & RELEASE ? WSCONS_EVENT_KEY_UP : WSCONS_EVENT_KEY_DOWN;
 		*data = c & CODEMASK;
+		DPRINTFN(0,("%s: return 0x%02x\n", __func__, c));
 	} else {
 		*type = 0;
 		*data = 0;
 	}
-	DPRINTFN(0,("ukbd_cngetc: return 0x%02x\n", c));
 	if (broken)
 		ukbd_cnpollc(v, 0);
 }
@@ -989,7 +988,7 @@ ukbd_cnpollc(void *v, int on)
 	struct ukbd_softc *sc = v;
 	struct usbd_device *dev;
 
-	DPRINTFN(2,("ukbd_cnpollc: sc=%p on=%d\n", v, on));
+	DPRINTFN(2,("%s: sc=%p on=%d\n", __func__, v, on));
 
 	usbd_interface2device_handle(sc->sc_hdev.sc_parent->sc_iface, );
 	if (on) {
@@ -1044,9 +1043,9 @@ ukbd_parse_desc(struct ukbd_softc *sc)
 		HID_GET_USAGE_PAGE(h.usage) != HUP_KEYBOARD ||
 		h.report_ID != sc->sc_hdev.sc_report_id)
 			continue;
-		DPRINTF(("ukbd: ikey=%d usage=0x%x flags=0x%x pos=%d size=%d "
-			 "cnt=%d\n", ikey,
-			 h.usage, h.flags, h.loc.pos, h.loc.size, 

CVS commit: src/tests/kernel/kqueue

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 17:35:29 UTC 2018

Modified Files:
src/tests/kernel/kqueue: t_ioctl.c

Log Message:
Add EVFILT_FS


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/kqueue/t_ioctl.c

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

CVS commit: src/tests/kernel/kqueue

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 17:35:29 UTC 2018

Modified Files:
src/tests/kernel/kqueue: t_ioctl.c

Log Message:
Add EVFILT_FS


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/kqueue/t_ioctl.c

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

Modified files:

Index: src/tests/kernel/kqueue/t_ioctl.c
diff -u src/tests/kernel/kqueue/t_ioctl.c:1.3 src/tests/kernel/kqueue/t_ioctl.c:1.4
--- src/tests/kernel/kqueue/t_ioctl.c:1.3	Fri Jan 13 21:30:41 2017
+++ src/tests/kernel/kqueue/t_ioctl.c	Tue Jan  9 17:35:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ioctl.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
+/* $NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ioctl.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
+__RCSID("$NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $");
 
 #include 
 #include 
@@ -61,13 +61,13 @@ ATF_TC_BODY(kfilter_byfilter, tc)
 	km.name = buf;
 	km.len = sizeof(buf) - 1;
 
-	for (i = 0; i < 7; ++i) {
+	for (i = 0; i < 8; ++i) {
 		km.filter = i;
 		RL(ioctl(kq, KFILTER_BYFILTER, ));
 		(void)printf("  map %d -> %s\n", km.filter, km.name);
 	}
 
-	km.filter = 7;
+	km.filter = 8;
 	ATF_REQUIRE_EQ(ioctl(kq, KFILTER_BYFILTER, ), -1);
 }
 
@@ -86,6 +86,7 @@ ATF_TC_BODY(kfilter_byname, tc)
 		"EVFILT_PROC",
 		"EVFILT_SIGNAL",
 		"EVFILT_TIMER",
+		"EVFILT_FS",
 		NULL
 	};
 	char buf[32];

CVS commit: src/sys/fs/autofs

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 16:19:39 UTC 2018

Modified Files:
src/sys/fs/autofs: autofs.c autofs_vfsops.c

Log Message:
fix module attachment and cdevsw


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/autofs/autofs.c
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs_vfsops.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/fs/autofs/autofs.c
diff -u src/sys/fs/autofs/autofs.c:1.2 src/sys/fs/autofs/autofs.c:1.3
--- src/sys/fs/autofs/autofs.c:1.2	Tue Jan  9 08:56:00 2018
+++ src/sys/fs/autofs/autofs.c	Tue Jan  9 11:19:39 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: autofs.c,v 1.2 2018/01/09 13:56:00 martin Exp $	*/
+/*	$NetBSD: autofs.c,v 1.3 2018/01/09 16:19:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -68,23 +68,33 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.2 2018/01/09 13:56:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.3 2018/01/09 16:19:39 christos Exp $");
 
 #include "autofs.h"
 
+#include "ioconf.h"
+
 #include 
 #include 
 #include 
 
-static int	autofs_open(dev_t dev, int flags, int mode, struct lwp *l);
-static int	autofs_close(dev_t dev, int flags, int mode, struct lwp *l);
-static int	autofs_ioctl(dev_t dev, const u_long cmd, void *data, int flag,
-struct lwp *l);
-
-struct cdevsw autofs_ops = {
-	.d_open		= autofs_open,
-	.d_close	= autofs_close,
-	.d_ioctl	= autofs_ioctl,
+dev_type_open(autofs_open);
+dev_type_close(autofs_close);
+dev_type_ioctl(autofs_ioctl);
+
+const struct cdevsw autofs_cdevsw = {
+	.d_open = autofs_open,
+	.d_close = autofs_close,
+	.d_read = noread,
+	.d_write = nowrite,
+	.d_ioctl = autofs_ioctl,
+	.d_stop = nostop,
+	.d_tty = notty,
+	.d_poll = nopoll,
+	.d_mmap = nommap,
+	.d_kqfilter = nokqfilter,
+	.d_discard = nodiscard,
+	.d_flag = D_OTHER,
 };
 
 /*
@@ -111,6 +121,11 @@ int autofs_retry_attempts = 3;
 int autofs_retry_delay = 1;
 int autofs_interruptible = 1;
 
+void
+autofsattach(int n)
+{
+}
+
 static int
 autofs_node_cmp(const struct autofs_node *a, const struct autofs_node *b)
 {
@@ -504,7 +519,7 @@ autofs_ioctl_done(struct autofs_daemon_d
 	return 0;
 }
 
-static int
+int
 autofs_open(dev_t dev, int flags, int mode, struct lwp *l)
 {
 
@@ -528,7 +543,7 @@ autofs_open(dev_t dev, int flags, int mo
 	return 0;
 }
 
-static int
+int
 autofs_close(dev_t dev, int flags, int mode, struct lwp *l)
 {
 
@@ -540,7 +555,7 @@ autofs_close(dev_t dev, int flags, int m
 	return 0;
 }
 
-static int
+int
 autofs_ioctl(dev_t dev, const u_long cmd, void *data, int flag, struct lwp *l)
 {
 

Index: src/sys/fs/autofs/autofs_vfsops.c
diff -u src/sys/fs/autofs/autofs_vfsops.c:1.1 src/sys/fs/autofs/autofs_vfsops.c:1.2
--- src/sys/fs/autofs/autofs_vfsops.c:1.1	Mon Jan  8 22:31:14 2018
+++ src/sys/fs/autofs/autofs_vfsops.c	Tue Jan  9 11:19:39 2018
@@ -33,7 +33,7 @@
  *
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autofs_vfsops.c,v 1.1 2018/01/09 03:31:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autofs_vfsops.c,v 1.2 2018/01/09 16:19:39 christos Exp $");
 
 
 #include "autofs.h"
@@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: autofs_vfsop
 MODULE(MODULE_CLASS_VFS, autofs, NULL);
 
 static int	autofs_statvfs(struct mount *, struct statvfs *);
+static int	autofs_sysctl_create(void);
 
 static void
 autofs_init(void)
@@ -64,6 +65,10 @@ autofs_init(void)
 	cv_init(_softc->sc_cv, "autofscv");
 	mutex_init(_softc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	autofs_softc->sc_dev_opened = false;
+
+	autofs_sysctl_create();
+	workqueue_create(_tmo_wq, "autofstmo",
+	autofs_timeout_wq, NULL, 0, 0, WQ_MPSAFE);
 }
 
 static void
@@ -72,6 +77,8 @@ autofs_done(void)
 	KASSERT(autofs_softc);
 	KASSERT(!autofs_softc->sc_dev_opened);
 
+	workqueue_destroy(autofs_tmo_wq);
+
 	struct autofs_softc *sc = autofs_softc;
 	autofs_softc = NULL;
 
@@ -437,6 +444,8 @@ fail:
 	return error;
 }
 
+extern const struct cdevsw autofs_cdevsw;
+
 static int
 autofs_modcmd(modcmd_t cmd, void *arg)
 {
@@ -451,30 +460,16 @@ autofs_modcmd(modcmd_t cmd, void *arg)
 		if (error)
 			break;
 #ifdef _MODULE
-		error = devsw_attach("autofs", NULL, , _ops,
+		error = devsw_attach("autofs", NULL, , _cdevsw,
 		);
 		if (error) {
 			vfs_detach(_vfsops);
 			break;
 		}
 #endif
-		error = workqueue_create(_tmo_wq, "autofstmo",
-		autofs_timeout_wq, NULL, 0, 0, WQ_MPSAFE);
-		if (error) {
-			devsw_detach(NULL, _ops);
-			vfs_detach(_vfsops);
-			break;
-		}
-
-		error = autofs_sysctl_create();
-		if (error) {
-			workqueue_destroy(autofs_tmo_wq);
-			devsw_detach(NULL, _ops);
-			vfs_detach(_vfsops);
-			break;
-		}
 		break;
 	case MODULE_CMD_FINI:
+#ifdef _MODULE
 		KASSERT(autofs_softc);
 		mutex_enter(_softc->sc_lock);
 		if (autofs_softc->sc_dev_opened) {
@@ -484,9 +479,7 @@ autofs_modcmd(modcmd_t cmd, void *arg)
 		}
 		mutex_exit(_softc->sc_lock);
 
-		

CVS commit: src/sys/fs/autofs

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 16:19:39 UTC 2018

Modified Files:
src/sys/fs/autofs: autofs.c autofs_vfsops.c

Log Message:
fix module attachment and cdevsw


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/autofs/autofs.c
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs_vfsops.c

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

CVS commit: src/sys/modules/autofs

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 16:18:35 UTC 2018

Modified Files:
src/sys/modules/autofs: Makefile
Added Files:
src/sys/modules/autofs: autofs.ioconf

Log Message:
fix autofs pseudo device


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

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

CVS commit: src/sys/modules/autofs

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan  9 16:18:35 UTC 2018

Modified Files:
src/sys/modules/autofs: Makefile
Added Files:
src/sys/modules/autofs: autofs.ioconf

Log Message:
fix autofs pseudo device


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/autofs/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/autofs/autofs.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/autofs/Makefile
diff -u src/sys/modules/autofs/Makefile:1.1 src/sys/modules/autofs/Makefile:1.2
--- src/sys/modules/autofs/Makefile:1.1	Mon Jan  8 22:31:14 2018
+++ src/sys/modules/autofs/Makefile	Tue Jan  9 11:18:35 2018
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2018/01/09 03:31:14 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2018/01/09 16:18:35 christos Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/fs/autofs
 
 KMOD=	autofs
+IOCONF= autofs.ioconf
 SRCS=	autofs.c autofs_vfsops.c autofs_vnops.c
 
 CPPFLAGS+=	-DDIAGNOSTIC

Added files:

Index: src/sys/modules/autofs/autofs.ioconf
diff -u /dev/null src/sys/modules/autofs/autofs.ioconf:1.1
--- /dev/null	Tue Jan  9 11:18:35 2018
+++ src/sys/modules/autofs/autofs.ioconf	Tue Jan  9 11:18:35 2018
@@ -0,0 +1,7 @@
+#	$NetBSD: autofs.ioconf,v 1.1 2018/01/09 16:18:35 christos Exp $
+
+ioconf		autofs
+
+include		"conf/files"
+
+pseudo-device   autofs

CVS commit: src/tests/modules

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 15:16:02 UTC 2018

Modified Files:
src/tests/modules: t_klua_pr_52864.sh

Log Message:
Skip the test on non-modular kernels


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_klua_pr_52864.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/modules/t_klua_pr_52864.sh
diff -u src/tests/modules/t_klua_pr_52864.sh:1.1 src/tests/modules/t_klua_pr_52864.sh:1.2
--- src/tests/modules/t_klua_pr_52864.sh:1.1	Mon Jan  8 14:17:15 2018
+++ src/tests/modules/t_klua_pr_52864.sh	Tue Jan  9 15:16:02 2018
@@ -1,5 +1,5 @@
 #! /usr/bin/atf-sh
-# $NetBSD: t_klua_pr_52864.sh,v 1.1 2018/01/08 14:17:15 martin Exp $
+# $NetBSD: t_klua_pr_52864.sh,v 1.2 2018/01/09 15:16:02 martin Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,9 +38,13 @@ luastate_head() {
 }
 
 luastate_body() {
+	err=$( modstat -e 2>&1 )
+	if [ $? -gt 0 ]; then
+		atf_skip "${err##modstat:}"
+	fi
 	sysctl -q kern.lua.verbose
 	if [ $? -eq 1 ]; then
-	atf_check -s eq:0 modload lua
+		atf_check -s eq:0 modload lua
 	fi
 	atf_check -s eq:0 luactl -q create atfluastate
 	atf_check -s eq:0 -o ignore luactl

CVS commit: src/tests/modules

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 15:16:02 UTC 2018

Modified Files:
src/tests/modules: t_klua_pr_52864.sh

Log Message:
Skip the test on non-modular kernels


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_klua_pr_52864.sh

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

CVS commit: src/sys/fs/autofs

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 13:56:00 UTC 2018

Modified Files:
src/sys/fs/autofs: autofs.c

Log Message:
Include  for the atomic funtions used in here.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs.c

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

CVS commit: src/sys/fs/autofs

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 13:56:00 UTC 2018

Modified Files:
src/sys/fs/autofs: autofs.c

Log Message:
Include  for the atomic funtions used in here.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs.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/fs/autofs/autofs.c
diff -u src/sys/fs/autofs/autofs.c:1.1 src/sys/fs/autofs/autofs.c:1.2
--- src/sys/fs/autofs/autofs.c:1.1	Tue Jan  9 03:31:14 2018
+++ src/sys/fs/autofs/autofs.c	Tue Jan  9 13:56:00 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: autofs.c,v 1.1 2018/01/09 03:31:14 christos Exp $	*/
+/*	$NetBSD: autofs.c,v 1.2 2018/01/09 13:56:00 martin Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -68,10 +68,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.1 2018/01/09 03:31:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.2 2018/01/09 13:56:00 martin Exp $");
 
 #include "autofs.h"
 
+#include 
 #include 
 #include 
 

CVS commit: src/usr.sbin/fstyp

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 10:47:57 UTC 2018

Modified Files:
src/usr.sbin/fstyp: fstyp.c

Log Message:
Use fseeko instead of fseek to fix the build on some 32bit architectures


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.c

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

CVS commit: src/usr.sbin/fstyp

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan  9 10:47:57 UTC 2018

Modified Files:
src/usr.sbin/fstyp: fstyp.c

Log Message:
Use fseeko instead of fseek to fix the build on some 32bit architectures


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.c

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

Modified files:

Index: src/usr.sbin/fstyp/fstyp.c
diff -u src/usr.sbin/fstyp/fstyp.c:1.1 src/usr.sbin/fstyp/fstyp.c:1.2
--- src/usr.sbin/fstyp/fstyp.c:1.1	Tue Jan  9 03:31:15 2018
+++ src/usr.sbin/fstyp/fstyp.c	Tue Jan  9 10:47:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstyp.c,v 1.1 2018/01/09 03:31:15 christos Exp $	*/
+/*	$NetBSD: fstyp.c,v 1.2 2018/01/09 10:47:57 martin Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  *
  */
 #include 
-__RCSID("$NetBSD: fstyp.c,v 1.1 2018/01/09 03:31:15 christos Exp $");
+__RCSID("$NetBSD: fstyp.c,v 1.2 2018/01/09 10:47:57 martin Exp $");
 
 #include 
 #include 
@@ -89,7 +89,7 @@ read_buf(FILE *fp, off_t off, size_t len
 	size_t nread;
 	void *buf;
 
-	error = fseek(fp, off, SEEK_SET);
+	error = fseeko(fp, off, SEEK_SET);
 	if (error != 0) {
 		warn("cannot seek to %jd", (uintmax_t)off);
 		return NULL;

CVS commit: src/usr.sbin/fstyp

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:41:29 UTC 2018

Modified Files:
src/usr.sbin/fstyp: fstyp.8

Log Message:
File system police. Add RCS Id. Improve SYNOPSIS. Use more markup.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.8

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

Modified files:

Index: src/usr.sbin/fstyp/fstyp.8
diff -u src/usr.sbin/fstyp/fstyp.8:1.1 src/usr.sbin/fstyp/fstyp.8:1.2
--- src/usr.sbin/fstyp/fstyp.8:1.1	Tue Jan  9 03:31:15 2018
+++ src/usr.sbin/fstyp/fstyp.8	Tue Jan  9 09:41:29 2018
@@ -1,3 +1,5 @@
+.\" $NetBSD: fstyp.8,v 1.2 2018/01/09 09:41:29 wiz Exp $
+.\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -37,18 +39,16 @@
 .Os
 .Sh NAME
 .Nm fstyp
-.Nd determine filesystem type
+.Nd determine file system type
 .Sh SYNOPSIS
 .Nm
-.Op Fl l
-.Op Fl s
-.Op Fl u
+.Op Fl lsu
 .Ar special
 .Sh DESCRIPTION
 The
 .Nm
-utility is used to determine the filesystem type on a given device.
-It can recognize ISO-9660, Ext2, FAT, NTFS, and UFS filesystems.
+utility is used to determine the file system type on a given device.
+It can recognize ISO-9660, Ext2, FAT, NTFS, and UFS file systems.
 When the
 .Fl u
 flag is specified,
@@ -56,10 +56,9 @@ flag is specified,
 also recognizes certain additional metadata formats that cannot be
 handled using
 .Xr mount 8 ,
-such as
-ZFS pools.
+such as ZFS pools.
 .Pp
-The filesystem name is printed to the standard output
+The file system name is printed to the standard output
 as, respectively:
 .Bl -item -offset indent -compact
 .It
@@ -78,16 +77,16 @@ zfs
 .Pp
 Because
 .Nm
-is built specifically to detect filesystem types, it differs from
+is built specifically to detect file system types, it differs from
 .Xr file 1
 in several ways.
-The output is machine-parsable, filesystem labels are supported,
-and does not try to recognize any file format other than filesystems.
+The output is machine-parsable, file system labels are supported,
+and it does not try to recognize any file format other than file systems.
 .Pp
 These options are available:
 .Bl -tag -width ".Fl l"
 .It Fl l
-In addition to filesystem type, print filesystem label if available.
+In addition to file system type, print file system label if available.
 .It Fl s
 Ignore file type.
 By default,
@@ -96,13 +95,13 @@ only works on regular files and disk-lik
 Trying to read other file types might have unexpected consequences or hang
 indefinitely.
 .It Fl u
-Include filesystems and devices that cannot be mounted directly by
+Include file systems and devices that cannot be mounted directly by
 .Xr mount 8 .
 .El
 .Sh EXIT STATUS
 The
 .Nm
-utility exits 0 on success, and >0 if an error occurs or the filesystem
+utility exits 0 on success, and >0 if an error occurs or the file system
 type is not recognized.
 .Sh SEE ALSO
 .Xr file 1 ,
@@ -128,7 +127,9 @@ The
 .Nm
 utility was developed by
 .An Edward Tomasz Napierala Aq Mt tr...@freebsd.org
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
 ZFS and GELI support was added by
 .An Allan Jude Aq Mt allanj...@freebsd.org .
 .Pp
@@ -141,8 +142,5 @@ and
 by
 .An Tomohiro Kusumi Aq Mt kusumi.tomoh...@gmail.com .
 .Sh BUGS
-.Xr geli 8
-and
-.Xr hammer 8
-are currently unsupported on
+geli and hammer are currently unsupported on
 .Nx .

CVS commit: src/usr.sbin/fstyp

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:41:29 UTC 2018

Modified Files:
src/usr.sbin/fstyp: fstyp.8

Log Message:
File system police. Add RCS Id. Improve SYNOPSIS. Use more markup.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.8

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

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:39:07 UTC 2018

Modified Files:
src/usr.sbin/autofs: automount.8 automountd.8 autounmountd.8

Log Message:
File system police. Sort options. Add RCS Id. Use more markup. Wording.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/automount.8 \
src/usr.sbin/autofs/automountd.8 src/usr.sbin/autofs/autounmountd.8

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

Modified files:

Index: src/usr.sbin/autofs/automount.8
diff -u src/usr.sbin/autofs/automount.8:1.1 src/usr.sbin/autofs/automount.8:1.2
--- src/usr.sbin/autofs/automount.8:1.1	Tue Jan  9 03:31:15 2018
+++ src/usr.sbin/autofs/automount.8	Tue Jan  9 09:39:07 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: automount.8,v 1.1 2018/01/09 03:31:15 christos Exp $
+.\"	$NetBSD: automount.8,v 1.2 2018/01/09 09:39:07 wiz Exp $
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -41,13 +41,9 @@
 .Nd update autofs mounts
 .Sh SYNOPSIS
 .Nm
+.Op Fl cfLuv
 .Op Fl D Ar name=value
-.Op Fl L
-.Op Fl c
-.Op Fl f
 .Op Fl o Ar options
-.Op Fl v
-.Op Fl u
 .Sh DESCRIPTION
 When called without options, the
 .Nm
@@ -56,13 +52,19 @@ command parses the
 configuration file and any direct maps that it references, and mounts
 or unmounts
 .Xr autofs 5
-filesystems to match.
+file systems to match.
 These options are available:
 .Bl -tag -width ".Fl v"
+.It Fl c
+Flush caches, discarding possibly stale information obtained from maps
+and directory services.
 .It Fl D
 Define a variable.
 It is only useful with
 .Fl L .
+.It Fl f
+Force unmount, to be used with
+.Fl u .
 .It Fl L
 Do not mount or unmount anything.
 Instead parse
@@ -71,23 +73,17 @@ and any direct maps, then print them to 
 When specified more than once, all the maps, including indirect ones,
 will be parsed and shown.
 This is useful when debugging configuration problems.
-.It Fl c
-Flush caches, discarding possibly stale information obtained from maps
-and directory services.
-.It Fl f
-Force unmount, to be used with
-.Fl u .
 .It Fl o
 Specify mount options to be used along with the ones specified in the maps.
 It is only useful with
 .Fl L .
 .It Fl u
-Try to unmount filesystems mounted by
+Try to unmount file systems mounted by
 .Xr automountd 8 .
 .Xr autofs 5
 mounts are not unmounted.
 To unmount all
-.Xr autofs
+.Xr autofs 5
 mounts, use
 .Cm "umount -At autofs".
 .It Fl v
@@ -96,12 +92,12 @@ Increase verbosity.
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
-Unmount all filesystems mounted by
+Unmount all file systems mounted by
 .Xr automountd 8 :
 .Dl Nm Fl u
 .Sh SEE ALSO
-.Xr autofs 5 ,
 .Xr auto_master 5 ,
+.Xr autofs 5 ,
 .Xr automountd 8 ,
 .Xr autounmountd 8
 .Sh HISTORY
@@ -122,7 +118,9 @@ The
 .Nm
 was developed by
 .An Edward Tomasz Napierala Aq Mt tr...@freebsd.org
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
 .Pp
 The
 .Nm
Index: src/usr.sbin/autofs/automountd.8
diff -u src/usr.sbin/autofs/automountd.8:1.1 src/usr.sbin/autofs/automountd.8:1.2
--- src/usr.sbin/autofs/automountd.8:1.1	Tue Jan  9 03:31:15 2018
+++ src/usr.sbin/autofs/automountd.8	Tue Jan  9 09:39:07 2018
@@ -1,3 +1,5 @@
+.\" $NetBSD: automountd.8,v 1.2 2018/01/09 09:39:07 wiz Exp $
+.\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -40,31 +42,31 @@
 .Nd daemon handling autofs mount requests
 .Sh SYNOPSIS
 .Nm
+.Op Fl div
 .Op Fl D Ar name=value
-.Op Fl i
 .Op Fl m Ar maxproc
 .Op Fl o Ar options
-.Op Fl d
-.Op Fl v
 .Sh DESCRIPTION
 The
 .Nm
 daemon is responsible for handling
 .Xr autofs 5
 mount requests, parsing maps,
-and mounting filesystems they specify.
+and mounting file systems they specify.
 On startup,
 .Nm
 forks into background and waits for kernel requests.
 When a request is received,
 .Nm
 forks a child process.
-The child process parses the appropriate map and mounts filesystems accordingly.
+The child process parses the appropriate map and mounts file systems accordingly.
 Then it signals the kernel to release blocked processes that were waiting
 for the mount.
 .Bl -tag -width ".Fl v"
 .It Fl D
 Define a variable.
+.It Fl d
+Debug mode: increase verbosity and do not daemonize.
 .It Fl i
 For indirect mounts, only create subdirectories if there are no wildcard
 entries.
@@ -79,8 +81,6 @@ Limit the number of forked
 .Nm
 processes, and thus the number of mount requests being handled in parallel.
 The default is 30.
-.It Fl d
-Debug mode: increase verbosity and do not daemonize.
 .It Fl o Ar options
 Specify mount options.
 Options specified here will be overridden by options entered in maps or
@@ -91,9 +91,8 @@ Increase verbosity.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr autofs 5 ,
 .Xr auto_master 5 ,
-.Xr 

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:39:07 UTC 2018

Modified Files:
src/usr.sbin/autofs: automount.8 automountd.8 autounmountd.8

Log Message:
File system police. Sort options. Add RCS Id. Use more markup. Wording.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/automount.8 \
src/usr.sbin/autofs/automountd.8 src/usr.sbin/autofs/autounmountd.8

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

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:33:00 UTC 2018

Modified Files:
src/usr.sbin/autofs: auto_master.5

Log Message:
Mostly formatting improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/autofs/auto_master.5

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

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:33:00 UTC 2018

Modified Files:
src/usr.sbin/autofs: auto_master.5

Log Message:
Mostly formatting improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/autofs/auto_master.5

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

Modified files:

Index: src/usr.sbin/autofs/auto_master.5
diff -u src/usr.sbin/autofs/auto_master.5:1.2 src/usr.sbin/autofs/auto_master.5:1.3
--- src/usr.sbin/autofs/auto_master.5:1.2	Tue Jan  9 09:27:41 2018
+++ src/usr.sbin/autofs/auto_master.5	Tue Jan  9 09:33:00 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: auto_master.5,v 1.2 2018/01/09 09:27:41 wiz Exp $
+.\"	$NetBSD: auto_master.5,v 1.3 2018/01/09 09:33:00 wiz Exp $
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -56,7 +56,7 @@ daemon.
 The
 .Nm
 file consists of lines with two or three entries separated by whitespace
-and terminated by newline character:
+and terminated by a newline character:
 .Bd -literal -offset indent
 .Pa mountpoint Pa map_name Op Ar -options
 .Ed
@@ -92,7 +92,7 @@ is not a fully specified path
 .Pq it does not start with Li / ,
 .Xr automountd 8
 will search for that name in
-.Li /etc .
+.Pa /etc .
 Otherwise it will use the path as given.
 If the file indicated by
 .Pa map_name
@@ -109,8 +109,10 @@ is an optional field that starts with
 .Li -
 and can contain generic file system mount options.
 .Pp
-The following example specifies that the /etc/auto_example indirect map
-will be mounted on /example.
+The following example specifies that the
+.Pa /etc/auto_example
+indirect map will be mounted on
+.Pa /example .
 .Bd -literal -offset indent
 /example auto_example
 .Ed
@@ -135,8 +137,7 @@ A wildcard
 .Pq Ql *
 can be used for the key.
 It matches every directory that does not match other keys.
-Those directories will not be visible to the user
-until accessed.
+Those directories will not be visible to the user until accessed.
 .Pp
 The
 .Ar options
@@ -162,8 +163,7 @@ and executable maps.
 .Pp
 The optional
 .Pa mountpoint
-field is used to specify multiple mount points
-for a single key.
+field is used to specify multiple mount points for a single key.
 .Pp
 The
 .Ar location
@@ -193,7 +193,8 @@ Defined variables are:
 Expands to the output of
 .Li "uname -p" .
 .It Li CPU
-Same as ARCH.
+Same as
+.Li ARCH .
 .It Li HOST
 Expands to the output of
 .Li "uname -n" .
@@ -260,7 +261,7 @@ Query the remote NFS server and map expo
 This map is traditionally mounted on
 .Pa /net .
 Access to files on a remote NFS server is provided through the
-.Pf /net/ Ar nfs-server-ip Ns / Ns Ar share-name Ns/
+.Pf /net/ Ar nfs-server-ip Ns / Ns Ar share-name Ns /
 directory without any additional configuration.
 Directories for individual NFS servers are not present until the first access,
 when they are automatically created.
@@ -320,8 +321,8 @@ The example above could be rewritten usi
 .Li /- auto_example
 .Ed
 .Pp
-and this in
-.Li /etc/auto_example
+and this in the
+.Pa /etc/auto_example
 map file:
 .Bd -literal -offset indent
 .Li /example/x -intr,nfsv4 192.168.1.1:/share/example/x
@@ -391,5 +392,7 @@ and
 by
 .An Tomohiro Kusumi Aq Mt kusumi.tomoh...@gmail.com .
 .Sh BUGS
-The -media special map is currently unsupported on
+The
+.Li -media
+special map is currently unsupported on
 .Nx .

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:27:41 UTC 2018

Modified Files:
src/usr.sbin/autofs: auto_master.5

Log Message:
file system police.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/auto_master.5

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

Modified files:

Index: src/usr.sbin/autofs/auto_master.5
diff -u src/usr.sbin/autofs/auto_master.5:1.1 src/usr.sbin/autofs/auto_master.5:1.2
--- src/usr.sbin/autofs/auto_master.5:1.1	Tue Jan  9 03:31:15 2018
+++ src/usr.sbin/autofs/auto_master.5	Tue Jan  9 09:27:41 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: auto_master.5,v 1.1 2018/01/09 03:31:15 christos Exp $
+.\"	$NetBSD: auto_master.5,v 1.2 2018/01/09 09:27:41 wiz Exp $
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 The automounter configuration consists of the
 .Nm
-configuration file, which assigns filesystem paths to map names,
+configuration file, which assigns file system paths to map names,
 and maps, which contain actual mount information.
 The
 .Nm
@@ -107,7 +107,7 @@ Otherwise, the file is opened and the co
 .Pa -options
 is an optional field that starts with
 .Li -
-and can contain generic filesystem mount options.
+and can contain generic file system mount options.
 .Pp
 The following example specifies that the /etc/auto_example indirect map
 will be mounted on /example.
@@ -142,12 +142,12 @@ The
 .Ar options
 field, if present, must begin with
 .Li - .
-When mounting the filesystem, options supplied to
+When mounting the file system, options supplied to
 .Nm
 and options specified in the map entry are concatenated together.
 The special option
 .Li fstype
-is used to specify filesystem type.
+is used to specify file system type.
 It is not passed to the mount program as an option.
 Instead, it is passed as an argument to
 .Cm "mount -t".
@@ -167,7 +167,7 @@ for a single key.
 .Pp
 The
 .Ar location
-field specifies the filesystem to be mounted.
+field specifies the file system to be mounted.
 Ampersands
 .Pq Ql &
 in the
@@ -265,10 +265,10 @@ directory without any additional configu
 Directories for individual NFS servers are not present until the first access,
 when they are automatically created.
 .It Li -media
-Query devices that are not yet mounted, but contain valid filesystems.
+Query devices that are not yet mounted, but contain valid file systems.
 Generally used to access files on removable media.
 .It Li -noauto
-Mount filesystems configured in
+Mount file systems configured in
 .Xr fstab 5
 as "noauto".
 This needs to be set up as a direct map.
@@ -378,7 +378,9 @@ The
 .Nm
 configuration file functionality was developed by
 .An Edward Tomasz Napierala Aq Mt tr...@freebsd.org
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
 .Pp
 The
 .Nm

CVS commit: src/usr.sbin/autofs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:27:41 UTC 2018

Modified Files:
src/usr.sbin/autofs: auto_master.5

Log Message:
file system police.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/auto_master.5

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

CVS commit: src/usr.bin/showmount

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:24:23 UTC 2018

Modified Files:
src/usr.bin/showmount: showmount.8

Log Message:
Stop using Tn. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/showmount/showmount.8

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

Modified files:

Index: src/usr.bin/showmount/showmount.8
diff -u src/usr.bin/showmount/showmount.8:1.13 src/usr.bin/showmount/showmount.8:1.14
--- src/usr.bin/showmount/showmount.8:1.13	Tue Jan  9 03:31:15 2018
+++ src/usr.bin/showmount/showmount.8	Tue Jan  9 09:24:22 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: showmount.8,v 1.13 2018/01/09 03:31:15 christos Exp $
+.\"	$NetBSD: showmount.8,v 1.14 2018/01/09 09:24:22 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,14 +44,11 @@
 .Op Ar host
 .Sh DESCRIPTION
 .Nm
-shows status information about the
-.Tn NFS
-server on
+shows status information about the NFS server on
 .Ar host .
-By default it prints the names of all hosts that have
-.Tn NFS
-file systems mounted
-on the host. See
+By default it prints the names of all hosts that have NFS file
+systems mounted on the host.
+See
 .%T "NFS: Network File System Protocol Specification" ,
 RFC 1094,
 Appendix A,
@@ -90,9 +87,7 @@ utility first appeared in
 .Bx 4.4 .
 .Sh BUGS
 The mount daemon running on the server only has an idea of the actual mounts,
-since the
-.Tn NFS
-server is stateless.
+since the NFS server is stateless.
 .Nm
 will only display the information
 as accurately as the mount daemon reports it.

CVS commit: src/usr.bin/showmount

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:24:23 UTC 2018

Modified Files:
src/usr.bin/showmount: showmount.8

Log Message:
Stop using Tn. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/showmount/showmount.8

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

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:22:26 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Use Pa for paths.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:21:41 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Remove superfluous Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/share/man/man7/hier.7

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/man7/hier.7
diff -u src/share/man/man7/hier.7:1.125 src/share/man/man7/hier.7:1.126
--- src/share/man/man7/hier.7:1.125	Tue Jan  9 09:20:23 2018
+++ src/share/man/man7/hier.7	Tue Jan  9 09:21:41 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.125 2018/01/09 09:20:23 wiz Exp $
+.\"	$NetBSD: hier.7,v 1.126 2018/01/09 09:21:41 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -47,7 +47,6 @@ and what they are, with references to ot
 documentation.
 .Pp
 Not all files will be in every system.
-.Pp
 .Bl -tag -width "/altroot/"
 .It Sy \&/
 Root directory of the system.
@@ -624,7 +623,6 @@ Test programs; see
 .Xr tests 7
 for information on how to run them.
 .El
-.Pp
 .It Sy /usr/src/
 .Nx
 and local source files.
@@ -736,7 +734,6 @@ Source for Programmer's Supplementary Do
 Source for System Manager's Manual.
 .It Sy usd/
 Source for User's Supplementary Documents.
-.Pp
 .El
 .El
 .It Sy sys/

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:22:26 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Use Pa for paths.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/share/man/man7/hier.7

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/man7/hier.7
diff -u src/share/man/man7/hier.7:1.126 src/share/man/man7/hier.7:1.127
--- src/share/man/man7/hier.7:1.126	Tue Jan  9 09:21:41 2018
+++ src/share/man/man7/hier.7	Tue Jan  9 09:22:25 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.126 2018/01/09 09:21:41 wiz Exp $
+.\"	$NetBSD: hier.7,v 1.127 2018/01/09 09:22:25 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -48,309 +48,309 @@ documentation.
 .Pp
 Not all files will be in every system.
 .Bl -tag -width "/altroot/"
-.It Sy \&/
+.It Pa \&/
 Root directory of the system.
-.It Sy /COPYRIGHT
+.It Pa /COPYRIGHT
 System copyright notice, most often put on CD-ROM distributions.
-.It Sy "/[a-z]/"
+.It Pa "/[a-z]/"
 User file systems.
-.It Sy /altroot/
+.It Pa /altroot/
 Alternate root file system, in case of disaster.
-.\" .It Sy /amd/
+.\" .It Pa /amd/
 .\" Home directories mount point; see
 .\" .Xr amd 8 .
-.It Sy /bin/
+.It Pa /bin/
 Utilities used in both single and multi-user environments.
-.It Sy /boot*
+.It Pa /boot*
 Second-stage boot loader(s) for some platforms; see
 .Xr installboot 8 .
-.It Sy /cdrom/
+.It Pa /cdrom/
 Empty directory commonly used by
 system administrators as a temporary mount point for ISO-9660 file
 systems on CD (or DVD) media.
-.It Sy /dev/
+.It Pa /dev/
 Block, character, and other special device files.
 .Pp
 .Bl -tag -width "MAKEDEV" -compact
-.It Sy MAKEDEV
+.It Pa MAKEDEV
 Script for creating device files;
 see
 .Xr makedev 8 .
-.It Sy console
+.It Pa console
 The computer's console device.
-.It Sy drum
+.It Pa drum
 The computer's swap space device; see
 .Xr drum 4 .
-.It Sy fd/
+.It Pa fd/
 File descriptor files;
 see
 .Xr fd 4 .
-.It Sy klog
+.It Pa klog
 Kernel logging device; see
 .Xr syslog 3 .
-.It Sy kmem
+.It Pa kmem
 Kernel virtual memory device; see
 .Xr mem 4 .
-.It Sy log
+.It Pa log
 .Ux
 domain datagram log socket; see
 .Xr syslogd 8 .
-.It Sy mem
+.It Pa mem
 Kernel physical memory device; see
 .Xr mem 4 .
-.It Sy null
+.It Pa null
 The null device; see
 .Xr null 4 .
-.It Sy pts/
+.It Pa pts/
 Mount point for the pseudo-terminal device file system; see
 .Xr mount_ptyfs 8 .
-.It Sy stderr
-.It Sy stdin
-.It Sy stdout
+.It Pa stderr
+.It Pa stdin
+.It Pa stdout
 File descriptor files;
 see
 .Xr fd 4 .
-.It Sy tty
+.It Pa tty
 Device pointing to each process's own controlling terminal; see
 .Xr tty 4 .
-.It Sy zero
+.It Pa zero
 The zero device; see
 .Xr zero 4 .
 .El
-.\" .It Sy /dump/
+.\" .It Pa /dump/
 .\" Online
 .\" .Xr dump 8
 .\" repository.
-.It Sy /etc/
+.It Pa /etc/
 System configuration files and scripts.
 .Pp
 .Bl -tag -width "master.passwd" -compact
-.It Sy amd*
+.It Pa amd*
 Configuration files for
 .Xr amd 8 .
-.It Sy changelist
+.It Pa changelist
 Files backed up by the
-.Sy security
+.Pa security
 script.
-.It Sy crontab
+.It Pa crontab
 Schedule used by the
 .Xr cron 8
 daemon.
-.It Sy csh.cshrc
-.It Sy csh.login
-.It Sy csh.logout
+.It Pa csh.cshrc
+.It Pa csh.login
+.It Pa csh.logout
 System-wide scripts for
 .Xr csh 1 .
-.It Sy daily
+.It Pa daily
 Script run each day by
 .Xr cron 8 .
-.It Sy daily.conf
+.It Pa daily.conf
 Configuration file for
-.Sy daily ;
+.Pa daily ;
 see
 .Xr daily.conf 5 .
-.It Sy defaults/
+.It Pa defaults/
 Default configuration files read by various
 .Pa /etc/*.conf
 files.
-.It Sy disktab
+.It Pa disktab
 Disk description file; see
 .Xr disktab 5 .
-.It Sy dm.conf
+.It Pa dm.conf
 Dungeon master configuration; see
 .Xr dm.conf 5 .
-.It Sy dumpdates
+.It Pa dumpdates
 Dump history; see
 .Xr dump 8 .
-.It Sy exports
+.It Pa exports
 File system export information; see
 .Xr mountd 8 .
-.It Sy fstab
+.It Pa fstab
 File system mounting table; see
 .Xr fstab 5
 and
 .Xr mount 8 .
-.It Sy ftpusers
+.It Pa ftpusers
 Users denied
 .Xr ftp 1
 access; see
 .Xr ftpd 8 .
-.It Sy ftpwelcome
+.It Pa ftpwelcome
 .Xr ftp 1
 initial message; see
 .Xr ftpd 8 .
-.It Sy gettytab
+.It Pa gettytab
 Terminal configuration database; see
 .Xr gettytab 5 .
-.It Sy group
+.It Pa group
 Group permissions file; see
 .Xr group 5 .
-.It Sy hosts
+.It Pa hosts
 Host name database backup for
 .Xr named 8 ;
 see
 .Xr hosts 5 .
-.It Sy hosts.equiv
+.It Pa hosts.equiv
 Trusted machines with equivalent user IDs.
 (Obsolete.)
-.It Sy hosts.lpd
+.It Pa hosts.lpd
 Trusted machines with printing privileges.
-.It Sy inetd.conf
+.It Pa inetd.conf
 Internet server configuration file; see
 .Xr inetd 8 .
-.It Sy kerberosV/
+.It Pa kerberosV/
 Configuration files for Kerberos version V;
 see
 .Xr kerberos 8 .
-.It Sy 

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:21:41 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Remove superfluous Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:20:23 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Stop using Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/share/man/man7/hier.7

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/man7/hier.7
diff -u src/share/man/man7/hier.7:1.124 src/share/man/man7/hier.7:1.125
--- src/share/man/man7/hier.7:1.124	Tue Jan  9 03:31:12 2018
+++ src/share/man/man7/hier.7	Tue Jan  9 09:20:23 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.124 2018/01/09 03:31:12 christos Exp $
+.\"	$NetBSD: hier.7,v 1.125 2018/01/09 09:20:23 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -52,9 +52,7 @@ Not all files will be in every system.
 .It Sy \&/
 Root directory of the system.
 .It Sy /COPYRIGHT
-System copyright notice, most often put on
-.Tn CD-ROM
-distributions.
+System copyright notice, most often put on CD-ROM distributions.
 .It Sy "/[a-z]/"
 User file systems.
 .It Sy /altroot/
@@ -322,8 +320,7 @@ List of permitted shells; see
 .It Sy skel/
 Sample initialization files for new user accounts.
 .It Sy sliphome/
-.Tn SLIP
-login/logout scripts; see
+SLIP login/logout scripts; see
 .Xr sliplogin 8 .
 .It Sy spwd.db
 Database form of master.passwd file; see
@@ -700,9 +697,8 @@ BSD-like zlib license.
 Source for utilities/files in
 .Pa /usr/games .
 .It Sy gnu/
-Source for programs covered by the
-.Tn GNU
-license (or similar) (deprecated; use
+Source for programs covered by the GNU license (or similar)
+(deprecated; use
 .Sy external/gpl2/
 or
 .Sy external/gpl3/
@@ -909,28 +905,19 @@ Support for
 .Nx
 32-bit binaries on 64 bit platforms with compatible CPU families.
 .It Sy osf1/
-Support for
-.Tn Digital
+Support for Digital
 .Ux
-.Po
-formerly
-.Tn OSF/1
-.Pc
-binaries.
+(formerly OSF/1) binaries.
 .It Sy ossaudio/
 Support for OSS audio.
 .It Sy sunos/
-Support for
-.Tn SunOS 4.x
-binaries; see
+Support for SunOS 4.x binaries; see
 .Xr compat_sunos 8 .
 .It Sy svr4/
 Support for System V Release 4 binaries; see
 .Xr compat_svr4 8 .
 .It Sy ultrix/
-Support for
-.Tn ULTRIX
-binaries.
+Support for ULTRIX binaries.
 .It Sy vax1k/
 Support for older VAX binaries that started on a 1 KB boundary.
 .El
@@ -960,8 +947,7 @@ Support for the ISO-9660 file system; se
 Support for the Acorn RISC OS filecore file system; see
 .Xr mount_filecore 8 .
 .It Sy msdosfs/
-.Tn MS-DOS
-file system; see
+MS-DOS file system; see
 .Xr mount_msdos 8 .
 .It Sy ntfs/
 NTFS file system support; see

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:20:23 UTC 2018

Modified Files:
src/share/man/man7: hier.7

Log Message:
Stop using Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:19:10 UTC 2018

Modified Files:
src/share/man/man5: autofs.5

Log Message:
Add RCS Id. Simplify SYNOPSIS and remove loader.conf(5) reference.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man5/autofs.5

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 09:19:05 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
 Add Intel Apollo Lake devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1303 -r1.1304 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1303 src/sys/dev/pci/pcidevs:1.1304
--- src/sys/dev/pci/pcidevs:1.1303	Tue Jan  9 08:17:27 2018
+++ src/sys/dev/pci/pcidevs	Tue Jan  9 09:19:05 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1303 2018/01/09 08:17:27 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1304 2018/01/09 09:19:05 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4356,6 +4356,45 @@ product INTEL CORE7G_S_Q_HOST_DRAM 0x591
 product INTEL CORE7G_U_GT3	0x5923	HD Graphics (GT3)
 product INTEL CORE7G_U_GT3E_15W	0x5926	Iris Plus Graphics 640 (GT3e, 15W)
 product INTEL CORE7G_U_GT3E_28W	0x5927	Iris Plus Graphics 650 (GT3e, 28W)
+product INTEL APL_IGD_1		0x5a84	Apollo Lake Graphics (18EU)
+product INTEL APL_IGD_2		0x5a85	Apollo Lake Graphics (12EU)
+product INTEL APL_IU		0x5a88	Apollo Lake Imaging Control Uint
+product INTEL APL_DPTF		0x5a8c	Apollo Lake DPTF
+product INTEL APL_P2SB		0x5a92	Apollo Lake Primary to SideBand Bridge
+product INTEL APL_PMC		0x5a94	Apollo Lake PMC
+product INTEL APL_FASTSPI	0x5a96	Apollo Lake Fast SPI
+product INTEL APL_HDA		0x5a98	Apollo Lake HD Audio
+product INTEL APL_ISH		0x5aa2	Apollo Lake Integrated Sensor Hub
+product INTEL APL_XHCI		0x5aa8	Apollo Lake USB Host (xHCI)
+product INTEL APL_XDCI		0x5aaa	Apollo Lake USB Device (xDCI)
+product INTEL APL_I2C_0		0x5aac	Apollo Lake I2C 0
+product INTEL APL_I2C_1		0x5aae	Apollo Lake I2C 1
+product INTEL APL_I2C_2		0x5ab0	Apollo Lake I2C 2
+product INTEL APL_I2C_3		0x5ab2	Apollo Lake I2C 3
+product INTEL APL_I2C_4		0x5ab4	Apollo Lake I2C 4
+product INTEL APL_I2C_5		0x5ab6	Apollo Lake I2C 5
+product INTEL APL_I2C_6		0x5ab8	Apollo Lake I2C 6
+product INTEL APL_I2C_7		0x5aba	Apollo Lake I2C 7
+product INTEL APL_UART_0	0x5abc	Apollo Lake UART 0
+product INTEL APL_UART_1	0x5abe	Apollo Lake UART 1
+product INTEL APL_UART_2	0x5ac0	Apollo Lake UART 2
+product INTEL APL_SPI_0		0x5ac2	Apollo Lake SPI 0
+product INTEL APL_SPI_1		0x5ac4	Apollo Lake SPI 1
+product INTEL APL_SPI_2		0x5ac6	Apollo Lake SPI 2
+product INTEL APL_SD		0x5aca	Apollo Lake SD Card
+product INTEL APL_EMMC		0x5acc	Apollo Lake eMMC
+product INTEL APL_SMB		0x5ad4	Apollo Lake SMBus
+product INTEL APL_PCIE_B0	0x5ad6	Apollo Lake PCIe B0
+product INTEL APL_PCIE_B1	0x5ad7	Apollo Lake PCIe B1
+product INTEL APL_PCIE_A0	0x5ad8	Apollo Lake PCIe A0
+product INTEL APL_PCIE_A1	0x5ad9	Apollo Lake PCIe A1
+product INTEL APL_PCIE_A2	0x5ada	Apollo Lake PCIe A2
+product INTEL APL_PCIE_A3	0x5adb	Apollo Lake PCIe A3
+product INTEL APL_SATA		0x5ae0	Apollo Lake SATA
+product INTEL APL_LPC		0x5ae8	Apollo Lake LPC
+product INTEL APL_SSRAM		0x5aec	Apollo Lake Shared SRAM
+product INTEL APL_UART_3	0x5aee	Apollo Lake UART 3
+product INTEL APL_HB		0x5af0	Apollo Lake Host Bridge
 product INTEL XEOND_HB_DMI2	0x6f00	Core i7-6xxxK/Xeon-D Host Bridge (DMI2)
 product INTEL XEOND_HB_PCIE	0x6f01	Xeon-D Host Bridge (PCIe)
 product INTEL XEOND_PCIE_1	0x6f02	Xeon-D PCIe Root Port (x8 or x4 max)

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 09:19:28 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1296 -r1.1297 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1295 -r1.1296 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:19:10 UTC 2018

Modified Files:
src/share/man/man5: autofs.5

Log Message:
Add RCS Id. Simplify SYNOPSIS and remove loader.conf(5) reference.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man5/autofs.5

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/man5/autofs.5
diff -u src/share/man/man5/autofs.5:1.1 src/share/man/man5/autofs.5:1.2
--- src/share/man/man5/autofs.5:1.1	Tue Jan  9 03:31:12 2018
+++ src/share/man/man5/autofs.5	Tue Jan  9 09:19:10 2018
@@ -1,3 +1,5 @@
+.\" $NetBSD: autofs.5,v 1.2 2018/01/09 09:19:10 wiz Exp $
+.\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
 .\" Copyright (c) 2014 The FreeBSD Foundation
@@ -39,19 +41,19 @@
 .Nm autofs
 .Nd "automounter filesystem"
 .Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following line in the
-kernel configuration file:
-.Bd -ragged -offset indent
+.\"To compile this driver into the kernel,
+.\"place the following line in the
+.\"kernel configuration file:
+.\".Bd -ragged -offset indent
 .Cd "options AUTOFS"
-.Ed
-.Pp
-Alternatively, to load the driver as a
-module at boot time, place the following line in
-.Xr loader.conf 5 :
-.Bd -literal -offset indent
-autofs_load="YES"
-.Ed
+.\".Ed
+.\".Pp
+.\"Alternatively, to load the driver as a
+.\"module at boot time, place the following line in
+.\".Xr loader.conf 5 :
+.\".Bd -literal -offset indent
+.\"autofs_load="YES"
+.\".Ed
 .Sh DESCRIPTION
 The
 .Nm

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 09:19:05 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
 Add Intel Apollo Lake devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1303 -r1.1304 src/sys/dev/pci/pcidevs

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

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:17:53 UTC 2018

Modified Files:
src/share/man/man5: rc.conf.5

Log Message:
Stop using Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/share/man/man5/rc.conf.5

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/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.167 src/share/man/man5/rc.conf.5:1.168
--- src/share/man/man5/rc.conf.5:1.167	Tue Jan  9 03:31:12 2018
+++ src/share/man/man5/rc.conf.5	Tue Jan  9 09:17:52 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rc.conf.5,v 1.167 2018/01/09 03:31:12 christos Exp $
+.\"	$NetBSD: rc.conf.5,v 1.168 2018/01/09 09:17:52 wiz Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -240,8 +240,7 @@ If empty or not set, then the contents o
 (if it exists) are used.
 .It Sy domainname
 A string.
-.Tn NIS
-(YP) domain of host.
+NIS (YP) domain of host.
 If empty or not set, then the contents of
 .Pa /etc/defaultdomain
 (if it exists) are used.
@@ -1022,8 +1021,7 @@ The
 daemon is required for any
 .Xr rpc 3
 services.
-These include NFS,
-.Tn NIS ,
+These include NFS, NIS,
 .Xr rpc.bootparamd 8 ,
 .Xr rpc.rstatd 8 ,
 .Xr rpc.rusersd 8 ,
@@ -1226,9 +1224,7 @@ the boot parameter server, with
 as options.
 Used to boot
 .Nx
-and
-.Tn "SunOS 4.x"
-systems.
+and SunOS 4.x systems.
 .It Sy dhcpd
 Boolean value.
 Runs
@@ -1247,13 +1243,7 @@ Passes
 Boolean value.
 Runs
 .Xr mopd 8 ,
-the
-.Tn DEC
-.Tn MOP
-protocol daemon; used for booting
-.Tn VAX
-and other
-.Tn DEC
+the DEC MOP protocol daemon; used for booting VAX and other DEC
 machines.
 Passes
 .Sy mopd_flags .
@@ -1277,11 +1267,7 @@ Passes
 Boolean value.
 Runs
 .Xr rbootd 8 ,
-the
-.Tn HP
-boot protocol daemon; used for booting
-.Tn HP
-workstations.
+the HP boot protocol daemon; used for booting HP workstations.
 Passes
 .Sy rbootd_flags .
 .It Sy rtadvd
@@ -1319,29 +1305,22 @@ X11 font server, which supplies local X 
 Boolean value.
 Runs
 .Xr ypbind 8 ,
-which lets
-.Tn NIS
-(YP) clients use information from a
-.Tn NIS
-server.
+which lets NIS (YP) clients use information from a NIS server.
 Passes
 .Sy ypbind_flags .
 .It Sy yppasswdd
 Boolean value.
 Runs
 .Xr yppasswdd 8 ,
-which allows remote
-.Tn NIS
-users to update password on master server.
+which allows remote NIS users to update password on master server.
 Passes
 .Sy yppasswdd_flags .
 .It Sy ypserv
 Boolean value.
 Runs
 .Xr ypserv 8 ,
-the
-.Tn NIS
-(YP) server for distributing information from certain files in
+the NIS (YP) server for distributing information from certain files
+in
 .Pa /etc .
 Passes
 .Sy ypserv_flags .

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:17:53 UTC 2018

Modified Files:
src/share/man/man5: rc.conf.5

Log Message:
Stop using Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/share/man/man5/rc.conf.5

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

CVS commit: src/sbin/mount

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:15:57 UTC 2018

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

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sbin/mount/mount.8

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

CVS commit: src/sbin/mount

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jan  9 09:15:57 UTC 2018

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

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sbin/mount/mount.8

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

Modified files:

Index: src/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.86 src/sbin/mount/mount.8:1.87
--- src/sbin/mount/mount.8:1.86	Tue Jan  9 03:31:12 2018
+++ src/sbin/mount/mount.8	Tue Jan  9 09:15:57 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount.8,v 1.86 2018/01/09 03:31:12 christos Exp $
+.\"	$NetBSD: mount.8,v 1.87 2018/01/09 09:15:57 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -540,6 +540,9 @@ mount -t cd9660 -o nodev,nosuid /dev/cd0
 .Xr options 4 ,
 .Xr wapbl 4 ,
 .Xr fstab 5 ,
+.Xr automount 8 ,
+.Xr automountd 8 ,
+.Xr autounmountd 8 ,
 .Xr disklabel 8 ,
 .Xr fsck 8 ,
 .Xr mount_ados 8 ,
@@ -576,10 +579,7 @@ mount -t cd9660 -o nodev,nosuid /dev/cd0
 .Xr rump_sysvbfs 8 ,
 .Xr rump_tmpfs 8 ,
 .Xr rump_udf 8 ,
-.Xr umount 8 ,
-.Xr automount 8 ,
-.Xr automountd 8 ,
-.Xr autounmountd 8
+.Xr umount 8
 .Sh HISTORY
 A
 .Nm

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 08:24:42 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1295 -r1.1296 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1294 -r1.1295 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 08:17:28 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
- s/MMC/eMMC/ for Intel 0x0f14 (Bay Trail)
- Add Atom E3800 (Bay Trail) eMMC 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.1302 -r1.1303 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1302 src/sys/dev/pci/pcidevs:1.1303
--- src/sys/dev/pci/pcidevs:1.1302	Mon Dec 18 07:57:36 2017
+++ src/sys/dev/pci/pcidevs	Tue Jan  9 08:17:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1302 2017/12/18 07:57:36 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1303 2018/01/09 08:17:27 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2901,7 +2901,7 @@ product INTEL BAYTRAIL_SIO2_UART1 0x0f0a
 product INTEL BAYTRAIL_SIO2_UART2 0x0f0c Bay Trail Serial IO (HSUART)
 product INTEL BAYTRAIL_SIO2_SPI	0x0f0e	Bay Trail Serial IO (SPI)
 product INTEL BAYTRAIL_PCU_SMB	0x0f12	Bay Trail PCU SMBus
-product INTEL BAYTRAIL_SCC_MMC	0x0f14	Bay Trail Storage Control Cluster(MMC)
+product INTEL BAYTRAIL_SCC_MMC	0x0f14	Bay Trail Storage Control Cluster(eMMC)
 product INTEL BAYTRAIL_SCC_SDIO	0x0f15	Bay Trail Storage Control Cluster(SDIO)
 product INTEL BAYTRAIL_SCC	0x0f16	Bay Trail Storage Control Cluster(SD)
 product INTEL BAYTRAIL_TXE	0x0f18	Bay Trail Trusted Execution Engine
@@ -2928,6 +2928,7 @@ product INTEL BAYTRAIL_PCIE_1	0x0f48	Bay
 product INTEL BAYTRAIL_PCIE_2	0x0f4a	Bay Trail PCIE Root Port
 product INTEL BAYTRAIL_PCIE_3	0x0f4c	Bay Trail PCIE Root Port
 product INTEL BAYTRAIL_PCIE_4	0x0f4e	Bay Trail PCIE Root Port
+product INTEL BAYTRAIL_SCC_MMC2	0x0f50	Bay Trail Storage Control Cluster(eMMC 4.5)
 product INTEL 82542		0x1000	i82542 Gigabit Ethernet
 product INTEL 82543GC_FIBER	0x1001	i82453GC 1000baseX Ethernet
 product INTEL MODEM56		0x1002	56k Modem

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan  9 08:17:28 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
- s/MMC/eMMC/ for Intel 0x0f14 (Bay Trail)
- Add Atom E3800 (Bay Trail) eMMC 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.1302 -r1.1303 src/sys/dev/pci/pcidevs

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