CVS commit: src/distrib

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Dec 14 06:29:15 UTC 2017

Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
src/distrib/utils/embedded/conf: rpi_inst.conf

Log Message:
Build fix (really this time) from Harold Gutch


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/evbarm/instkernel/instkernel/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/rpi_inst.conf

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

Modified files:

Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.29 src/distrib/evbarm/instkernel/instkernel/Makefile:1.30
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.29	Wed Dec 13 11:37:37 2017
+++ src/distrib/evbarm/instkernel/instkernel/Makefile	Thu Dec 14 06:29:15 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2017/12/13 11:37:37 skrll Exp $
+#	$NetBSD: Makefile,v 1.30 2017/12/14 06:29:15 skrll Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,11 +11,10 @@ SSHRAMDISK=	${SSHRAMDISKDIR}/sshramdisk.
 .include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
 
 MDSETTARGETS=
-MDSET_SUFFIXES.-=	srec create-srec  bin create-bin
 .for i in ${BUILD_KERNELS:M*_INSTALL}
 .if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
-MDSETTARGETS+=		${i}	${SSHRAMDISK}	-
-MDSET_SUFFIXES.${i}=	img create-img
+MDSETTARGETS+=		${i}	${SSHRAMDISK}	netbsd-${i}
+MDSET_SUFFIXES.netbsd-${i}=	bin create-bin  img create-img
 .else
 MDSETTARGETS+=		${i}	${RAMDISK}	-
 .endif
@@ -23,6 +22,7 @@ MDSETTARGETS+=		${i}	${RAMDISK}	-
 
 MDSET_RELEASEDIR=	installation/instkernel
 
+MDSET_SUFFIXES.-=	srec create-srec  bin create-bin
 create-srec=		${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
 create-bin=		${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
 create-img=	\

Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.10 src/distrib/utils/embedded/conf/rpi_inst.conf:1.11
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.10	Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	Thu Dec 14 06:29:15 2017
@@ -1,9 +1,10 @@
-# $NetBSD: rpi_inst.conf,v 1.10 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: rpi_inst.conf,v 1.11 2017/12/14 06:29:15 skrll Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
 board=rpi_inst
-kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
+kerneldir=${KERNOBJDIR}/RPI_INSTALL
+kernel=$kerneldir/netbsd-RPI_INSTALL.img
 
 . ${DIR}/conf/evbarm.conf
 
@@ -75,6 +76,7 @@ make_fstab() {
 
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
+dtbs="$(${MAKE} -C ${kerneldir} -v DTB)"
 
 populate() {
 	cat > ${mnt}/boot/cmdline.txt << EOF
@@ -110,6 +112,10 @@ EOF
 			echo " $f"
 			cp ${firmwaredir}/${f} . || exit 1
 		done
+		for f in ${dtbs}; do
+			echo " $f"
+			cp ${kerneldir}/${f} . || exit 1
+		done
 	) || fail "Copy of firmware to ${mnt}/boot failed"
 
 }

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 14 05:49:00 UTC 2017

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

Log Message:
Fix a bug that tries to psref_acquire ifa with a psref used before

This fixes ATF tests that started to fail by a recent change to psref.


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/net/rtsock.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/rtsock.c
diff -u src/sys/net/rtsock.c:1.233 src/sys/net/rtsock.c:1.234
--- src/sys/net/rtsock.c:1.233	Thu Dec 14 05:47:45 2017
+++ src/sys/net/rtsock.c	Thu Dec 14 05:48:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.233 2017/12/14 05:47:45 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.234 2017/12/14 05:48:59 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.233 2017/12/14 05:47:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.234 2017/12/14 05:48:59 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -622,6 +622,7 @@ route_output_get_ifa(const struct rt_add
 		if (info.rti_info[RTAX_IFA] == NULL &&
 		info.rti_info[RTAX_GATEWAY] == NULL)
 			goto next;
+		ifa_release(ifa, psref);
 		if (info.rti_info[RTAX_IFA] == NULL) {
 			/* route change   -ifp  */
 			ifa = ifaof_ifpforaddr_psref(info.rti_info[RTAX_GATEWAY],

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 14 05:47:45 UTC 2017

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

Log Message:
Protect ifp returned from route_output_get_ifa surely

An ifp returned from route_output_get_ifa was supposed to be protected
by a returned ifa; if the ifa belongs to ifp, holding the ifa prevents
the ifp from being freed. However route_output_get_ifa can return an ifp
to which a returned ifa doesn't belong. So we need to take a reference
to a returning ifp separately.


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/net/rtsock.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/rtsock.c
diff -u src/sys/net/rtsock.c:1.232 src/sys/net/rtsock.c:1.233
--- src/sys/net/rtsock.c:1.232	Thu Dec 14 05:43:14 2017
+++ src/sys/net/rtsock.c	Thu Dec 14 05:47:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.232 2017/12/14 05:43:14 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.233 2017/12/14 05:47:45 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.232 2017/12/14 05:43:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.233 2017/12/14 05:47:45 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -608,7 +608,7 @@ route_output_report(struct rtentry *rt, 
 
 static struct ifaddr * __noinline
 route_output_get_ifa(const struct rt_addrinfo info, const struct rtentry *rt,
-struct ifnet **ifp, struct psref *psref)
+struct ifnet **ifp, struct psref *psref_ifp, struct psref *psref)
 {
 	struct ifaddr *ifa = NULL;
 
@@ -618,6 +618,7 @@ route_output_get_ifa(const struct rt_add
 		if (ifa == NULL)
 			goto next;
 		*ifp = ifa->ifa_ifp;
+		if_acquire(*ifp, psref_ifp);
 		if (info.rti_info[RTAX_IFA] == NULL &&
 		info.rti_info[RTAX_GATEWAY] == NULL)
 			goto next;
@@ -648,8 +649,14 @@ next:
 		info.rti_info[RTAX_GATEWAY], psref);
 	}
 out:
-	if (ifa != NULL && *ifp == NULL)
+	if (ifa != NULL && *ifp == NULL) {
 		*ifp = ifa->ifa_ifp;
+		if_acquire(*ifp, psref_ifp);
+	}
+	if (ifa == NULL && *ifp != NULL) {
+		if_put(*ifp, psref_ifp);
+		*ifp = NULL;
+	}
 	return ifa;
 }
 
@@ -660,7 +667,7 @@ route_output_change(struct rtentry *rt, 
 	int error = 0;
 	struct ifnet *ifp = NULL, *new_ifp;
 	struct ifaddr *ifa = NULL, *new_ifa;
-	struct psref psref_ifa, psref_new_ifa, psref_ifp;
+	struct psref psref_ifa, psref_new_ifa, psref_ifp, psref_new_ifp;
 	bool newgw, ifp_changed = false;
 
 	/*
@@ -674,6 +681,7 @@ route_output_change(struct rtentry *rt, 
 	if (newgw || info->rti_info[RTAX_IFP] != NULL ||
 	info->rti_info[RTAX_IFA] != NULL) {
 		ifp = rt_getifp(info, _ifp);
+		/* info refers ifp so we need to keep a reference */
 		ifa = rt_getifa(info, _ifa);
 		if (ifa == NULL) {
 			error = ENETUNREACH;
@@ -698,7 +706,8 @@ route_output_change(struct rtentry *rt, 
 	 * flags may also be different; ifp may be specified
 	 * by ll sockaddr when protocol address is ambiguous
 	 */
-	new_ifa = route_output_get_ifa(*info, rt, _ifp, _new_ifa);
+	new_ifa = route_output_get_ifa(*info, rt, _ifp, _new_ifp,
+	_new_ifa);
 	if (new_ifa != NULL) {
 		ifa_release(ifa, _ifa);
 		ifa = new_ifa;
@@ -736,6 +745,7 @@ route_output_change(struct rtentry *rt, 
 	(void)ifp_changed; /* XXX gcc */
 #endif
 out:
+	if_put(new_ifp, _new_ifp);
 	if_put(ifp, _ifp);
 
 	return error;

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 14 05:46:54 UTC 2017

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

Log Message:
Reorder some destruction routines in if_detach

- Destroy if_ioctl_lock at the end of the if_detach because it's used in various
  destruction routines
- Move psref_target_destroy after pr_purgeif because we want to use psref in
  pr_purgeif (otherwise destruction procedures can be tricky)


To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 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.413 src/sys/net/if.c:1.414
--- src/sys/net/if.c:1.413	Mon Dec 11 03:29:20 2017
+++ src/sys/net/if.c	Thu Dec 14 05:46:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.413 2017/12/11 03:29:20 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.414 2017/12/14 05:46:54 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.413 2017/12/11 03:29:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.414 2017/12/14 05:46:54 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1317,17 +1317,6 @@ if_detach(struct ifnet *ifp)
 	if_deactivate(ifp);
 	IFNET_UNLOCK(ifp);
 
-	IFNET_GLOBAL_LOCK();
-	ifindex2ifnet[ifp->if_index] = NULL;
-	TAILQ_REMOVE(_list, ifp, if_list);
-	IFNET_WRITER_REMOVE(ifp);
-	pserialize_perform(ifnet_psz);
-	IFNET_GLOBAL_UNLOCK();
-
-	/* Wait for all readers to drain before freeing.  */
-	psref_target_destroy(>if_psref, ifnet_psref_class);
-	PSLIST_ENTRY_DESTROY(ifp, if_pslist_entry);
-
 	if (ifp->if_slowtimo != NULL && ifp->if_slowtimo_ch != NULL) {
 		ifp->if_slowtimo = NULL;
 		callout_halt(ifp->if_slowtimo_ch, NULL);
@@ -1356,10 +1345,6 @@ if_detach(struct ifnet *ifp)
 		carp_ifdetach(ifp);
 #endif
 
-	/* carp_ifdetach still uses the lock */
-	mutex_obj_free(ifp->if_ioctl_lock);
-	ifp->if_ioctl_lock = NULL;
-
 	/*
 	 * Rip all the addresses off the interface.  This should make
 	 * all of the routes go away.
@@ -1457,6 +1442,17 @@ again:
 		}
 	}
 
+	/* Wait for all readers to drain before freeing.  */
+	IFNET_GLOBAL_LOCK();
+	ifindex2ifnet[ifp->if_index] = NULL;
+	TAILQ_REMOVE(_list, ifp, if_list);
+	IFNET_WRITER_REMOVE(ifp);
+	pserialize_perform(ifnet_psz);
+	IFNET_GLOBAL_UNLOCK();
+
+	psref_target_destroy(>if_psref, ifnet_psref_class);
+	PSLIST_ENTRY_DESTROY(ifp, if_pslist_entry);
+
 	pfil_run_ifhooks(if_pfil, PFIL_IFNET_DETACH, ifp);
 	(void)pfil_head_destroy(ifp->if_pfil);
 
@@ -1503,6 +1499,9 @@ again:
 		ifp->if_percpuq = NULL;
 	}
 
+	mutex_obj_free(ifp->if_ioctl_lock);
+	ifp->if_ioctl_lock = NULL;
+
 	splx(s);
 
 #ifdef IFAREF_DEBUG

CVS commit: src/sys/kern

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 14 05:45:55 UTC 2017

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

Log Message:
Improve debugging functions

- Make psref_check_duplication check just if a given psref is on the list
  - It checked both psref and target
  - Suggested by riastradh@ some time ago
- Add psref_check_existence that checks a releasing psref is surely on the list


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/kern/subr_psref.c

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

Modified files:

Index: src/sys/kern/subr_psref.c
diff -u src/sys/kern/subr_psref.c:1.8 src/sys/kern/subr_psref.c:1.9
--- src/sys/kern/subr_psref.c:1.8	Mon Dec 11 02:33:17 2017
+++ src/sys/kern/subr_psref.c	Thu Dec 14 05:45:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_psref.c,v 1.8 2017/12/11 02:33:17 knakahara Exp $	*/
+/*	$NetBSD: subr_psref.c,v 1.9 2017/12/14 05:45:55 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.8 2017/12/11 02:33:17 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.9 2017/12/14 05:45:55 ozaki-r Exp $");
 
 #include 
 #include 
@@ -187,22 +187,40 @@ psref_target_init(struct psref_target *t
 }
 
 #ifdef DEBUG
+static bool
+psref_exist(struct psref_cpu *pcpu, struct psref *psref)
+{
+	struct psref *_psref;
+
+	SLIST_FOREACH(_psref, >pcpu_head, psref_entry) {
+		if (_psref == psref)
+			return true;
+	}
+	return false;
+}
+
 static void
 psref_check_duplication(struct psref_cpu *pcpu, struct psref *psref,
 const struct psref_target *target)
 {
 	bool found = false;
-	struct psref *_psref;
 
-	SLIST_FOREACH(_psref, >pcpu_head, psref_entry) {
-		if (_psref == psref &&
-		_psref->psref_target == target) {
-			found = true;
-			break;
-		}
-	}
+	found = psref_exist(pcpu, psref);
 	if (found) {
-		panic("trying to acquire a target twice with the same psref: "
+		panic("The psref is already in the list (acquiring twice?): "
+		"psref=%p target=%p", psref, target);
+	}
+}
+
+static void
+psref_check_existence(struct psref_cpu *pcpu, struct psref *psref,
+const struct psref_target *target)
+{
+	bool found = false;
+
+	found = psref_exist(pcpu, psref);
+	if (!found) {
+		panic("The psref isn't in the list (releasing unused psref?): "
 		"psref=%p target=%p", psref, target);
 	}
 }
@@ -304,6 +322,10 @@ psref_release(struct psref *psref, const
 	 */
 	s = splraiseipl(class->prc_iplcookie);
 	pcpu = percpu_getref(class->prc_percpu);
+#ifdef DEBUG
+	/* Sanity-check if the target is surely acquired before.  */
+	psref_check_existence(pcpu, psref, target);
+#endif
 	SLIST_REMOVE(>pcpu_head, psref, psref, psref_entry);
 	percpu_putref(class->prc_percpu);
 	splx(s);

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 14 05:43:14 UTC 2017

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

Log Message:
Spinkle __noinline to some non-performance-sensitive functions for debugging


To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/sys/net/rtsock.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/rtsock.c
diff -u src/sys/net/rtsock.c:1.231 src/sys/net/rtsock.c:1.232
--- src/sys/net/rtsock.c:1.231	Sun Nov 19 18:49:51 2017
+++ src/sys/net/rtsock.c	Thu Dec 14 05:43:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.231 2017/11/19 18:49:51 christos Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.232 2017/12/14 05:43:14 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.231 2017/11/19 18:49:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.232 2017/12/14 05:43:14 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -495,7 +495,7 @@ COMPATNAME(route_purgeif)(struct socket 
 }
 
 #if defined(INET) || defined(INET6)
-static int
+static int __noinline
 route_get_sdl_index(struct rt_addrinfo *info, int *sdl_index)
 {
 	struct rtentry *nrt;
@@ -515,7 +515,7 @@ route_get_sdl_index(struct rt_addrinfo *
 }
 #endif
 
-static void
+static void __noinline
 route_get_sdl(const struct ifnet *ifp, const struct sockaddr *dst,
 struct sockaddr_dl *sdl, int *flags)
 {
@@ -551,7 +551,7 @@ route_get_sdl(const struct ifnet *ifp, c
 	}
 }
 
-static int
+static int __noinline
 route_output_report(struct rtentry *rt, struct rt_addrinfo *info,
 struct rt_xmsghdr *rtm, struct rt_xmsghdr **new_rtm)
 {
@@ -606,7 +606,7 @@ route_output_report(struct rtentry *rt, 
 	return 0;
 }
 
-static struct ifaddr *
+static struct ifaddr * __noinline
 route_output_get_ifa(const struct rt_addrinfo info, const struct rtentry *rt,
 struct ifnet **ifp, struct psref *psref)
 {
@@ -653,7 +653,7 @@ out:
 	return ifa;
 }
 
-static int
+static int __noinline
 route_output_change(struct rtentry *rt, struct rt_addrinfo *info,
 struct rt_xmsghdr *rtm)
 {

CVS commit: src/share/dict

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Dec 14 00:10:34 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Add missing words beginning with 'm' from FreeBSD's copy of src/share/dict/web2.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/share/dict/web2

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

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.47 src/share/dict/web2:1.48
--- src/share/dict/web2:1.47	Wed Dec 13 23:42:04 2017
+++ src/share/dict/web2	Thu Dec 14 00:10:34 2017
@@ -109505,6 +109505,7 @@ Ma
 ma
 maam
 maamselle
+Maarten
 Mab
 Maba
 Mabel
@@ -110191,6 +110192,7 @@ magnolia
 Magnoliaceae
 magnoliaceous
 magnum
+Magnus
 Magog
 magot
 magpie
@@ -110204,6 +110206,7 @@ Magyaran
 Magyarism
 Magyarization
 Magyarize
+Mah
 maha
 mahaleb
 mahalla
@@ -110229,9 +110232,11 @@ Mahdian
 Mahdiship
 Mahdism
 Mahdist
+Mahesh
 Mahi
 Mahican
 mahmal
+Mahmoud
 mahmudi
 mahoe
 mahoganize
@@ -110375,6 +110380,7 @@ majo
 majolica
 majolist
 majoon
+Major
 major
 majorate
 majoration
@@ -110434,6 +110440,7 @@ malaceous
 malachite
 malacia
 Malaclemys
+Malaclypse
 Malacobdella
 Malacocotylea
 malacoderm
@@ -110547,6 +110554,7 @@ malbehavior
 malbrouck
 malchite
 Malchus
+Malcolm
 malconceived
 malconduct
 malconformation
@@ -110710,6 +110718,7 @@ malloseismic
 Mallotus
 mallow
 mallowwort
+Malloy
 mallum
 mallus
 malm
@@ -110906,6 +110915,7 @@ manatoid
 Manatus
 manavel
 manavelins
+Manavendra
 manbird
 manbot
 manche
@@ -67,6 +77,7 @@ maniu
 Manius
 Maniva
 manjak
+Manjeri
 mank
 mankeeper
 mankin
@@ -83,6 +94,7 @@ manlily
 manliness
 manling
 manly
+Mann
 manna
 mannan
 mannequin
@@ -111225,11 +111237,13 @@ mannoketoheptose
 mannonic
 mannosan
 mannose
+Manny
 manny
 mano
 Manobo
 manoc
 manograph
+Manolis
 manometer
 manometric
 manometrical
@@ -111429,6 +111443,7 @@ Maquiritare
 maquis
 Mar
 mar
+Mara
 marabotin
 marabou
 Marabout
@@ -111493,12 +111508,14 @@ marbling
 marblish
 marbly
 marbrinus
+Marc
 marc
 Marcan
 marcantant
 marcasite
 marcasitic
 marcasitical
+Marcel
 marcel
 marceline
 Marcella
@@ -111526,6 +111543,7 @@ marchland
 marchman
 Marchmont
 marchpane
+Marci
 Marcia
 marcid
 Marcionism
@@ -111535,6 +111553,7 @@ Marcionitic
 Marcionitish
 Marcionitism
 Marcite
+Marco
 marco
 Marcobrunner
 Marcomanni
@@ -111544,6 +111563,7 @@ marconigram
 marconigraph
 marconigraphy
 marcor
+Marcos
 Marcosian
 marcottage
 mardy
@@ -111552,6 +111572,7 @@ mareblob
 Mareca
 marechal
 Marehan
+Marek
 marekanite
 maremma
 maremmatic
@@ -111610,6 +111631,7 @@ margravely
 margravial
 margraviate
 margravine
+Marguerite
 marguerite
 marhala
 Marheshvan
@@ -111626,6 +111648,7 @@ Marianolatrist
 Marianolatry
 maricolous
 marid
+Marie
 mariengroschen
 marigenous
 marigold
@@ -111635,6 +111658,7 @@ marigraphic
 marijuana
 marikina
 Marilla
+Marilyn
 marimba
 marimonda
 marina
@@ -111646,6 +111670,7 @@ mariner
 marinheiro
 marinist
 marinorama
+Mario
 mariola
 Mariolater
 Mariolatrous
@@ -111653,6 +111678,7 @@ Mariolatry
 Mariology
 Marion
 marionette
+Mariou
 Mariposan
 mariposite
 maris
@@ -111707,12 +111733,15 @@ marksmanly
 marksmanship
 markswoman
 markup
+Markus
 markweed
 markworthy
 marl
+Marla
 marlaceous
 marlberry
 marled
+Marlena
 marler
 marli
 marlin
@@ -111754,6 +111783,7 @@ marmose
 marmoset
 marmot
 Marmota
+Marnix
 maro
 marocain
 marok
@@ -111817,7 +111847,9 @@ Mars
 Marsala
 Marsdenia
 marseilles
+Marsh
 marsh
+Marsha
 marshal
 marshalate
 marshalcy
@@ -111908,6 +111940,7 @@ Martius
 martlet
 Martu
 Marty
+Martyn
 Martynia
 Martyniaceae
 martyniaceous
@@ -111937,6 +111970,7 @@ marvelously
 marvelousness
 marvelry
 marver
+Marvin
 Marwari
 Marxian
 Marxianism
@@ -111954,6 +111988,8 @@ marzipan
 mas
 masa
 Masai
+Masanao
+Masanobu
 masaridid
 Masarididae
 Masaridinae
@@ -112015,6 +112051,7 @@ maslin
 masochism
 masochist
 masochistic
+Mason
 mason
 masoned
 masoner
@@ -112037,6 +112074,7 @@ masquerader
 Mass
 mass
 massa
+Massachusetts
 massacre
 massacrer
 massage
@@ -112200,6 +112238,7 @@ masty
 masu
 Masulipatam
 masurium
+Mat
 mat
 Matabele
 Matacan
@@ -112380,8 +112419,10 @@ matronly
 matronship
 matronymic
 matross
+Mats
 matsu
 matsuri
+Matt
 matta
 mattamore
 Mattapony
@@ -112401,7 +112442,10 @@ mattery
 Matteuccia
 Matthaean
 Matthew
+Matthias
+Matthieu
 Matthiola
+Matti
 matti
 matting
 mattock
@@ -112466,6 +112510,7 @@ maundful
 maundy
 maunge
 Maurandia
+Maureen
 Mauretanian
 Mauri
 Maurice
@@ -112757,6 +112802,7 @@ Mecca
 Meccan
 Meccano
 Meccawee
+Mechael
 mechanal
 mechanality
 mechanalize
@@ -113031,6 +113077,7 @@ meebos
 meece
 meed
 meedless
+Meehan
 meek
 meeken
 meekhearted
@@ -113039,6 +113086,7 @@ meekling
 meekly
 meekness
 Meekoceras
+Meeks
 meered
 meerkat
 meerschaum
@@ -113254,6 +113302,7 @@ mehari
 meharist
 Mehelya
 mehmandar
+Mehrdad
 mehtar
 mehtarship
 Meibomia
@@ -113456,6 +113505,7 @@ melilitite
 melilot
 Melilotus
 

CVS commit: src/share/dict

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Dec 13 23:42:04 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Add missing words beginning with 'l' and 'm' from FreeBSD's copy of 
src/share/dict/web2.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/share/dict/web2

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

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.46 src/share/dict/web2:1.47
--- src/share/dict/web2:1.46	Wed Dec 13 22:39:10 2017
+++ src/share/dict/web2	Wed Dec 13 23:42:04 2017
@@ -100974,7 +100974,7 @@ Kafiri
 kafirin
 kafiz
 Kafka
-kafkaesque
+Kafkaesque
 kafta
 kago
 kagu
@@ -101012,6 +101012,7 @@ kaitaka
 Kaithi
 kaiwhiria
 kaiwi
+Kaj
 Kajar
 kajawah
 kajugaru
@@ -101039,6 +101040,7 @@ Kalanchoe
 Kalandariyah
 Kalang
 Kalapooian
+kalashnikov
 kalasie
 Kaldani
 kale
@@ -10,12 +101113,14 @@ Kamchatkan
 kame
 kameeldoorn
 kameelthorn
+Kamel
 kamelaukion
 kamerad
 kamias
 kamichi
 kamik
 kamikaze
+Kamiya
 kammalan
 kammererite
 kamperite
@@ -101162,6 +101166,7 @@ Kansan
 kantele
 kanteletar
 kanten
+Kanthan
 Kantian
 Kantianism
 Kantism
@@ -101210,7 +101215,9 @@ karela
 Karelian
 Karen
 Karharbari
+Kari
 karite
+Karl
 Karling
 Karluk
 karma
@@ -101363,6 +101370,7 @@ kathenotheism
 Kathleen
 kathodic
 Kathopanishad
+Kathryn
 Kathy
 Katie
 Katik
@@ -101402,9 +101410,11 @@ Kayasth
 Kayastha
 kayles
 kayo
+Kayvan
 Kazak
 kazi
 kazoo
+Kazuhiro
 kea
 keach
 keacorn
@@ -101429,6 +101439,7 @@ kedger
 kedgeree
 kedlock
 Kedushshah
+Kee
 keech
 keek
 keeker
@@ -101468,6 +101479,7 @@ keepsake
 keepsaky
 keepworthy
 keerogue
+Kees
 keeshond
 keest
 keet
@@ -101488,6 +101500,7 @@ kehoeite
 Keid
 keilhauite
 keita
+Keith
 keitloa
 Kekchi
 kekotene
@@ -101507,6 +101520,7 @@ kell
 kella
 kellion
 kellupweed
+Kelly
 kelly
 keloid
 keloidal
@@ -101521,8 +101535,10 @@ kelt
 kelter
 Keltoi
 kelty
+Kelvin
 kelvin
 kelyphite
+Kemal
 Kemalism
 Kemalist
 kemb
@@ -101533,6 +101549,7 @@ kemple
 kempster
 kempt
 kempy
+Ken
 ken
 kenaf
 Kenai
@@ -101545,6 +101562,7 @@ Kenelm
 Kenipsim
 kenlore
 kenmark
+Kenn
 Kennebec
 kennebecker
 kennebunker
@@ -101576,6 +101594,7 @@ Kensitite
 kenspac
 kenspeck
 kenspeckle
+Kent
 kent
 kentallenite
 Kentia
@@ -101583,6 +101602,7 @@ Kenticism
 Kentish
 Kentishman
 kentledge
+Kenton
 kentrogon
 kentrolite
 Kentuckian
@@ -101699,6 +101719,7 @@ kernos
 kerogen
 kerosene
 kerplunk
+Kerri
 Kerria
 kerrie
 kerrikerri
@@ -101782,9 +101803,12 @@ keup
 Keuper
 keurboom
 kevalin
+Kevan
 kevel
 kevelhead
+Kevin
 kevutzah
+Kevyn
 Keweenawan
 keweenawite
 kewpie
@@ -101959,6 +101983,7 @@ Kieffer
 kiekie
 kiel
 kier
+Kieran
 kieselguhr
 kieserite
 kiestless
@@ -101968,7 +101993,9 @@ kikar
 Kikatsik
 kikawaeo
 kike
+Kiki
 kiki
+Kikki
 Kikongo
 kiku
 kikuel
@@ -102049,9 +102076,11 @@ kim
 kimbang
 kimberlin
 kimberlite
+Kimberly
 Kimbundu
 Kimeridgian
 kimigayo
+Kimmo
 kimnel
 kimono
 kimonoed
@@ -102062,6 +102091,7 @@ kinaesthesis
 kinah
 kinase
 kinbote
+Kinch
 kinch
 kinchin
 kinchinmort
@@ -102137,6 +102167,7 @@ kinetophonograph
 kinetoplast
 kinetoscope
 kinetoscopic
+King
 king
 kingbird
 kingbolt
@@ -102233,6 +102264,7 @@ Kirghizean
 kiri
 Kirillitsa
 kirimon
+Kirk
 kirk
 kirker
 kirkify
@@ -102248,6 +102280,7 @@ kirmew
 kirn
 kirombo
 kirsch
+Kirsten
 Kirsty
 kirtle
 kirtled
@@ -102367,6 +102400,8 @@ Klansman
 Klanswoman
 klaprotholite
 Klaskino
+Klaudia
+Klaus
 klavern
 Klaxon
 klaxon
@@ -102424,6 +102459,7 @@ knap
 knapbottle
 knape
 knappan
+Knapper
 knapper
 knappish
 knappishly
@@ -102620,6 +102656,7 @@ knuckler
 knuckling
 knuckly
 knuclesome
+Knudsen
 knur
 knurl
 knurled
@@ -102627,6 +102664,7 @@ knurling
 knurly
 Knut
 knut
+Knute
 knutty
 knyaz
 knyazi
@@ -102736,6 +102774,7 @@ kolinsky
 Kolis
 kolkhos
 kolkhoz
+Kolkka
 kollast
 kollaster
 koller
@@ -102782,7 +102821,9 @@ koniscope
 konjak
 Konkani
 Konomihu
+Konrad
 konstantin
+Konstantinos
 kontakion
 Konyak
 kooka
@@ -102854,6 +102895,7 @@ korrigum
 korumburra
 koruna
 Korwa
+Kory
 Koryak
 korymboi
 korymbos
@@ -102945,15 +102987,21 @@ Krigia
 krimmer
 krina
 Kriophoros
+Kris
 Krishna
 Krishnaism
 Krishnaist
 Krishnaite
 Krishnaitic
+Kristen
+Kristi
+Kristian
+Kristin
 Kristinaux
 krisuvigite
 kritarchy
 Krithia
+Kriton
 kritrima
 krobyloi
 krobylos
@@ -102988,6 +103036,7 @@ kryptocyanine
 kryptol
 kryptomere
 krypton
+Krzysztof
 Kshatriya
 Kshatriyahood
 Kua
@@ -103033,6 +103082,7 @@ kulak
 kulakism
 Kulanapan
 kulang
+Kuldip
 Kuli
 kulimit
 kulkarni
@@ -103081,6 +103131,7 @@ kurmburra
 Kurmi
 Kuroshio
 kurrajong
+Kurt
 kurtosis
 Kuruba
 Kurukh
@@ -103103,6 +103154,7 @@ kuskus
 Kuskwogmiut
 Kustenau
 kusti
+Kusum
 kusum
 kutcha
 Kutchin
@@ -103132,9 +103184,11 @@ Kybele
 Kyklopes
 Kyklops
 kyl
+Kyle
 kyle
 kylite
 kylix
+Kylo
 kymation
 kymatology
 kymbalon
@@ -103152,6 +103206,8 @@ Kyrie
 kyrine
 kyschtymite
 kyte
+Kyu
+Kyung
 Kyurin
 Kyurinish
 L
@@ -103948,6 +104004,7 @@ Lamus
 

CVS commit: src/share/dict

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Dec 13 22:39:10 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Add missing words beginning with 'h' to 'j' from FreeBSD's copy of 
src/share/dict/web2.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/share/dict/web2

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

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.45 src/share/dict/web2:1.46
--- src/share/dict/web2:1.45	Sun Nov 26 16:32:10 2017
+++ src/share/dict/web2	Wed Dec 13 22:39:10 2017
@@ -81816,6 +81816,7 @@ hakim
 Hakka
 hako
 haku
+Hal
 hala
 halakah
 halakic
@@ -82282,6 +82283,7 @@ hanif
 hanifism
 hanifite
 hanifiya
+Hank
 hank
 hanker
 hankerer
@@ -82300,6 +82302,7 @@ Hano
 Hanoverian
 Hanoverianize
 Hanoverize
+Hans
 hansa
 Hansard
 Hansardization
@@ -82533,6 +82536,7 @@ harminic
 harmless
 harmlessly
 harmlessness
+Harmon
 harmonia
 harmoniacal
 harmonial
@@ -82573,6 +82577,7 @@ harness
 harnesser
 harnessry
 harnpan
+Harold
 harp
 Harpa
 harpago
@@ -82610,6 +82615,7 @@ harr
 harrateen
 harridan
 harrier
+Harris
 Harrisia
 harrisite
 Harrovian
@@ -82619,6 +82625,7 @@ harrowing
 harrowingly
 harrowingness
 harrowment
+Harry
 harry
 harsh
 harshen
@@ -82635,6 +82642,7 @@ hartin
 hartite
 Hartleian
 Hartleyan
+Hartmann
 Hartmannia
 Hartogia
 hartshorn
@@ -82648,6 +82656,7 @@ haruspication
 haruspice
 haruspices
 haruspicy
+Harv
 Harvard
 Harvardian
 Harvardize
@@ -82960,6 +82969,7 @@ hazardously
 hazardousness
 hazardry
 haze
+Hazel
 hazel
 hazeled
 hazeless
@@ -83212,6 +83222,7 @@ heathenize
 heathenness
 heathenry
 heathenship
+Heather
 heather
 heathered
 heatheriness
@@ -83476,6 +83487,7 @@ hegumene
 Hehe
 hei
 heiau
+Heidi
 heifer
 heiferhood
 heigh
@@ -83487,12 +83499,15 @@ heii
 Heikum
 Heiltsuk
 heimin
+Hein
 Heinesque
 Heinie
 heinous
 heinously
 heinousness
+Heinrich
 heintzite
+Heinz
 heir
 heirdom
 heiress
@@ -83523,6 +83538,7 @@ helenioid
 Helenium
 Helenus
 helepole
+Helge
 heliacal
 heliacally
 Heliaea
@@ -84658,6 +84674,7 @@ heraldry
 heraldship
 herapathite
 Herat
+Herb
 herb
 herbaceous
 herbaceously
@@ -84828,6 +84845,7 @@ herling
 herma
 hermaean
 hermaic
+Herman
 hermaphrodite
 hermaphroditic
 hermaphroditical
@@ -84986,6 +85004,7 @@ hertzian
 Heruli
 Herulian
 Hervati
+Herve
 Herzegovinian
 Hesiodic
 Hesione
@@ -85696,6 +85715,7 @@ hield
 hielmite
 hiemal
 hiemation
+Hienz
 Hieracian
 Hieracium
 hieracosphinx
@@ -85843,6 +85863,7 @@ Hildegarde
 hilding
 hiliferous
 hill
+Hillary
 hillberry
 hillbilly
 hillculture
@@ -85876,6 +85897,7 @@ Himalaya
 Himalayan
 Himantopus
 himation
+Himawan
 himp
 himself
 himward
@@ -86099,7 +86121,10 @@ hirmologion
 hirmos
 Hirneola
 hiro
+hirofumi
 hirondelle
+Hirotoshi
+Hiroyuki
 hirple
 hirrient
 hirse
@@ -86289,6 +86314,7 @@ hitherward
 Hitlerism
 Hitlerite
 hitless
+Hitoshi
 hittable
 hitter
 Hittite
@@ -86458,6 +86484,7 @@ hogyard
 Hohe
 Hohenzollern
 Hohenzollernism
+Hohn
 Hohokam
 hoi
 hoick
@@ -86551,6 +86578,7 @@ hollowheartedness
 hollowly
 hollowness
 holluschick
+Holly
 holly
 hollyhock
 Hollywood
@@ -87149,6 +87177,7 @@ homuncle
 homuncular
 homunculus
 homy
+Hon
 honcho
 honda
 hondo
@@ -87233,6 +87262,7 @@ honorsman
 honorworthy
 hontish
 hontous
+Honzo
 hooch
 hoochinoo
 hood
@@ -87618,6 +87648,7 @@ horsify
 horsily
 horsiness
 horsing
+Horst
 horst
 horsy
 horsyism
@@ -87731,6 +87762,7 @@ hotmouthed
 hotness
 hotspur
 hotspurred
+Hotta
 Hottentot
 Hottentotese
 Hottentotic
@@ -87900,6 +87932,8 @@ hoyle
 hoyman
 Hrimfaxi
 Hrothgar
+Hsi
+Hsuan
 Hu
 huaca
 huaco
@@ -87909,6 +87943,7 @@ huantajayite
 huaracho
 Huari
 huarizo
+Huashi
 Huastec
 Huastecan
 Huave
@@ -87969,6 +88004,7 @@ hueful
 hueless
 huelessness
 huer
+Huey
 huff
 huffier
 huffily
@@ -87998,6 +88034,7 @@ hugging
 huggingly
 huggle
 Hugh
+Hughes
 Hughoc
 Hugo
 Hugoesque
@@ -88006,6 +88043,7 @@ Huguenot
 Huguenotic
 Huguenotism
 huh
+Hui
 huia
 huipil
 huisache
@@ -88095,6 +88133,7 @@ humdrumminess
 humdrummish
 humdrummishness
 humdudgeon
+Hume
 Humean
 humect
 humectant
@@ -88257,6 +88296,7 @@ Hunnishness
 hunt
 huntable
 huntedly
+Hunter
 Hunterian
 hunterlike
 huntilite
@@ -88282,6 +88322,7 @@ hurds
 hure
 hureaulite
 hureek
+Hurf
 hurgila
 hurkle
 hurl
@@ -88419,6 +88460,8 @@ Huzvaresh
 huzz
 huzza
 huzzard
+Hwa
+Hy
 hyacinth
 Hyacinthia
 hyacinthian
@@ -90458,6 +90501,7 @@ iambist
 iambize
 iambographer
 iambus
+Ian
 Ianthina
 ianthine
 ianthinite
@@ -91361,10 +91405,12 @@ Ilongot
 ilot
 Ilpirra
 ilvaite
+Ilya
 Ilysanthes
 Ilysia
 Ilysiidae
 ilysioid
+Ima
 image
 imageable
 imageless
@@ -93773,6 +93819,7 @@ indorse
 indoxyl
 indoxylic
 indoxylsulphuric
+Indra
 indraft
 indraught
 indrawal
@@ -97927,6 +97974,7 @@ irenicon
 irenics
 irenicum
 Iresine
+Irfan
 Irgun
 Irgunist
 irian
@@ -98400,16 +98448,20 @@ irruptible
 irruption
 irruptive
 irruptively
+Irvin
+Irving
 Irvingesque
 Irvingiana
 Irvingism
 Irvingite
+Irwin
 

CVS commit: src/external/gpl3/gdb

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Dec 13 21:52:55 UTC 2017

Modified Files:
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/bin/gdbtui: Makefile
src/external/gpl3/gdb/lib/libgdb: Makefile

Log Message:
Improve CFLAGS definition for clang. Use more tabs.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/bin/gdbtui/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gdb/lib/libgdb/Makefile

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

Modified files:

Index: src/external/gpl3/gdb/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.14 src/external/gpl3/gdb/bin/gdb/Makefile:1.15
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.14	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/bin/gdb/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.15 2017/12/13 21:52:55 joerg Exp $
 
 NOCTF=
 .include 
@@ -89,12 +89,10 @@ DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} 
 .include 
 
 # Force c++
-HOST_CC:=   ${HOST_CXX}
-CC:=${CXX}
-CFLAGS:=${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
 ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}

Index: src/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.11 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.12
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.11	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.12 2017/12/13 21:52:55 joerg Exp $
 NOCTF=
 .include "../Makefile.inc"
 
@@ -26,12 +26,10 @@ NOMAN=		# defined
 .include 
 
 # Force c++
-HOST_CC:=   ${HOST_CXX}
-CC:=${CXX}
-CFLAGS:=${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 LIBOPCODESDIR!=   cd ${.CURDIR}/../../lib/libopcodes   && ${PRINTOBJDIR}
 LIBBFDDIR!=   cd ${.CURDIR}/../../lib/libbfd   && ${PRINTOBJDIR}

Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.18 src/external/gpl3/gdb/lib/libgdb/Makefile:1.19
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.18	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/lib/libgdb/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.19 2017/12/13 21:52:55 joerg Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -55,12 +55,10 @@ CWARNFLAGS.clang+=	-Wno-switch
 .include 
 
 # Force c++
-HOST_CC:=   ${HOST_CXX}
-CC:=${CXX}
-CFLAGS:=${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/arch ${DIST}/gdb/mi ${DIST}/gdb/cli  \
 ${DIST}/gdb/tui ${DIST}/gdb/python ${DIST}/gdb/common ${DIST}/gdb/target \

CVS commit: src/sys/arch/arm/sunxi

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Dec 13 21:37:10 UTC 2017

Modified Files:
src/sys/arch/arm/sunxi: sunxi_thermal.c

Log Message:
Fix regression introduced in r1.2


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_thermal.c

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

Modified files:

Index: src/sys/arch/arm/sunxi/sunxi_thermal.c
diff -u src/sys/arch/arm/sunxi/sunxi_thermal.c:1.3 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.3	Wed Nov  1 05:42:32 2017
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c	Wed Dec 13 21:37:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.3 2017/11/01 05:42:32 kre Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.4 2017/12/13 21:37:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.3 2017/11/01 05:42:32 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.4 2017/12/13 21:37:10 jmcneill Exp $");
 
 #include 
 #include 
@@ -552,8 +552,8 @@ sunxi_thermal_attach(device_t parent, de
 		sc->data[i].private = i;
 		sc->data[i].units = ENVSYS_STEMP;
 		sc->data[i].state = ENVSYS_SINVALID;
-		strlcpy(sc->data[1].desc, sc->conf->sensors[i].desc,
-		sizeof(sc->data[1].desc));
+		strlcpy(sc->data[i].desc, sc->conf->sensors[i].desc,
+		sizeof(sc->data[i].desc));
 		sysmon_envsys_sensor_attach(sc->sme, >data[i]);
 	}
 	sysmon_envsys_register(sc->sme);

CVS commit: src/games/fortune/datfiles

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Dec 13 21:11:27 UTC 2017

Modified Files:
src/games/fortune/datfiles: fortunes fortunes-o.real fortunes2
fortunes2-o.real

Log Message:
move offensive quotes per board@


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/games/fortune/datfiles/fortunes
cvs rdiff -u -r1.12 -r1.13 src/games/fortune/datfiles/fortunes-o.real
cvs rdiff -u -r1.61 -r1.62 src/games/fortune/datfiles/fortunes2
cvs rdiff -u -r1.17 -r1.18 src/games/fortune/datfiles/fortunes2-o.real

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

Modified files:

Index: src/games/fortune/datfiles/fortunes
diff -u src/games/fortune/datfiles/fortunes:1.70 src/games/fortune/datfiles/fortunes:1.71
--- src/games/fortune/datfiles/fortunes:1.70	Wed Dec  6 17:54:58 2017
+++ src/games/fortune/datfiles/fortunes	Wed Dec 13 21:11:27 2017
@@ -13633,11 +13633,6 @@ tied during the month of April.
 There is a natural hootchy-kootchy to a goldfish.
 		-- Walt Disney
 %
-There is a road to freedom.  Its milestones are Obedience, Endeavor,
-Honesty, Order, Cleanliness, Sobriety, Truthfulness, Sacrifice, and
-love of the Fatherland.
-		-- Adolf Hitler
-%
 There is a theory which states that if ever anyone discovers exactly
 what the Universe is for and why it is here, it will instantly
 disappear and be replaced by something even more bizarre and

Index: src/games/fortune/datfiles/fortunes-o.real
diff -u src/games/fortune/datfiles/fortunes-o.real:1.12 src/games/fortune/datfiles/fortunes-o.real:1.13
--- src/games/fortune/datfiles/fortunes-o.real:1.12	Sat Feb  7 09:59:47 2015
+++ src/games/fortune/datfiles/fortunes-o.real	Wed Dec 13 21:11:27 2017
@@ -1728,3 +1728,8 @@ deliberate speed shall this thing come t
 yourselves worthy, shall ye have your just portion -- yea, verily, like
 unto a snowball in Hell."
 		-- "The Begatting of a President"
+%
+There is a road to freedom.  Its milestones are Obedience, Endeavor, Honesty,
+Order, Cleanliness, Sobriety, Truthfulness, Sacrifice, and love of the
+Fatherland.
+-- Adolf Hitler

Index: src/games/fortune/datfiles/fortunes2
diff -u src/games/fortune/datfiles/fortunes2:1.61 src/games/fortune/datfiles/fortunes2:1.62
--- src/games/fortune/datfiles/fortunes2:1.61	Sun Nov 19 01:31:53 2017
+++ src/games/fortune/datfiles/fortunes2	Wed Dec 13 21:11:27 2017
@@ -15803,10 +15803,6 @@ question."
 		[actually, the term "bug" had even earlier usage in
 		regard to problems with radio hardware.  Ed.]
 %
-Everlasting peace will come to the world when the last man has slain
-the last but one.
-		-- Adolf Hitler
-%
 Every 4 seconds a woman has a baby.
 Our problem is to find this woman and stop her.
 %
@@ -21618,9 +21614,6 @@ I give you the man who -- the man who --
 I go on working for the same reason a hen goes on laying eggs.
 		-- H.L. Mencken
 %
-I go the way that Providence dictates.
-		-- Adolf Hitler
-%
 "I got into an elevator at work and this man followed in after me... I
 pushed '1' and he just stood there... I said 'Hi, where you going?'  He
 said, 'Phoenix.'  So I pushed Phoenix.  A few seconds later the doors
@@ -22670,12 +22663,6 @@ a little girl who won't eat her dinner o
 in his veins.
 		-- Sigmund Freud, in a letter to his fiancee
 %
-I shall give a propagandist reason for starting the war, no matter whether
-it is plausible or not.  The victor will not be asked afterwards whether
-he told the truth or not.  When starting and waging war it is not right
-that matters, but victory.
-		-- Adolf Hitler
-%
 I shot an arrow in to the air, and it stuck.
 		-- graffito in Los Angeles
 
@@ -24080,10 +24067,6 @@ If I love you, what business is it of yo
 If I love you, what business is it of yours?
 		-- Johann van Goethe
 %
-If I made peace with Russia today, I'd only attack her again tomorrow.  I
-just couldn't help myself.
-		-- Adolf Hitler
-%
 If I promised you the moon and the stars, would you believe it?
 		-- Alan Parsons Project
 %
@@ -25650,10 +25633,6 @@ way.  This happens to us all the time wi
 complaining.
 		-- Jef Raskin
 %
-Imagine me going around with a pot belly.
-It would mean political ruin.
-		-- Adolf Hitler
-%
 Imagine that Cray computer decides to make a personal computer.  It has a
 150 MHz processor, 200 megabytes of RAM, 1500 megabytes of disk storage, a
 screen resolution of 1024 x 1024 pixels, relies entirely on voice recognition
@@ -40269,9 +40248,6 @@ made of things.
 %
 Success is something I will dress for when I get there, and not until.
 %
-Success is the sole earthly judge of right and wrong.
-		-- Adolf Hitler, "Mein Kampf"
-%
 Succumb to natural tendencies.  Be hateful and boring.
 %
 Such a fine first dream!
@@ -40883,9 +40859,6 @@ called you from here."
 Texas is Hell on woman and horses.
 		-- Wayne Oakes
 %
-Thank God I've always avoided persecuting my enemies.
-		-- Adolf Hitler
-%
 Thank you for observing all safety 

CVS commit: src/sys/net

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 13 17:43:10 UTC 2017

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

Log Message:
Add bit definitions for flags so that route(8) can use them.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/net/route.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.h
diff -u src/sys/net/route.h:1.114 src/sys/net/route.h:1.115
--- src/sys/net/route.h:1.114	Thu Sep 21 03:15:34 2017
+++ src/sys/net/route.h	Wed Dec 13 12:43:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.h,v 1.114 2017/09/21 07:15:34 ozaki-r Exp $	*/
+/*	$NetBSD: route.h,v 1.115 2017/12/13 17:43:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -172,6 +172,12 @@ struct ortentry {
 #define RTF_BROADCAST	0x8		/* route represents a bcast address */
 #define RTF_UPDATING	0x10	/* route is updating */
 
+#define RTFBITS "\020\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" \
+"\010MASK_PRESENT\011CONNECTED\012XRESOLVE\013LLDATA\014STATIC" \
+"\015BLACKHOLE\016CLONED\017PROTO2\020PROTO1\021SRC\022ANNOUNCE" \
+"\023LOCAL\024BROADCAST\025UPDATING"
+
+
 /*
  * Routing statistics.
  */
@@ -263,6 +269,9 @@ struct rt_msghdr {
 #define RTV_RTT		0x40	/* init or lock _rtt */
 #define RTV_RTTVAR	0x80	/* init or lock _rttvar */
 
+#define RTVBITS "\020\1MTU\2HOPCOUNT\3EXPIRE\4RECVPIPE\5SENDPIPE" \
+"\6SSTHRESH\7RTT\010RTTVAR"
+
 /*
  * Bitmask values for rtm_addr.
  */
@@ -276,6 +285,9 @@ struct rt_msghdr {
 #define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
 #define RTA_TAG		0x100	/* route tag */
 
+#define RTABITS "\020\1DST\2GATEWAY\3NETMASK\4GENMASK\5IFP\6IFA\7AUTHOR" \
+"\010BRD\011TAG"
+
 /*
  * Index offsets for sockaddr array for alternate internal encoding.
  */

CVS commit: src/sbin/route

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 13 17:42:44 UTC 2017

Modified Files:
src/sbin/route: Makefile route.c

Log Message:
Use the definitions from the standard header files and replace homebrew
snprintb with the libutil one.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/route/Makefile
cvs rdiff -u -r1.157 -r1.158 src/sbin/route/route.c

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

Modified files:

Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.30 src/sbin/route/Makefile:1.31
--- src/sbin/route/Makefile:1.30	Tue Oct 10 15:30:06 2017
+++ src/sbin/route/Makefile	Wed Dec 13 12:42:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2017/10/10 19:30:06 christos Exp $
+#	$NetBSD: Makefile,v 1.31 2017/12/13 17:42:44 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .include 
@@ -17,6 +17,9 @@ DPADD.rump += ${LIBRUMPRES}
 CPPFLAGS+=-DINET6
 .endif
 
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
+
 # The Makefile over in ../../distrib/utils/x_route
 # would like keywords.[ch] to always exist here, so
 # they are now checked in as sources.

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.157 src/sbin/route/route.c:1.158
--- src/sbin/route/route.c:1.157	Wed Dec 13 06:31:42 2017
+++ src/sbin/route/route.c	Wed Dec 13 12:42:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.157 2017/12/13 11:31:42 uwe Exp $	*/
+/*	$NetBSD: route.c,v 1.158 2017/12/13 17:42:44 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.157 2017/12/13 11:31:42 uwe Exp $");
+__RCSID("$NetBSD: route.c,v 1.158 2017/12/13 17:42:44 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -68,6 +68,7 @@ __RCSID("$NetBSD: route.c,v 1.157 2017/1
 #include 
 #include 
 #include 
+#include 
 
 #include "keywords.h"
 #include "extern.h"
@@ -1291,14 +1292,10 @@ const char * const msgtypes[] = {
 	[RTM_CHGADDR] = "RTM_CHGADDR: address being changed on iface",
 };
 
-const char metricnames[] =
-"\011pksent\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire\2hopcount\1mtu";
-const char routeflags[] =
-"\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE\010MASK_PRESENT\011CONNECTED\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016CLONED\017PROTO2\020PROTO1\023LOCAL\024BROADCAST";
-const char ifnetflags[] =
-"\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6NOTRAILERS\7RUNNING\010NOARP\011PROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1\017LINK2\020MULTICAST";
-const char addrnames[] =
-"\1DST\2GATEWAY\3NETMASK\4GENMASK\5IFP\6IFA\7AUTHOR\010BRD\011TAG";
+const char metricnames[] = RTVBITS;
+const char routeflags[] = RTFBITS;
+const char ifnetflags[] = IFFBITS;
+const char addrnames[] = RTABITS;
 
 
 #ifndef SMALL
@@ -1659,30 +1656,10 @@ pmsg_addrs(const char *cp, int addrs)
 static void
 bprintf(FILE *fp, int b, const char *f)
 {
-	int i;
-	int gotsome = 0;
-	const uint8_t *s = (const uint8_t *)f;
+	char buf[1024];
 
-	if (b == 0) {
-		fputs("none", fp);
-		return;
-	}
-	while ((i = *s++) != 0) {
-		if (b & (1 << (i-1))) {
-			if (gotsome == 0)
-i = '<';
-			else
-i = ',';
-			(void)putc(i, fp);
-			gotsome = 1;
-			for (; (i = *s) > 32; s++)
-(void)putc(i, fp);
-		} else
-			while (*s > 32)
-s++;
-	}
-	if (gotsome)
-		(void)putc('>', fp);
+	snprintb(buf, sizeof(buf), f, b);
+	fputs(buf, fp);
 }
 
 int

CVS commit: src/sys/arch/ia64

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Wed Dec 13 16:50:46 UTC 2017

Modified Files:
src/sys/arch/ia64/ia64: interrupt.c
src/sys/arch/ia64/include: intr.h

Log Message:
add intr_string() stub for acpi_util.c:acpi_intr_string() so kernel will still 
compile


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/ia64/interrupt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/intr.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/ia64/ia64/interrupt.c
diff -u src/sys/arch/ia64/ia64/interrupt.c:1.7 src/sys/arch/ia64/ia64/interrupt.c:1.8
--- src/sys/arch/ia64/ia64/interrupt.c:1.7	Sat Apr  8 17:44:27 2017
+++ src/sys/arch/ia64/ia64/interrupt.c	Wed Dec 13 16:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.7 2017/04/08 17:44:27 scole Exp $ */
+/* $NetBSD: interrupt.c,v 1.8 2017/12/13 16:50:46 scole Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
  */
 
 #include 			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.7 2017/04/08 17:44:27 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.8 2017/12/13 16:50:46 scole Exp $");
 
 #include "opt_ddb.h"
 
@@ -382,4 +382,10 @@ db_print_vector(u_int vector, int always
 	} else if (always)
 		db_printf("vector %u: unassigned\n", vector);
 }
+
+const char *
+intr_string(intr_handle_t ih, char *buf, size_t len)
+{
+	panic("XXX %s not implemented", __func__);
+}
 #endif

Index: src/sys/arch/ia64/include/intr.h
diff -u src/sys/arch/ia64/include/intr.h:1.6 src/sys/arch/ia64/include/intr.h:1.7
--- src/sys/arch/ia64/include/intr.h:1.6	Sat Apr  8 18:02:21 2017
+++ src/sys/arch/ia64/include/intr.h	Wed Dec 13 16:50:46 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.6 2017/04/08 18:02:21 scole Exp $	*/
+/*	$NetBSD: intr.h,v 1.7 2017/12/13 16:50:46 scole Exp $	*/
 
 /* XXX: cherry: To Be fixed when we switch on interrupts. */
 
@@ -67,6 +67,10 @@ extern uint64_t ia64_lapic_address;
 #define IA64_INTERRUPT_BLOCK \
 	(struct ia64_interrupt_block *)IA64_PHYS_TO_RR6(ia64_lapic_address)
 
+/* XXX acpi */
+typedef uint64_t intr_handle_t;
+const char *intr_string(intr_handle_t, char *, size_t);
+
 void *intr_establish(int, int, int, int (*)(void *), void *);
 void intr_disestablish(void *);
 void ia64_handle_intr(void *);

CVS commit: src/sys/arch

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Wed Dec 13 16:30:18 UTC 2017

Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
src/sys/arch/x86/x86: intr.c ioapic.c
src/sys/arch/xen/include: intr.h
src/sys/arch/xen/x86: pintr.c
src/sys/arch/xen/xen: evtchn.c

Log Message:
Fixes for physical interrupts on Xen:
- do not cast int * to intr_handle_t *, they're not the same size
- legacy_irq is not always -1 for ioapic interrupts, test pic_type instead
- change irq2port[] to hold (port + 1) so that 0 is an invalid value
- add KASSERTs to make sure vect, port or irq values extracted from arrays are
  valid (or that they are invalid before write)
- for the !ioapic case, we still need to do PHYSDEVOP_ASSIGN_VECTOR and
  bind_pirq_to_evtch().

now XEN3_DOM0 boots again


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/isa/isa_machdep.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/x86/ioapic.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/x86/pintr.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/xen/xen/evtchn.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/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.37 src/sys/arch/x86/isa/isa_machdep.c:1.38
--- src/sys/arch/x86/isa/isa_machdep.c:1.37	Sat Nov  4 14:56:48 2017
+++ src/sys/arch/x86/isa/isa_machdep.c	Wed Dec 13 16:30:18 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.37 2017/11/04 14:56:48 cherry Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.38 2017/12/13 16:30:18 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.37 2017/11/04 14:56:48 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.38 2017/12/13 16:30:18 bouyer Exp $");
 
 #include 
 #include 
@@ -210,8 +210,8 @@ isa_intr_establish_xname(isa_chipset_tag
 {
 	struct pic *pic;
 	int pin;
-#if NIOAPIC > 0
 	intr_handle_t mpih = 0;
+#if NIOAPIC > 0
 	struct ioapic_softc *ioapic = NULL;
 #endif
 
@@ -245,7 +245,7 @@ isa_intr_establish_xname(isa_chipset_tag
 
 	mpih |= APIC_IRQ_LEGACY_IRQ(irq);
 
-	evtch = xen_pirq_alloc((intr_handle_t *), type); /* XXX: legacy - xen just tosses irq back at us */
+	evtch = xen_pirq_alloc(, type); /* XXX: legacy - xen just tosses irq back at us */
 	if (evtch == -1)
 		return NULL;
 #if NIOAPIC > 0

Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.112 src/sys/arch/x86/x86/intr.c:1.113
--- src/sys/arch/x86/x86/intr.c:1.112	Sat Nov 11 21:05:58 2017
+++ src/sys/arch/x86/x86/intr.c	Wed Dec 13 16:30:18 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.112 2017/11/11 21:05:58 riastradh Exp $	*/
+/*	$NetBSD: intr.c,v 1.113 2017/12/13 16:30:18 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.112 2017/11/11 21:05:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.113 2017/12/13 16:30:18 bouyer Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -1259,6 +1259,7 @@ intr_establish_xname(int legacy_irq, str
 
 #if NPCI > 0 || NISA > 0
 	struct pintrhand *pih;
+	intr_handle_t irq;
 	int evtchn;
 	char evname[16];
 
@@ -1267,12 +1268,12 @@ intr_establish_xname(int legacy_irq, str
 	KASSERTMSG(!(legacy_irq == -1 && pic == _pic),
 	"non-legacy IRQon i8259 ");
 
-	if (legacy_irq == -1) {
+	if (pic->pic_type != PIC_I8259) {
 #if NIOAPIC > 0
 		/* will do interrupts via I/O APIC */
-		legacy_irq = APIC_INT_VIA_APIC;
-		legacy_irq |= pic->pic_apicid << APIC_INT_APIC_SHIFT;
-		legacy_irq |= pin << APIC_INT_PIN_SHIFT;
+		irq = APIC_INT_VIA_APIC;
+		irq |= pic->pic_apicid << APIC_INT_APIC_SHIFT;
+		irq |= pin << APIC_INT_PIN_SHIFT;
 		snprintf(evname, sizeof(evname), "%s pin %d",
 		pic->pic_name, pin);
 #else /* NIOAPIC */
@@ -1280,10 +1281,11 @@ intr_establish_xname(int legacy_irq, str
 #endif /* NIOAPIC */
 	} else {
 		snprintf(evname, sizeof(evname), "irq%d", legacy_irq);
+		irq = legacy_irq;
 	}
 
-	evtchn = xen_pirq_alloc((intr_handle_t *)_irq, type);
-	pih = pirq_establish(legacy_irq & 0xff, evtchn, handler, arg, level,
+	evtchn = xen_pirq_alloc(, type);
+	pih = pirq_establish(irq & 0xff, evtchn, handler, arg, level,
 	evname);
 	pih->pic_type = pic->pic_type;
 	return pih;

Index: src/sys/arch/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.55 src/sys/arch/x86/x86/ioapic.c:1.56
--- src/sys/arch/x86/x86/ioapic.c:1.55	Sun Nov 26 11:37:10 2017
+++ src/sys/arch/x86/x86/ioapic.c	Wed Dec 13 16:30:18 2017
@@ -1,4 +1,4 @@
-/* 	$NetBSD: ioapic.c,v 1.55 2017/11/26 11:37:10 maxv Exp $	*/
+/* 	$NetBSD: ioapic.c,v 1.56 2017/12/13 16:30:18 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2009 

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Dec 13 13:52:13 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: mk.exynos mk.sunxi mk.ti mk.vexpress

Log Message:
Revert compressed uimg change, it is causing problems with overlapping
$kernel_addr_r vs. kernel load address.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.exynos
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.sunxi
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.ti
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.vexpress

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

Modified files:

Index: src/sys/arch/evbarm/conf/mk.exynos
diff -u src/sys/arch/evbarm/conf/mk.exynos:1.3 src/sys/arch/evbarm/conf/mk.exynos:1.4
--- src/sys/arch/evbarm/conf/mk.exynos:1.3	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.exynos	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.exynos,v 1.3 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.exynos,v 1.4 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -18,6 +18,7 @@ KERNEL_BASE_VIRT?=$(LOADADDRESS)
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
@@ -25,10 +26,13 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
 	echo ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Index: src/sys/arch/evbarm/conf/mk.sunxi
diff -u src/sys/arch/evbarm/conf/mk.sunxi:1.4 src/sys/arch/evbarm/conf/mk.sunxi:1.5
--- src/sys/arch/evbarm/conf/mk.sunxi:1.4	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.sunxi	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.sunxi,v 1.4 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.sunxi,v 1.5 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -14,16 +14,20 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Index: src/sys/arch/evbarm/conf/mk.ti
diff -u src/sys/arch/evbarm/conf/mk.ti:1.2 src/sys/arch/evbarm/conf/mk.ti:1.3
--- src/sys/arch/evbarm/conf/mk.ti:1.2	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.ti	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.ti,v 1.2 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.ti,v 1.3 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -17,16 +17,20 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin 

CVS commit: src/doc

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Wed Dec 13 13:03:23 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Note Lua bugfix.


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2338 src/doc/CHANGES:1.2339
--- src/doc/CHANGES:1.2338	Sun Dec 10 20:54:05 2017
+++ src/doc/CHANGES	Wed Dec 13 13:03:23 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2338 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2339 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -91,3 +91,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	gdb(1): Updated to 8.0.1.  [christos 20171128]
 	dhcpcd(8): Import dhcpcd-7.0.0-rc4. [roy 20171206]
 	ihidev(4), ims(4): Added drivers for i2c HID mice. [bouyer 20171210]
+	lua: Applied 6th bugfix to Lua 5.3.4 from lua.org/bugs.html.
+		[mbalmer 20171213]
+

CVS commit: src/external/mit/lua/dist/src

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Wed Dec 13 13:00:14 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lapi.c

Log Message:
Apply a bugfix from lua.org/bugs,html:
lua_pushcclosure should not call the garbage collector when n is zero.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lapi.c

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

Modified files:

Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.9 src/external/mit/lua/dist/src/lapi.c:1.10
--- src/external/mit/lua/dist/src/lapi.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lapi.c	Wed Dec 13 13:00:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapi.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lapi.c,v 1.10 2017/12/13 13:00:14 mbalmer Exp $	*/
 
 /*
 ** Id: lapi.c,v 2.259 2016/02/29 14:27:14 roberto Exp 
@@ -541,6 +541,7 @@ LUA_API void lua_pushcclosure (lua_State
   lua_lock(L);
   if (n == 0) {
 setfvalue(L->top, fn);
+api_incr_top(L);
   }
   else {
 CClosure *cl;
@@ -554,9 +555,9 @@ LUA_API void lua_pushcclosure (lua_State
   /* does not need barrier because closure is white */
 }
 setclCvalue(L, L->top, cl);
+api_incr_top(L);
+luaC_checkGC(L);
   }
-  api_incr_top(L);
-  luaC_checkGC(L);
   lua_unlock(L);
 }
 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Dec 13 12:12:35 UTC 2017

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

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


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

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

Modified files:

Index: src/share/man/man4/wbsio.4
diff -u src/share/man/man4/wbsio.4:1.7 src/share/man/man4/wbsio.4:1.8
--- src/share/man/man4/wbsio.4:1.7	Wed Dec 13 00:32:32 2017
+++ src/share/man/man4/wbsio.4	Wed Dec 13 12:12:35 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wbsio.4,v 1.7 2017/12/13 00:32:32 knakahara Exp $
+.\"	$NetBSD: wbsio.4,v 1.8 2017/12/13 12:12:35 wiz Exp $
 .\"	$OpenBSD: wbsio.4,v 1.2 2008/02/17 16:48:47 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Mark Kettenis 
@@ -31,19 +31,22 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Winbond (was spun off as Nuvoton) LPC Super I/O
-ICs.
+driver provides support for the Winbond (was spun off as Nuvoton)
+LPC Super I/O ICs.
 The hardware monitoring function and GPIO are currently supported.
 .Pp
 Support for the hardware monitor function is provided through the
 .Xr lm 4
-driver. The GPIO function supports 64 pins for NCT6795D. Access to the pins
-provided by the gpio(4) interface.
+driver.
+The GPIO function supports 64 pins for NCT6795D.
+Access to the pins provided by the
+.Xr gpio 4
+interface.
 .Sh SEE ALSO
+.Xr gpio 4 ,
 .Xr intro 4 ,
 .Xr isa 4 ,
-.Xr lm 4 ,
-.Xr gpio 4
+.Xr lm 4
 .Sh HISTORY
 The
 .Nm

CVS commit: src/distrib/evbarm/instkernel/instkernel

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Dec 13 11:37:37 UTC 2017

Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile

Log Message:
Fix evbarm build - patch from Harold Gutch on port-arm


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/evbarm/instkernel/instkernel/Makefile

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

Modified files:

Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.28 src/distrib/evbarm/instkernel/instkernel/Makefile:1.29
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.28	Mon Dec 11 11:38:14 2017
+++ src/distrib/evbarm/instkernel/instkernel/Makefile	Wed Dec 13 11:37:37 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2017/12/11 11:38:14 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.29 2017/12/13 11:37:37 skrll Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,10 +11,11 @@ SSHRAMDISK=	${SSHRAMDISKDIR}/sshramdisk.
 .include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
 
 MDSETTARGETS=
+MDSET_SUFFIXES.-=	srec create-srec  bin create-bin
 .for i in ${BUILD_KERNELS:M*_INSTALL}
 .if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
-MDSETTARGETS+=		${i}	${SSHRAMDISK}	netbsd-${i}
-MDSET_SUFFIXES.${i}=	bin create-bin  img create-img
+MDSETTARGETS+=		${i}	${SSHRAMDISK}	-
+MDSET_SUFFIXES.${i}=	img create-img
 .else
 MDSETTARGETS+=		${i}	${RAMDISK}	-
 .endif
@@ -22,7 +23,6 @@ MDSETTARGETS+=		${i}	${RAMDISK}	-
 
 MDSET_RELEASEDIR=	installation/instkernel
 
-MDSET_SUFFIXES.-=	srec create-srec  bin create-bin
 create-srec=		${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
 create-bin=		${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
 create-img=	\

CVS commit: src/sbin/route

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Wed Dec 13 11:31:42 UTC 2017

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

Log Message:
Fix typo in flag name.  We should probably just use IFFBITS string
that  defines.

PR bin/52815


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sbin/route/route.c

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

Modified files:

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.156 src/sbin/route/route.c:1.157
--- src/sbin/route/route.c:1.156	Fri Jun 16 04:40:16 2017
+++ src/sbin/route/route.c	Wed Dec 13 11:31:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.156 2017/06/16 04:40:16 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.157 2017/12/13 11:31:42 uwe Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.156 2017/06/16 04:40:16 ozaki-r Exp $");
+__RCSID("$NetBSD: route.c,v 1.157 2017/12/13 11:31:42 uwe Exp $");
 #endif
 #endif /* not lint */
 
@@ -1296,7 +1296,7 @@ const char metricnames[] =
 const char routeflags[] =
 "\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE\010MASK_PRESENT\011CONNECTED\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016CLONED\017PROTO2\020PROTO1\023LOCAL\024BROADCAST";
 const char ifnetflags[] =
-"\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6NOTRAILERS\7RUNNING\010NOARP\011PPROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1\017LINK2\020MULTICAST";
+"\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6NOTRAILERS\7RUNNING\010NOARP\011PROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1\017LINK2\020MULTICAST";
 const char addrnames[] =
 "\1DST\2GATEWAY\3NETMASK\4GENMASK\5IFP\6IFA\7AUTHOR\010BRD\011TAG";
 

CVS commit: src/share/misc

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Dec 13 11:17:54 UTC 2017

Modified Files:
src/share/misc: bsd-family-tree

Log Message:
bsd-family-tree: update freebsd rcsid, too.

Reminded by wiz, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/share/misc/bsd-family-tree

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

Modified files:

Index: src/share/misc/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.60 src/share/misc/bsd-family-tree:1.61
--- src/share/misc/bsd-family-tree:1.60	Tue Dec 12 18:44:57 2017
+++ src/share/misc/bsd-family-tree	Wed Dec 13 11:17:54 2017
@@ -785,5 +785,5 @@ Steven M. Schultz for providing 2.8BSD, 
 Copyright (c) 1997-2012 Wolfram Schneider 
 URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
 
-$FreeBSD: head/share/misc/bsd-family-tree 316082 2017-03-28 09:02:42Z maxim $
-$NetBSD: bsd-family-tree,v 1.60 2017/12/12 18:44:57 maya Exp $
+$FreeBSD: head/share/misc/bsd-family-tree 326724 2017-12-09 05:05:25Z imp $
+$NetBSD: bsd-family-tree,v 1.61 2017/12/13 11:17:54 maya Exp $

CVS commit: src/sys/dev/ata

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Dec 13 10:24:31 UTC 2017

Modified Files:
src/sys/dev/ata: wd.c

Log Message:
Fix build for WD_SOFTBADSECT option.  PR kern/52814

XXX No clue if this option actually works.  This fix just makes it
XXX compile without error.


To generate a diff of this commit:
cvs rdiff -u -r1.436 -r1.437 src/sys/dev/ata/wd.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/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.436 src/sys/dev/ata/wd.c:1.437
--- src/sys/dev/ata/wd.c:1.436	Tue Nov  7 04:09:08 2017
+++ src/sys/dev/ata/wd.c	Wed Dec 13 10:24:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.436 2017/11/07 04:09:08 mlelstv Exp $ */
+/*	$NetBSD: wd.c,v 1.437 2017/12/13 10:24:31 pgoyette Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.436 2017/11/07 04:09:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.437 2017/12/13 10:24:31 pgoyette Exp $");
 
 #include "opt_ata.h"
 #include "opt_wd.h"
@@ -535,12 +535,12 @@ wddetach(device_t self, int flags)
 
 #ifdef WD_SOFTBADSECT
 	/* Clean out the bad sector list */
-	while (!SLIST_EMPTY(>sc_bslist)) {
-		void *head = SLIST_FIRST(>sc_bslist);
-		SLIST_REMOVE_HEAD(>sc_bslist, dbs_next);
+	while (!SLIST_EMPTY(>sc_bslist)) {
+		void *head = SLIST_FIRST(>sc_bslist);
+		SLIST_REMOVE_HEAD(>sc_bslist, dbs_next);
 		free(head, M_TEMP);
 	}
-	sc->sc_bscount = 0;
+	wd->sc_bscount = 0;
 #endif
 
 	pmf_device_deregister(self);
@@ -586,11 +586,13 @@ wdstrategy(struct buf *bp)
 	 */
 	if (__predict_false(!SLIST_EMPTY(>sc_bslist))) {
 		struct disk_badsectors *dbs;
-		daddr_t maxblk = blkno + (bp->b_bcount / wd->sc_blksize) - 1;
+		daddr_t maxblk = bp->b_rawblkno +
+		(bp->b_bcount / wd->sc_blksize) - 1;
 
 		mutex_enter(>sc_lock);
 		SLIST_FOREACH(dbs, >sc_bslist, dbs_next)
-			if ((dbs->dbs_min <= blkno && blkno <= dbs->dbs_max) ||
+			if ((dbs->dbs_min <= bp->b_rawblkno &&
+			 bp->b_rawblkno <= dbs->dbs_max) ||
 			(dbs->dbs_min <= maxblk && maxblk <= dbs->dbs_max)){
 mutex_exit(>sc_lock);
 goto err;

CVS commit: src/sys/arch/macppc/dev

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Dec 13 09:46:05 UTC 2017

Modified Files:
src/sys/arch/macppc/dev: pbms.c

Log Message:
Catch up with hid.h header location change

Fixes macppc kernels build


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/macppc/dev/pbms.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/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.14 src/sys/arch/macppc/dev/pbms.c:1.15
--- src/sys/arch/macppc/dev/pbms.c:1.14	Thu Apr 28 14:00:23 2016
+++ src/sys/arch/macppc/dev/pbms.c	Wed Dec 13 09:46:05 2017
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.14 2016/04/28 14:00:23 skrll Exp $ */
+/* $Id: pbms.c,v 1.15 2017/12/13 09:46:05 maya Exp $ */
 
 /*
  * Copyright (c) 2005, Johan Wallén
@@ -129,7 +129,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include