CVS commit: [pgoyette-compat] src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 22 01:44:52 UTC 2018

Modified Files:
src/bin/pax [pgoyette-compat]: buf_subs.c
src/bin/sh [pgoyette-compat]: sh.1
src/crypto/external/bsd/openssl/lib/libdes [pgoyette-compat]: Makefile
src/distrib/sets/lists/comp [pgoyette-compat]: ad.aarch64 ad.arm
src/doc [pgoyette-compat]: 3RDPARTY CHANGES
src/external/bsd/mdocml/include [pgoyette-compat]: config.h
src/external/mit/ctwm/bin/ctwm [pgoyette-compat]: Makefile
src/lib/libc/sys [pgoyette-compat]: recv.2
src/sbin/gpt [pgoyette-compat]: gpt.8 gpt.h main.c set.c type.c unset.c
src/sbin/nvmectl [pgoyette-compat]: devlist.c identify.c logpage.c
nvmectl.c nvmectl.h perftest.c power.c reset.c wdc.c
src/share/man/man4 [pgoyette-compat]: altq.4 ddb.4
src/share/man/man8/man8.vax [pgoyette-compat]: boot.8
src/share/man/man9 [pgoyette-compat]: altq.9 firmload.9
src/share/misc [pgoyette-compat]: bsd-family-tree
src/share/mk [pgoyette-compat]: bsd.own.mk
src/sys/arch/aarch64/include [pgoyette-compat]: armreg.h
src/sys/arch/acorn32/eb7500atx [pgoyette-compat]: rsbus_io.c
src/sys/arch/acorn32/podulebus [pgoyette-compat]: podulebus_io.c
src/sys/arch/alpha/alpha [pgoyette-compat]: vm_machdep.c
src/sys/arch/amd64/amd64 [pgoyette-compat]: amd64_trap.S db_machdep.c
locore.S machdep.c vector.S
src/sys/arch/amd64/conf [pgoyette-compat]: ALL
src/sys/arch/amd64/include [pgoyette-compat]: cpu.h param.h types.h
src/sys/arch/arm/arm32 [pgoyette-compat]: armv7_generic_space.c
src/sys/arch/arm/at91 [pgoyette-compat]: at91_bus_space.c
src/sys/arch/arm/broadcom [pgoyette-compat]: bcm283x_platform.c
bcmgen_space.c files.bcm2835
src/sys/arch/arm/clps711x [pgoyette-compat]: clps711x_space.c
src/sys/arch/arm/ep93xx [pgoyette-compat]: ep93xx_space.c
src/sys/arch/arm/footbridge [pgoyette-compat]: footbridge_com_io.c
footbridge_io.c
src/sys/arch/arm/footbridge/isa [pgoyette-compat]: isa_io.c
src/sys/arch/arm/gemini [pgoyette-compat]: gemini_a4x_space.c
gemini_space.c
src/sys/arch/arm/imx [pgoyette-compat]: files.imx51 files.imx6
files.imx7 imx23_space.c imx51_axi.c imx51_ipuv3.c imx51_usb.c
imx51var.h imx6_axi.c imx6_usb.c imx6var.h imx7_axi.c imx7_usb.c
imx7var.h imx_space.c
src/sys/arch/arm/include [pgoyette-compat]: Makefile aout_machdep.h
armreg.h
src/sys/arch/arm/iomd [pgoyette-compat]: iomd_io.c
src/sys/arch/arm/ixp12x0 [pgoyette-compat]: ixp12x0_io.c
src/sys/arch/arm/mainbus [pgoyette-compat]: mainbus_io.c
src/sys/arch/arm/marvell [pgoyette-compat]: mvsoc_space.c
src/sys/arch/arm/mpcore [pgoyette-compat]: mpcore_a2x_space.c
mpcore_a4x_space.c mpcore_space.c
src/sys/arch/arm/nvidia [pgoyette-compat]: files.tegra tegra_platform.c
src/sys/arch/arm/omap [pgoyette-compat]: omap_a2x_space.c
omap_a4x_space.c omap_nobyteacc_space.c omap_space.c
src/sys/arch/arm/s3c2xx0 [pgoyette-compat]: s3c2xx0_space.c
src/sys/arch/arm/sa11x0 [pgoyette-compat]: sa11x0_io.c
src/sys/arch/arm/samsung [pgoyette-compat]: exynos_platform.c
files.exynos
src/sys/arch/arm/sunxi [pgoyette-compat]: files.sunxi sun4i_a10_ccu.c
sunxi_ccu.c sunxi_ccu.h sunxi_ccu_div.c sunxi_mmc.c
sunxi_platform.c
src/sys/arch/arm/ti [pgoyette-compat]: files.ti ti_platform.c
src/sys/arch/arm/vexpress [pgoyette-compat]: files.vexpress
vexpress_platform.c
src/sys/arch/arm/xscale [pgoyette-compat]: becc_space.c i80312_space.c
i80321_space.c ixp425_a4x_space.c ixp425_pci_space.c ixp425_space.c
pxa2x0_a4x_space.c pxa2x0_space.c
src/sys/arch/arm/zynq [pgoyette-compat]: zynq_space.c
src/sys/arch/epoc32/epoc32 [pgoyette-compat]: external_io.c
src/sys/arch/evbarm/adi_brh [pgoyette-compat]: obio_space.c
src/sys/arch/evbarm/conf [pgoyette-compat]: files.amlogic
files.armadaxp files.awin files.bcm53xx files.beagle files.evbarm
files.fdt files.gemini files.goldengate files.hawk
files.imx23_olinuxino files.imx31 files.imx7 files.kobo files.n900
files.netwalker files.nitrogen6 files.osk5912 files.tisdp24xx
files.zynq
src/sys/arch/evbarm/hdl_g [pgoyette-compat]: obio_space.c
src/sys/arch/evbarm/ifpga [pgoyette-compat]: ifpga_io.c
src/sys/arch/evbarm/iq80310 [pgoyette-compat]: obio_space.c
src/sys/arch/evbarm/iq80321 [pgoyette-compat]: obio_space.c
src/sys/arch/evbarm/lubbock [pgoyette-compat]: sm_obio_space.c
src/sys/arch/evbarm/tsarm/isa [pgoyette-compat]: isa_io.c

CVS commit: src/sys/arch/vax/boot/boot

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Wed Mar 21 18:27:27 UTC 2018

Modified Files:
src/sys/arch/vax/boot/boot: devopen.c ra.c

Log Message:
Fix bug causing autoboot on 750/780 not to work.  Cleanup.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/boot/boot/devopen.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/boot/boot/ra.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/vax/boot/boot/devopen.c
diff -u src/sys/arch/vax/boot/boot/devopen.c:1.19 src/sys/arch/vax/boot/boot/devopen.c:1.20
--- src/sys/arch/vax/boot/boot/devopen.c:1.19	Mon Mar 19 15:43:45 2018
+++ src/sys/arch/vax/boot/boot/devopen.c	Wed Mar 21 18:27:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.19 2018/03/19 15:43:45 ragge Exp $ */
+/*	$NetBSD: devopen.c,v 1.20 2018/03/21 18:27:27 ragge Exp $ */
 /*
  * Copyright (c) 1997 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -49,7 +49,6 @@ int
 devopen(struct open_file *f, const char *fname, char **file)
 {
 	int dev, unit, ctlr, part, adapt, i, a[4], x;
-	int *mapregs;
 	struct devsw *dp;
 	extern int cnvtab[];
 	char *s, *c;
@@ -130,19 +129,19 @@ devopen(struct open_file *f, const char 
 	switch (vax_boardtype) {
 	case VAX_BTYP_750:
 		csrbase = (nexaddr == 0xf3 ? 0xffe000 : 0xfbe000);
+		mapaddr = (int *)nexaddr + VAX_NBPG;
 		if (adapt < 0)
 			break;
 		nexaddr = (NEX750 + NEXSIZE * adapt);
-		mapaddr = (int *)nexaddr + VAX_NBPG;
 		csrbase = (adapt == 8 ? 0xffe000 : 0xfbe000);
 		break;
 	case VAX_BTYP_780:
 	case VAX_BTYP_790:
 		csrbase = 0x2007e000 + 0x4 * ((nexaddr & 0x1e000) >> 13);
+		mapaddr = (int *)nexaddr + VAX_NBPG;
 		if (adapt < 0)
 			break;
 		nexaddr = ((int)NEX780 + NEXSIZE * adapt);
-		mapaddr = (int *)nexaddr + VAX_NBPG;
 		csrbase = 0x2007e000 + 0x4 * adapt;
 		break;
 	case VAX_BTYP_9CC: /* 6000/200 */
@@ -180,13 +179,9 @@ devopen(struct open_file *f, const char 
 	default:
 		nexaddr = 0; /* No map regs */
 		csrbase = 0x2000;
-		/* Always map in the lowest 4M on qbus-based machines */
-		mapregs = (void *)0x20088000;
 		if (bootrpb.adpphy == 0x20087800) {
 			nexaddr = bootrpb.adpphy;
 			mapaddr = (int *)nexaddr + VAX_NBPG;
-			for (i = 0; i < 8192; i++)
-mapregs[i] = PG_V | i;
 		}
 		break;
 	}

Index: src/sys/arch/vax/boot/boot/ra.c
diff -u src/sys/arch/vax/boot/boot/ra.c:1.21 src/sys/arch/vax/boot/boot/ra.c:1.22
--- src/sys/arch/vax/boot/boot/ra.c:1.21	Mon Mar 19 15:43:45 2018
+++ src/sys/arch/vax/boot/boot/ra.c	Wed Mar 21 18:27:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ra.c,v 1.21 2018/03/19 15:43:45 ragge Exp $ */
+/*	$NetBSD: ra.c,v 1.22 2018/03/21 18:27:27 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -65,7 +65,7 @@ static volatile struct uda {
 
 static struct disklabel ralabel;
 static char io_buf[DEV_BSIZE];
-static int dpart, dunit, remap, is_tmscp, curblock;
+static int dpart, dunit, is_tmscp, curblock;
 static volatile u_short *ra_ip, *ra_sa, *ra_sw;
 
 int
@@ -90,7 +90,6 @@ raopen(struct open_file *f, int adapt, i
 	dpart = part;
 	if (ctlr < 0)
 		ctlr = 0;
-	remap = csrbase && nexaddr;
 	curblock = 0;
 	if (csrbase) { /* On a uda-alike adapter */
 		if (askname == 0) {
@@ -254,8 +253,8 @@ rastrategy(void *f, int func, daddr_t db
 {
 
 #ifdef DEV_DEBUG
-	printf("rastrategy: buf %p remap %d is_tmscp %d\n",
-	buf, remap, is_tmscp);
+	printf("rastrategy: buf %p is_tmscp %d\n",
+	buf, is_tmscp);
 #endif
 
 	uda.uda_cmd.mscp_seq.seq_buffer = ubmap(0, (int)buf, size);

CVS commit: src/sys

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 21 17:03:09 UTC 2018

Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/sys: mbuf.h

Log Message:
Localify and remove unused prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.179 -r1.180 src/sys/sys/mbuf.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_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.183 src/sys/kern/uipc_mbuf.c:1.184
--- src/sys/kern/uipc_mbuf.c:1.183	Wed Mar 21 16:26:04 2018
+++ src/sys/kern/uipc_mbuf.c	Wed Mar 21 17:03:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.183 2018/03/21 16:26:04 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.184 2018/03/21 17:03:09 maxv Exp $	*/
 
 /*
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.183 2018/03/21 16:26:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.184 2018/03/21 17:03:09 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
@@ -606,7 +606,14 @@ m_get(int nowait, int type)
 
 	mbstat_type_add(type, 1);
 
-	m_hdr_init(m, type, NULL, m->m_dat, 0);
+	mowner_init(m, type);
+	m->m_ext_ref = m; /* default */
+	m->m_type = type;
+	m->m_len = 0;
+	m->m_next = NULL;
+	m->m_nextpkt = NULL; /* default */
+	m->m_data = m->m_dat;
+	m->m_flags = 0; /* default */
 
 	return m;
 }
@@ -620,7 +627,18 @@ m_gethdr(int nowait, int type)
 	if (m == NULL)
 		return NULL;
 
-	m_pkthdr_init(m);
+	m->m_data = m->m_pktdat;
+	m->m_flags = M_PKTHDR;
+
+	m_reset_rcvif(m);
+	m->m_pkthdr.len = 0;
+	m->m_pkthdr.csum_flags = 0;
+	m->m_pkthdr.csum_data = 0;
+	SLIST_INIT(>m_pkthdr.tags);
+
+	m->m_pkthdr.pattr_class = NULL;
+	m->m_pkthdr.pattr_af = AF_UNSPEC;
+	m->m_pkthdr.pattr_hdr = NULL;
 
 	return m;
 }

Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.179 src/sys/sys/mbuf.h:1.180
--- src/sys/sys/mbuf.h:1.179	Fri Mar  9 11:57:38 2018
+++ src/sys/sys/mbuf.h	Wed Mar 21 17:03:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbuf.h,v 1.179 2018/03/09 11:57:38 maxv Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.180 2018/03/21 17:03:09 maxv Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -200,10 +200,7 @@ struct pkthdr {
 	void	*pattr_hdr;		/* ALTQ: saved header position in mbuf */
 };
 
-/*
- * Note: These bits are carefully arranged so that the compiler can have
- * a prayer of generating a jump table.
- */
+/* Checksumming flags. */
 #define	M_CSUM_TCPv4		0x0001	/* TCP header/payload */
 #define	M_CSUM_UDPv4		0x0002	/* UDP header/payload */
 #define	M_CSUM_TCP_UDP_BAD	0x0004	/* TCP/UDP checksum bad */
@@ -365,7 +362,6 @@ MBUF_DEFINE(mbuf, MHLEN, MLEN);
 #define	M_LINK0		0x1000	/* link layer specific flag */
 #define	M_LINK1		0x2000	/* link layer specific flag */
 #define	M_LINK2		0x4000	/* link layer specific flag */
-
 #define	M_LINK3		0x8000	/* link layer specific flag */
 #define	M_LINK4		0x0001	/* link layer specific flag */
 #define	M_LINK5		0x0002	/* link layer specific flag */
@@ -859,7 +855,6 @@ int	m_apply(struct mbuf *, int, int,
 int (*)(void *, void *, unsigned int), void *);
 void	m_cat(struct mbuf *,struct mbuf *);
 void	m_clget(struct mbuf *, int);
-int	m_mballoc(int, int);
 void	m_copyback(struct mbuf *, int, int, const void *);
 struct	mbuf *m_copyback_cow(struct mbuf *, int, int, const void *, int);
 int	m_makewritable(struct mbuf **, int, int, int);
@@ -870,7 +865,6 @@ void	m_freem(struct mbuf *);
 void	m_reclaim(void *, int);
 void	mbinit(void);
 void	m_ext_free(struct mbuf *);
-char *	m_mapin(struct mbuf *);
 void	m_move_pkthdr(struct mbuf *, struct mbuf *);
 
 bool	m_ensure_contig(struct mbuf **, int);
@@ -933,22 +927,6 @@ m_length(const struct mbuf *m)
 }
 
 static __inline void
-m_hdr_init(struct mbuf *m, short type, struct mbuf *next, char *data, int len)
-{
-
-	KASSERT(m != NULL);
-
-	mowner_init(m, type);
-	m->m_ext_ref = m; /* default */
-	m->m_type = type;
-	m->m_len = len;
-	m->m_next = next;
-	m->m_nextpkt = NULL; /* default */
-	m->m_data = data;
-	m->m_flags = 0; /* default */
-}
-
-static __inline void
 m_set_rcvif(struct mbuf *m, const struct ifnet *ifp)
 {
 
@@ -971,26 +949,6 @@ m_copy_rcvif(struct mbuf *m, const struc
 	m->m_pkthdr.rcvif_index = n->m_pkthdr.rcvif_index;
 }
 
-static __inline void
-m_pkthdr_init(struct mbuf *m)
-{
-
-	KASSERT(m != NULL);
-
-	m->m_data = m->m_pktdat;
-	m->m_flags = M_PKTHDR;
-
-	m_reset_rcvif(m);
-	m->m_pkthdr.len = 0;
-	m->m_pkthdr.csum_flags = 0;
-	m->m_pkthdr.csum_data = 0;
-	SLIST_INIT(>m_pkthdr.tags);
-
-	m->m_pkthdr.pattr_class = NULL;
-	m->m_pkthdr.pattr_af = AF_UNSPEC;
-	m->m_pkthdr.pattr_hdr = NULL;
-}
-
 void m_print(const struct mbuf *, const char *, void (*)(const char *, ...)
 __printflike(1, 2));
 

CVS commit: src/sys/kern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 21 16:26:05 UTC 2018

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

Log Message:
Remove these global variables. They are unused, racy, and the only thing
they do is triggering cache synchronization latencies between CPUs.


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/kern/uipc_mbuf.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/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.182 src/sys/kern/uipc_mbuf.c:1.183
--- src/sys/kern/uipc_mbuf.c:1.182	Fri Mar  9 11:57:38 2018
+++ src/sys/kern/uipc_mbuf.c	Wed Mar 21 16:26:04 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.182 2018/03/09 11:57:38 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.183 2018/03/21 16:26:04 maxv Exp $	*/
 
 /*
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.182 2018/03/09 11:57:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.183 2018/03/21 16:26:04 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
@@ -707,8 +707,6 @@ m_prepend(struct mbuf *m, int len, int h
  * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
  * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
  */
-int MCFail;
-
 struct mbuf *
 m_copym(struct mbuf *m, int off0, int len, int wait)
 {
@@ -812,14 +810,10 @@ m_copym0(struct mbuf *m, int off0, int l
 		np = >m_next;
 	}
 
-	if (top == NULL)
-		MCFail++;
-
 	return top;
 
 nospace:
 	m_freem(top);
-	MCFail++;
 	return NULL;
 }
 
@@ -871,7 +865,6 @@ m_copypacket(struct mbuf *m, int how)
 
 nospace:
 	m_freem(top);
-	MCFail++;
 	return NULL;
 }
 
@@ -1082,8 +1075,6 @@ m_ensure_contig(struct mbuf **m0, int le
 /*
  * m_pullup: same as m_ensure_contig(), but destroys mbuf chain on error.
  */
-int MPFail;
-
 struct mbuf *
 m_pullup(struct mbuf *n, int len)
 {
@@ -1093,7 +1084,6 @@ m_pullup(struct mbuf *n, int len)
 	if (!m_ensure_contig(, len)) {
 		KASSERT(m != NULL);
 		m_freem(m);
-		MPFail++;
 		m = NULL;
 	}
 	return m;
@@ -1104,8 +1094,6 @@ m_pullup(struct mbuf *n, int len)
  * the amount of empty space before the data in the new mbuf to be specified
  * (in the event that the caller expects to prepend later).
  */
-int MSFail;
-
 struct mbuf *
 m_copyup(struct mbuf *n, int len, int dstoff)
 {
@@ -1145,7 +1133,6 @@ m_copyup(struct mbuf *n, int len, int ds
 	return (m);
  bad:
 	m_freem(n);
-	MSFail++;
 	return (NULL);
 }
 

CVS commit: xsrc/local/programs/ttf2wsfont

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar 21 16:24:34 UTC 2018

Modified Files:
xsrc/local/programs/ttf2wsfont: Makefile

Log Message:
There is no man page, so add NOMAN


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/local/programs/ttf2wsfont/Makefile

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

Modified files:

Index: xsrc/local/programs/ttf2wsfont/Makefile
diff -u xsrc/local/programs/ttf2wsfont/Makefile:1.2 xsrc/local/programs/ttf2wsfont/Makefile:1.3
--- xsrc/local/programs/ttf2wsfont/Makefile:1.2	Fri Jun 23 02:15:07 2017
+++ xsrc/local/programs/ttf2wsfont/Makefile	Wed Mar 21 16:24:34 2018
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.2 2017/06/23 02:15:07 macallan Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/21 16:24:34 martin Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	ttf2wsfont
 
 SRCS=	main.c
 WARNS=	3
+NOMAN=
 
 CPPFLAGS+=	-DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 -D_NETBSD_SOURCE
 

CVS commit: src/sys/dev/i2c

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Mar 21 15:41:34 UTC 2018

Modified Files:
src/sys/dev/i2c: fcu.c

Log Message:
effectively enforce fan speed limits, deal with negatives properly


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/fcu.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/i2c/fcu.c
diff -u src/sys/dev/i2c/fcu.c:1.2 src/sys/dev/i2c/fcu.c:1.3
--- src/sys/dev/i2c/fcu.c:1.2	Fri Mar 16 22:11:53 2018
+++ src/sys/dev/i2c/fcu.c	Wed Mar 21 15:41:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fcu.c,v 1.2 2018/03/16 22:11:53 macallan Exp $ */
+/* $NetBSD: fcu.c,v 1.3 2018/03/21 15:41:34 macallan Exp $ */
 
 /*-
  * Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fcu.c,v 1.2 2018/03/16 22:11:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fcu.c,v 1.3 2018/03/21 15:41:34 macallan Exp $");
 
 #include 
 #include 
@@ -163,10 +163,10 @@ fcu_attach(device_t parent, device_t sel
 
 	/* init zones */
 	sc->sc_zones[FCU_ZONE_CPU_A].filter = is_cpu_a;
-	sc->sc_zones[FCU_ZONE_CPU_A].threshold = 45;
+	sc->sc_zones[FCU_ZONE_CPU_A].threshold = 50;
 	sc->sc_zones[FCU_ZONE_CPU_A].nfans = 0;
 	sc->sc_zones[FCU_ZONE_CPU_B].filter = is_cpu_b;
-	sc->sc_zones[FCU_ZONE_CPU_B].threshold = 45;
+	sc->sc_zones[FCU_ZONE_CPU_B].threshold = 50;
 	sc->sc_zones[FCU_ZONE_CPU_B].nfans = 0;
 	sc->sc_zones[FCU_ZONE_CASE].filter = is_case;
 	sc->sc_zones[FCU_ZONE_CASE].threshold = 50;
@@ -401,13 +401,14 @@ fcu_set_fan_rpm(struct fcu_softc *sc, fc
 	int error;
 	uint8_t cmd;
 
+	if (speed > f->max_rpm) speed = f->max_rpm;
+	if (speed < f->base_rpm) speed = f->base_rpm;
+
 	if (f->reg < 0x30) {
 		uint16_t data;
 		/* simple rpm fan, just poke the register */
 
 		if (f->target == speed) return;
-		speed = min(speed, f->max_rpm);
-		speed = max(speed, f->base_rpm);
 		iic_acquire_bus(sc->sc_i2c, 0);
 		cmd = f->reg;
 		data = (speed << 3);
@@ -469,7 +470,8 @@ fcu_adjust_zone(struct fcu_softc *sc, in
 	}
 
 	temp = (temp - 27315) / 100;
-	diff = (temp - z->threshold);
+	diff = temp - z->threshold;
+	if (diff < 0) diff = 0;
 
 	/* now adjust each fan to the new duty cycle */
 	for (i = 0; i < z->nfans; i++) {
@@ -479,6 +481,7 @@ fcu_adjust_zone(struct fcu_softc *sc, in
 		}
 		f = >sc_fans[z->fans[i]];
 		speed = f->base_rpm + diff * f->step;
+		DPRINTF("diff %d base %d sp %d\n", diff, f->base_rpm, speed);
 		fcu_set_fan_rpm(sc, f, speed);
 	}
 }

CVS commit: src/sys/net/npf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 21 15:36:28 UTC 2018

Modified Files:
src/sys/net/npf: npf_inet.c

Log Message:
Add XXX (we don't handle IPv6 Jumbograms), and whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/net/npf/npf_inet.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/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.43 src/sys/net/npf/npf_inet.c:1.44
--- src/sys/net/npf/npf_inet.c:1.43	Wed Mar 21 10:08:16 2018
+++ src/sys/net/npf/npf_inet.c	Wed Mar 21 15:36:28 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.43 2018/03/21 10:08:16 maxv Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.44 2018/03/21 15:36:28 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.43 2018/03/21 10:08:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.44 2018/03/21 15:36:28 maxv Exp $");
 
 #include 
 #include 
@@ -369,6 +369,10 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
 			return NPC_FMTERR;
 		}
 
+		/*
+		 * XXX: We don't handle IPv6 Jumbograms.
+		 */
+
 		/* Set initial next-protocol value. */
 		hlen = sizeof(struct ip6_hdr);
 		npc->npc_proto = ip6->ip6_nxt;
@@ -433,7 +437,7 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
 		/* Cache: layer 3 - IPv6. */
 		npc->npc_alen = sizeof(struct in6_addr);
 		npc->npc_ips[NPF_SRC] = (npf_addr_t *)>ip6_src;
-		npc->npc_ips[NPF_DST]= (npf_addr_t *)>ip6_dst;
+		npc->npc_ips[NPF_DST] = (npf_addr_t *)>ip6_dst;
 
 		npc->npc_ip.v6 = ip6;
 		flags |= NPC_IP6;

CVS commit: src/sys/netinet

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 21 15:33:25 UTC 2018

Modified Files:
src/sys/netinet: ip_carp.c

Log Message:
Fix an untriggerable memory leak. carp_prepare_ad does not fail, so switch
it to void.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/netinet/ip_carp.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/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.94 src/sys/netinet/ip_carp.c:1.95
--- src/sys/netinet/ip_carp.c:1.94	Wed Dec  6 09:54:47 2017
+++ src/sys/netinet/ip_carp.c	Wed Mar 21 15:33:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.94 2017/12/06 09:54:47 ozaki-r Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.95 2018/03/21 15:33:25 maxv Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.94 2017/12/06 09:54:47 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.95 2018/03/21 15:33:25 maxv Exp $");
 
 /*
  * TODO:
@@ -201,7 +201,7 @@ static void	carp_setroute(struct carp_so
 static void	carp_proto_input_c(struct mbuf *, struct carp_header *,
 		sa_family_t);
 static void	carpdetach(struct carp_softc *);
-static int	carp_prepare_ad(struct mbuf *, struct carp_softc *,
+static void	carp_prepare_ad(struct mbuf *, struct carp_softc *,
 		struct carp_header *);
 static void	carp_send_ad_all(void);
 static void	carp_send_ad(void *);
@@ -969,7 +969,7 @@ carp_ifdetach(struct ifnet *ifp)
 	}
 }
 
-static int
+static void
 carp_prepare_ad(struct mbuf *m, struct carp_softc *sc,
 struct carp_header *ch)
 {
@@ -983,8 +983,6 @@ carp_prepare_ad(struct mbuf *m, struct c
 	ch->carp_counter[1] = htonl(sc->sc_counter&0x);
 
 	carp_hmac_generate(sc, ch->carp_counter, ch->carp_md);
-
-	return (0);
 }
 
 static void
@@ -1110,8 +1108,7 @@ carp_send_ad(void *v)
 
 		ch_ptr = (struct carp_header *)([1]);
 		memcpy(ch_ptr, , sizeof(ch));
-		if (carp_prepare_ad(m, sc, ch_ptr))
-			goto retry_later;
+		carp_prepare_ad(m, sc, ch_ptr);
 
 		m->m_data += sizeof(*ip);
 		ch_ptr->carp_cksum = carp_cksum(m, len - sizeof(*ip));
@@ -1200,8 +1197,7 @@ carp_send_ad(void *v)
 
 		ch_ptr = (struct carp_header *)([1]);
 		memcpy(ch_ptr, , sizeof(ch));
-		if (carp_prepare_ad(m, sc, ch_ptr))
-			goto retry_later;
+		carp_prepare_ad(m, sc, ch_ptr);
 
 		ch_ptr->carp_cksum = carp6_cksum(m, sizeof(*ip6),
 		len - sizeof(*ip6));

CVS commit: src/sys

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Wed Mar 21 14:23:55 UTC 2018

Modified Files:
src/sys/netatalk: ddp_input.c
src/sys/netcan: can.c
src/sys/netinet: ip_mroute.c raw_ip.c
src/sys/netinet6: icmp6.c ip6_input.c ip6_mroute.c raw_ip6.c

Log Message:
Sprinkle more soroverflow().


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netcan/can.c
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.171 -r1.172 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.194 -r1.195 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.122 -r1.123 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.165 -r1.166 src/sys/netinet6/raw_ip6.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/ddp_input.c
diff -u src/sys/netatalk/ddp_input.c:1.30 src/sys/netatalk/ddp_input.c:1.31
--- src/sys/netatalk/ddp_input.c:1.30	Sat Feb 17 19:10:18 2018
+++ src/sys/netatalk/ddp_input.c	Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ddp_input.c,v 1.30 2018/02/17 19:10:18 rjs Exp $	 */
+/*	$NetBSD: ddp_input.c,v 1.31 2018/03/21 14:23:54 roy Exp $	 */
 
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.30 2018/02/17 19:10:18 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.31 2018/03/21 14:23:54 roy Exp $");
 #include "opt_atalk.h"
 
 #include 
@@ -316,6 +316,7 @@ ddp_input(struct mbuf *m, struct ifnet *
 	if (sbappendaddr(>ddp_socket->so_rcv, (struct sockaddr *) & from,
 			 m, (struct mbuf *) 0) == 0) {
 		DDP_STATINC(DDP_STAT_NOSOCKSPACE);
+		soroverflow(ddp->ddp_socket);
 		m_freem(m);
 		return;
 	}

Index: src/sys/netcan/can.c
diff -u src/sys/netcan/can.c:1.2 src/sys/netcan/can.c:1.3
--- src/sys/netcan/can.c:1.2	Sat May 27 21:02:56 2017
+++ src/sys/netcan/can.c	Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: can.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $	*/
+/*	$NetBSD: can.c,v 1.3 2018/03/21 14:23:54 roy Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.3 2018/03/21 14:23:54 roy Exp $");
 
 #include 
 #include 
@@ -397,6 +397,7 @@ canintr(void)
 			if (sbappendaddr(>canp_socket->so_rcv,
 	 (struct sockaddr *) , mc,
 	 (struct mbuf *) 0) == 0) {
+soroverflow(canp->canp_socket);
 m_freem(mc);
 			} else
 sorwakeup(canp->canp_socket);

Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.154 src/sys/netinet/ip_mroute.c:1.155
--- src/sys/netinet/ip_mroute.c:1.154	Fri Feb  9 08:03:33 2018
+++ src/sys/netinet/ip_mroute.c	Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_mroute.c,v 1.154 2018/02/09 08:03:33 maxv Exp $	*/
+/*	$NetBSD: ip_mroute.c,v 1.155 2018/03/21 14:23:54 roy Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.154 2018/02/09 08:03:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.155 2018/03/21 14:23:54 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1244,6 +1244,7 @@ socket_send(struct socket *s, struct mbu
 			sorwakeup(s);
 			return 0;
 		}
+		soroverflow(s);
 	}
 	m_freem(mm);
 	return -1;

Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.171 src/sys/netinet/raw_ip.c:1.172
--- src/sys/netinet/raw_ip.c:1.171	Wed Feb 28 11:23:24 2018
+++ src/sys/netinet/raw_ip.c	Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.171 2018/02/28 11:23:24 maxv Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.172 2018/03/21 14:23:54 roy Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.171 2018/02/28 11:23:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.172 2018/03/21 14:23:54 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -146,7 +146,7 @@ rip_sbappendaddr(struct inpcb *last, str
 	|| SOOPT_TIMESTAMP(last->inp_socket->so_options))
 		ip_savecontrol(last, , ip, n);
 	if (sbappendaddr(>inp_socket->so_rcv, sa, n, opts) == 0) {
-		/* should notify about lost packet */
+		soroverflow(last->inp_socket);
 		m_freem(n);
 		if (opts)
 			m_freem(opts);

Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.223 src/sys/netinet6/icmp6.c:1.224
--- src/sys/netinet6/icmp6.c:1.223	Wed Feb 28 11:23:24 2018
+++ src/sys/netinet6/icmp6.c	Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: icmp6.c,v 1.223 2018/02/28 11:23:24 maxv Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.224 2018/03/21 14:23:54 roy Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 

CVS commit: src/tests/lib/libc/sys

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Wed Mar 21 12:37:12 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_recvmmsg.c

Log Message:
Handle ENOBUFS when receiving messages.
Don't send messages if the receiver has died.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_recvmmsg.c

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

Modified files:

Index: src/tests/lib/libc/sys/t_recvmmsg.c
diff -u src/tests/lib/libc/sys/t_recvmmsg.c:1.1 src/tests/lib/libc/sys/t_recvmmsg.c:1.2
--- src/tests/lib/libc/sys/t_recvmmsg.c:1.1	Fri Jun 22 18:45:23 2012
+++ src/tests/lib/libc/sys/t_recvmmsg.c	Wed Mar 21 12:37:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_recvmmsg.c,v 1.1 2012/06/22 18:45:23 christos Exp $	*/
+/*	$NetBSD: t_recvmmsg.c,v 1.2 2018/03/21 12:37:12 roy Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: t_recvmmsg.c,v 1.1 2012/06/22 18:45:23 christos Exp $");
+__RCSID("$NetBSD: t_recvmmsg.c,v 1.2 2018/03/21 12:37:12 roy Exp $");
 
 #include 
 #include 
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: t_recvmmsg.c,v 1.1 201
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -57,7 +58,14 @@ __RCSID("$NetBSD: t_recvmmsg.c,v 1.1 201
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 static int debug;
+static volatile sig_atomic_t rdied;
 
+static void
+handle_sigchld(__unused int pid)
+{
+
+	rdied = 1;
+}
 
 ATF_TC(recvmmsg_basic);
 ATF_TC_HEAD(recvmmsg_basic, tc)
@@ -75,7 +83,9 @@ ATF_TC_BODY(recvmmsg_basic, tc)
 	int status;
 	off_t off;
 	uint8_t DGRAM[1316] = { 0, 2, 3, 4, 5, 6, 7, 8, 9, };
-	
+	struct sigaction sa;
+	ssize_t overf = 0;
+
 	error = socketpair(AF_UNIX, SOCK_DGRAM, 0, fd);
 	ATF_REQUIRE_MSG(error != -1, "socketpair failed (%s)", strerror(errno));
 
@@ -98,6 +108,14 @@ ATF_TC_BODY(recvmmsg_basic, tc)
 		mmsghdr[n].msg_hdr.msg_namelen = 0;
 	}
 
+	memset(, 0, sizeof(sa));
+	sa.sa_flags = SA_RESTART;
+	sa.sa_handler = _sigchld;
+	sigemptyset(_mask);
+	error = sigaction(SIGCHLD, , 0);
+	ATF_REQUIRE_MSG(error != -1, "sigaction failed (%s)",
+	strerror(errno));
+
 	switch (fork()) {
 	case -1:
 		ATF_REQUIRE_MSG(0, "fork failed (%s)", strerror(errno));
@@ -112,6 +130,13 @@ ATF_TC_BODY(recvmmsg_basic, tc)
 			struct timespec ts = { 1, 0 };
 			cnt = recvmmsg(fd[1], mmsghdr, min(mmsgcnt, n),
 			MSG_WAITALL, );
+			if (cnt == -1 && errno == ENOBUFS) {
+overf++;
+if (debug)
+	printf("receive buffer overflowed"
+	" (%zu)\n",overf);
+continue;
+			}
 			ATF_REQUIRE_MSG(cnt != -1, "recvmmsg failed (%s)",
 			strerror(errno));
 			ATF_REQUIRE_MSG(cnt != 0, "recvmmsg timeout");
@@ -138,16 +163,19 @@ ATF_TC_BODY(recvmmsg_basic, tc)
 printf("sending packet %u/%u...\n", (n+1),
 NPKTS);
 			do {
+if (rdied)
+	break;
 DGRAM[0] = n;
 error = send(fd[0], DGRAM, sizeof(DGRAM), 0);
 			} while (error == -1 && errno == ENOBUFS);
-			if (error == -1)
-ATF_REQUIRE_MSG(error != -1, "send failed (%s)",
-strerror(errno));
+			ATF_REQUIRE_MSG(error != -1, "send failed (%s)",
+			strerror(errno));
 		}
 		error = wait();
 		ATF_REQUIRE_MSG(error != -1, "wait failed (%s)",
 		strerror(errno));
+		ATF_REQUIRE_MSG(WIFEXITED(status) && WEXITSTATUS(status) == 0,
+		"receiver died");
 		break;
 	}
 }

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 12:19:31 UTC 2018

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

Log Message:
Tickets #1579, #1580, #1582, #1584 - #1588


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.78 -r1.1.2.79 src/doc/CHANGES-7.2

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

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.78 src/doc/CHANGES-7.2:1.1.2.79
--- src/doc/CHANGES-7.2:1.1.2.78	Sat Mar 10 16:12:24 2018
+++ src/doc/CHANGES-7.2	Wed Mar 21 12:19:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.78 2018/03/10 16:12:24 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.79 2018/03/21 12:19:30 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5307,3 +5307,58 @@ etc/namedb/bind.keys1.2
 	https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
 	[maya, ticket #1583]
 
+sys/dev/ppbus/if_plip.c1.28
+
+	Fix an spl(9) leak.
+	[msaitoh, ticket #1579]
+
+share/man/man4/altq.41.3
+
+	Update URL for the cited paper.
+	[sevan, ticket #1580]
+
+sys/sys/bitops.h1.12-1.14
+
+	Fix sign issues.
+	Avoid undefined behaviour when a left shift may be greater than
+	the size of the bitmap type.
+	[mrg, ticket #1582]
+
+usr.sbin/sysinst/arch/sgimips/md.c		1.4
+
+	Official builds now append the "reproducable build timestamp"
+	to the kernel config name, adjust kernel name matching
+	to deal with this.
+	[jmcneill, ticket #1584]
+
+sys/arch/sparc/include/cpu.h			1.99 (via patch, -> cpuvar.h)
+sys/arch/sparc/sparc/cpu.c			1.250 (via patch)
+sys/arch/sparc/sparc/intr.c			1.119 (via patch)
+
+	- return early in xcall() if the function is sparc_noop() instead
+	  of triggering the IPI and then ignoring responses (or lack thereof)
+	- write the .tag field last to avoid a race when polling for an
+	  incoming IPI
+	- add event counters for IPIs being caught with the mutex not held,
+	   and for messages that are already marked as completed
+	[mrg, ticket #1585]
+
+sys/dev/ic/cs4215reg.h1.5
+sys/dev/sbus/dbri.c1.36-1.38
+sys/dev/sbus/dbrivar.h1.14-1.15
+
+	Make audio work again on some sparc machines.
+	[mrg, ticket #1586]
+
+usr.bin/m4/eval.c1.25-1.26
+
+	Missing argument check caused m4 to core in ifelse().
+	[mrg, ticket #1587]
+
+usr.bin/audiocfg/audiodev.c			(patch)
+
+	Make 'audiocfg list' work even if /dev/audio is in use.
+	(This change is not necessary on newer branches due to the
+	in-kernel audio mixer)
+	[mrg, ticket #1588]
+

CVS commit: [netbsd-7] src/usr.bin/audiocfg

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 12:13:31 UTC 2018

Modified Files:
src/usr.bin/audiocfg [netbsd-7]: audiodev.c

Log Message:
Apply patch, requested by mrg in ticket #1588:

Try to open the audio path with O_WRONLY if O_RDWR fails.
This makes 'audiocfg list' work in more places.

(no longer necessary in -current with the in kernel mixer.)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/usr.bin/audiocfg/audiodev.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.bin/audiocfg/audiodev.c
diff -u src/usr.bin/audiocfg/audiodev.c:1.5 src/usr.bin/audiocfg/audiodev.c:1.5.4.1
--- src/usr.bin/audiocfg/audiodev.c:1.5	Sun Aug 11 06:31:00 2013
+++ src/usr.bin/audiocfg/audiodev.c	Wed Mar 21 12:13:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodev.c,v 1.5 2013/08/11 06:31:00 dholland Exp $ */
+/* $NetBSD: audiodev.c,v 1.5.4.1 2018/03/21 12:13:30 martin Exp $ */
 
 /*
  * Copyright (c) 2010 Jared D. McNeill 
@@ -89,8 +89,11 @@ audiodev_getinfo(struct audiodev *adev)
 		adev->defaultdev = true;
 
 	adev->fd = open(adev->path, O_RDWR);
-	if (adev->fd == -1)
-		return -1;
+	if (adev->fd == -1) {
+		adev->fd = open(adev->path, O_WRONLY);
+		if (adev->fd == -1)
+			return -1;
+	}
 	if (ioctl(adev->fd, AUDIO_GETDEV, >audio_device) == -1) {
 		close(adev->fd);
 		return -1;

CVS commit: [netbsd-7] src/usr.bin/m4

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 12:08:43 UTC 2018

Modified Files:
src/usr.bin/m4 [netbsd-7]: eval.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1587):
usr.bin/m4/eval.c: revision 1.25
usr.bin/m4/eval.c: revision 1.26
PR/52638: matthew green: missing argument check causes m4 to core in ifelse()

remove the braces I accidentally added.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.20.1 src/usr.bin/m4/eval.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.bin/m4/eval.c
diff -u src/usr.bin/m4/eval.c:1.22 src/usr.bin/m4/eval.c:1.22.20.1
--- src/usr.bin/m4/eval.c:1.22	Sun Aug 21 23:38:43 2011
+++ src/usr.bin/m4/eval.c	Wed Mar 21 12:08:43 2018
@@ -1,5 +1,5 @@
 /*	$OpenBSD: eval.c,v 1.66 2008/08/21 21:01:47 espie Exp $	*/
-/*	$NetBSD: eval.c,v 1.22 2011/08/21 23:38:43 dholland Exp $	*/
+/*	$NetBSD: eval.c,v 1.22.20.1 2018/03/21 12:08:43 martin Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include 
-__RCSID("$NetBSD: eval.c,v 1.22 2011/08/21 23:38:43 dholland Exp $");
+__RCSID("$NetBSD: eval.c,v 1.22.20.1 2018/03/21 12:08:43 martin Exp $");
 
 #include 
 #include 
@@ -687,6 +687,8 @@ static void
 doifelse(const char *argv[], int argc)
 {
 	cycle {
+		if (argc < 5)
+			m4errx(1, "wrong number of args for ifelse");
 		if (STREQ(argv[2], argv[3]))
 			pbstr(argv[4]);
 		else if (argc == 6)

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 12:04:35 UTC 2018

Modified Files:
src/sys/dev/ic [netbsd-7]: cs4215reg.h
src/sys/dev/sbus [netbsd-7]: dbri.c dbrivar.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1586):
sys/dev/sbus/dbrivar.h: revision 1.14
sys/dev/sbus/dbrivar.h: revision 1.15
sys/dev/ic/cs4215reg.h: revision 1.5
sys/dev/sbus/dbri.c: revision 1.36
sys/dev/sbus/dbri.c: revision 1.37
sys/dev/sbus/dbri.c: revision 1.38

fix audiomp bugs:
- switch from tsleep/wakeup to condvar
- fix locking in a bunch of places.  there were several locking
  against myself issues.
also:
- don't let dbri_process_interrupt_buffer() loop more than once
  over the array of intrs.

this fixes hangs when using audio on ss20 in -current, but does
not make audio work.  it eventually times out with eg:
dbri0: switching to control mode timed out (0 f6)
and may leave a sample in the audio buffer repeating.

overhaul the dbri driver and make it work again in the New Order Of Things
- fix switching between control and data mode
- make sure interrupts can happen in control mode
- implement audioif.commit_settings()
- switch to control mode only if needed - for changes in sample rate or format
  but not for things like volume control
should fix PR 52786

fix several KASSERT()s and locking in a few places.

fixes DIAGNOSTIC kernels and still plays.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.62.1 src/sys/dev/ic/cs4215reg.h
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/sbus/dbri.c
cvs rdiff -u -r1.13 -r1.13.24.1 src/sys/dev/sbus/dbrivar.h

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

Modified files:

Index: src/sys/dev/ic/cs4215reg.h
diff -u src/sys/dev/ic/cs4215reg.h:1.4 src/sys/dev/ic/cs4215reg.h:1.4.62.1
--- src/sys/dev/ic/cs4215reg.h:1.4	Mon May  5 00:21:47 2008
+++ src/sys/dev/ic/cs4215reg.h	Wed Mar 21 12:04:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4215reg.h,v 1.4 2008/05/05 00:21:47 jmcneill Exp $	*/
+/*	$NetBSD: cs4215reg.h,v 1.4.62.1 2018/03/21 12:04:35 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 Jared D. McNeill 
@@ -30,7 +30,7 @@
 /* time slot 1: status register */
 #define	CS4215_CLB	(1<<2)	/* control latch bit */
 #define	CS4215_MLB	(1<<4)	/* 1: mic: 20 dB gain disabled */
-#define	CS4215_RSRVD_1	(1<<5)
+#define	CS4215_ONE	(1<<5)	/* always one */
 
 /* time slot 2: data format register */
 #define	CS4215_DFR_LINEAR16	0

Index: src/sys/dev/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.35 src/sys/dev/sbus/dbri.c:1.35.4.1
--- src/sys/dev/sbus/dbri.c:1.35	Sat Oct 19 21:00:32 2013
+++ src/sys/dev/sbus/dbri.c	Wed Mar 21 12:04:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbri.c,v 1.35 2013/10/19 21:00:32 mrg Exp $	*/
+/*	$NetBSD: dbri.c,v 1.35.4.1 2018/03/21 12:04:35 martin Exp $	*/
 
 /*
  * Copyright (C) 1997 Rudolf Koenig (rfkoe...@immd4.informatik.uni-erlangen.de)
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.35 2013/10/19 21:00:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.35.4.1 2018/03/21 12:04:35 martin Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -165,6 +165,7 @@ static void	dbri_set_power(struct dbri_s
 static void	dbri_bring_up(struct dbri_softc *);
 static bool	dbri_suspend(device_t, const pmf_qual_t *);
 static bool	dbri_resume(device_t, const pmf_qual_t *);
+static int	dbri_commit(void *);
 
 /* stupid support routines */
 static uint32_t	reverse_bytes(uint32_t, int);
@@ -195,6 +196,7 @@ struct audio_hw_if dbri_hw_if = {
 	.trigger_output		= dbri_trigger_output,
 	.trigger_input		= dbri_trigger_input,
 	.get_locks		= dbri_get_locks,
+	.commit_settings	= dbri_commit,
 };
 
 CFATTACH_DECL_NEW(dbri, sizeof(struct dbri_softc),
@@ -277,6 +279,8 @@ dbri_attach_sbus(device_t parent, device
 	sc->sc_dmat = sa->sa_dmatag;
 	sc->sc_powerstate = 1;
 
+	sc->sc_whack_codec = 0;
+
 	pwr = prom_getpropint(sa->sa_node,"pwr-on-auxio",0);
 	aprint_normal(": rev %s\n", ver);
 
@@ -365,9 +369,13 @@ dbri_attach_sbus(device_t parent, device
 	sc->sc_bufsiz = size;
 
 	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
-	mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+
+#ifndef DBRI_SPIN
+	cv_init(>sc_cv, "dbricv");
+#endif
 
-	bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_SCHED, dbri_intr,
+	bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_AUDIO, dbri_intr,
 	sc);
 
 	sc->sc_locked = 0;
@@ -444,23 +452,32 @@ dbri_config_interrupts(device_t dev)
 {
 	struct dbri_softc *sc = device_private(dev);
 
-	if (sc->sc_init_done != 0)
+	mutex_spin_enter(>sc_intr_lock);
+	if (sc->sc_init_done != 0) {
+		mutex_spin_exit(>sc_intr_lock);
 		return 0;
-
+	}
 	sc->sc_init_done = 1;
 
 	dbri_init(sc);
+
+	/* talking to the codec needs working interrupts */
 	if (mmcodec_init(sc) == -1) {
+		mutex_spin_exit(>sc_intr_lock);
 		

CVS commit: [netbsd-7] src/sys/arch/sparc/sparc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:54:47 UTC 2018

Modified Files:
src/sys/arch/sparc/sparc [netbsd-7]: cpuvar.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1585):

sys/arch/sparc/include/cpu.h: revision 1.99 (patch -> cpuvar.h)

- return early in xcall() if the function is sparc_noop() instead of triggering
  the IPI and then ignoring responses ( or lack thereof )
- write the .tag field last to avoid a race when polling for an incoming
  IPI
- add event counters for IPIs being caught with the mutex not held, and for
  messages that are already marked as completed

With this my SS20 made it through 48 hours of pkgsrc with MAKE_JOBS=3 and a
pair of SM81s.

Hypersparcs still crash but instead of craziness we get actual error messages,
apparently one CPU will occasionally do a watchdog reset, which according to
the manual is caused by catching a trap with traps disabled. Now to figure
out how that can even happen...

[file accidently missed in previous commit]


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.4.1 src/sys/arch/sparc/sparc/cpuvar.h

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

Modified files:

Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.92 src/sys/arch/sparc/sparc/cpuvar.h:1.92.4.1
--- src/sys/arch/sparc/sparc/cpuvar.h:1.92	Sat Nov 16 23:54:01 2013
+++ src/sys/arch/sparc/sparc/cpuvar.h	Wed Mar 21 11:54:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuvar.h,v 1.92 2013/11/16 23:54:01 mrg Exp $ */
+/*	$NetBSD: cpuvar.h,v 1.92.4.1 2018/03/21 11:54:47 martin Exp $ */
 
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@ struct cpu_info {
 	 * the pending register to avoid a hardware bug.
 	 */
 #define raise_ipi(cpi,lvl)	do {			\
-	int x;		\
+	volatile int x;	\
 	(cpi)->intreg_4m->pi_set = PINTR_SINTRLEV(lvl);	\
 	x = (cpi)->intreg_4m->pi_pend; __USE(x);	\
 } while (0)
@@ -340,6 +340,8 @@ struct cpu_info {
 	struct evcnt ci_savefpstate_null;
 	struct evcnt ci_xpmsg_mutex_fail;
 	struct evcnt ci_xpmsg_mutex_fail_call;
+	struct evcnt ci_xpmsg_mutex_not_held;
+	struct evcnt ci_xpmsg_bogus;
 	struct evcnt ci_intrcnt[16];
 	struct evcnt ci_sintrcnt[16];
 };

CVS commit: [netbsd-7] src/sys/arch/sparc/sparc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:52:50 UTC 2018

Modified Files:
src/sys/arch/sparc/sparc [netbsd-7]: cpu.c intr.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1585):
sys/arch/sparc/sparc/cpu.c: revision 1.250 (patch)
sys/arch/sparc/include/cpu.h: revision 1.99 (patch -> cpuvar.h)
sys/arch/sparc/sparc/intr.c: revision 1.119 (patch)

- return early in xcall() if the function is sparc_noop() instead of triggering
  the IPI and then ignoring responses ( or lack thereof )
- write the .tag field last to avoid a race when polling for an incoming
  IPI
- add event counters for IPIs being caught with the mutex not held, and for
  messages that are already marked as completed

With this my SS20 made it through 48 hours of pkgsrc with MAKE_JOBS=3 and a
pair of SM81s.

Hypersparcs still crash but instead of craziness we get actual error messages,
apparently one CPU will occasionally do a watchdog reset, which according to
the manual is caused by catching a trap with traps disabled. Now to figure
out how that can even happen...


To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.248.2.1 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.118 -r1.118.4.1 src/sys/arch/sparc/sparc/intr.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/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.248 src/sys/arch/sparc/sparc/cpu.c:1.248.2.1
--- src/sys/arch/sparc/sparc/cpu.c:1.248	Fri Jul 25 17:21:32 2014
+++ src/sys/arch/sparc/sparc/cpu.c	Wed Mar 21 11:52:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.248 2014/07/25 17:21:32 nakayama Exp $ */
+/*	$NetBSD: cpu.c,v 1.248.2.1 2018/03/21 11:52:49 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.248 2014/07/25 17:21:32 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.248.2.1 2018/03/21 11:52:49 martin Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
@@ -183,7 +183,7 @@ int go_smp_cpus = 0;	/* non-primary CPUs
  * This must be locked around all message transactions to ensure only
  * one CPU is generating them.
  */
-static kmutex_t xpmsg_mutex;
+kmutex_t xpmsg_mutex;
 
 #endif /* MULTIPROCESSOR */
 
@@ -367,6 +367,10 @@ cpu_init_evcnt(struct cpu_info *cpi)
 			 NULL, cpu_name(cpi), "IPI mutex_trylock fail");
 	evcnt_attach_dynamic(>ci_xpmsg_mutex_fail_call, EVCNT_TYPE_MISC,
 			 NULL, cpu_name(cpi), "IPI mutex_trylock fail/call");
+	evcnt_attach_dynamic(>ci_xpmsg_mutex_not_held, EVCNT_TYPE_MISC,
+			 NULL, cpu_name(cpi), "IPI with mutex not held");
+	evcnt_attach_dynamic(>ci_xpmsg_bogus, EVCNT_TYPE_MISC,
+			 NULL, cpu_name(cpi), "bogus IPI");
 
 	/*
 	 * These are the per-cpu per-IPL hard & soft interrupt counters.
@@ -653,6 +657,8 @@ xcall(xcall_func_t func, xcall_trap_t tr
 	char *bufp = errbuf;
 	size_t bufsz = sizeof errbuf, wrsz;
 
+	if (is_noop) return;
+
 	mybit = (1 << cpuinfo.ci_cpuid);
 	callself = func && (cpuset & mybit) != 0;
 	cpuset &= ~mybit;
@@ -714,7 +720,10 @@ xcall(xcall_func_t func, xcall_trap_t tr
 		if ((cpuset & (1 << n)) == 0)
 			continue;
 
-		cpi->msg.tag = XPMSG_FUNC;
+		/*
+		 * Write msg.tag last - if another CPU is polling above it may
+		 * end up seeing an incomplete message. Not likely but still.
+		 */ 
 		cpi->msg.complete = 0;
 		p = >msg.u.xpmsg_func;
 		p->func = func;
@@ -722,6 +731,9 @@ xcall(xcall_func_t func, xcall_trap_t tr
 		p->arg0 = arg0;
 		p->arg1 = arg1;
 		p->arg2 = arg2;
+		__insn_barrier();
+		cpi->msg.tag = XPMSG_FUNC;
+		__insn_barrier();
 		/* Fast cross calls use interrupt level 14 */
 		raise_ipi(cpi,13+fasttrap);/*xcall_cookie->pil*/
 	}
@@ -737,7 +749,7 @@ xcall(xcall_func_t func, xcall_trap_t tr
 	 * have completed (bailing if it takes "too long", being loud about
 	 * this in the process).
 	 */
-	done = is_noop;
+	done = 0;
 	i = 100;	/* time-out, not too long, but still an _AGE_ */
 	while (!done) {
 		if (--i < 0) {
@@ -774,7 +786,7 @@ xcall(xcall_func_t func, xcall_trap_t tr
 
 	if (i >= 0 || debug_xcall == 0) {
 		if (i < 0)
-			printf_nolog("%s\n", errbuf);
+			aprint_error("%s\n", errbuf);
 		mutex_spin_exit(_mutex);
 		return;
 	}

Index: src/sys/arch/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.118 src/sys/arch/sparc/sparc/intr.c:1.118.4.1
--- src/sys/arch/sparc/sparc/intr.c:1.118	Sat Nov 16 23:54:01 2013
+++ src/sys/arch/sparc/sparc/intr.c	Wed Mar 21 11:52:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.118 2013/11/16 23:54:01 mrg Exp $ */
+/*	$NetBSD: intr.c,v 1.118.4.1 2018/03/21 11:52:49 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.118 2013/11/16 23:54:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.118.4.1 2018/03/21 11:52:49 martin Exp $");
 
 #include 

CVS commit: [netbsd-7] src/usr.sbin/sysinst/arch/sgimips

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:42:17 UTC 2018

Modified Files:
src/usr.sbin/sysinst/arch/sgimips [netbsd-7]: md.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1584):
usr.sbin/sysinst/arch/sgimips/md.c: revision 1.4
Official builds now append a timestamp to the kernel config name, so we
can no longer rely on matching an exact name like "(INSTALL32_IP3x)".
Strip the trailing ) from the version strings checked so sysinst will
install the correct bootloader and kernel again.


To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/arch/sgimips/md.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/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.1 src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.2
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.2.4.1	Sun Jan 11 04:32:39 2015
+++ src/usr.sbin/sysinst/arch/sgimips/md.c	Wed Mar 21 11:42:17 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.2.4.1 2015/01/11 04:32:39 snj Exp $	*/
+/*	$NetBSD: md.c,v 1.2.4.2 2018/03/21 11:42:17 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -68,11 +68,11 @@ md_init_set_status(int flags)
  * enable the installation of the corresponding GENERIC kernel.
  */
 uname();
-if (strstr(instsys.version, "(INSTALL32_IP3x)"))
+if (strstr(instsys.version, "(INSTALL32_IP3x"))
 set_kernel_set(SET_KERNEL_2);
-else if (strstr(instsys.version, "(INSTALL32_IP2x)"))
+else if (strstr(instsys.version, "(INSTALL32_IP2x"))
 set_kernel_set(SET_KERNEL_1);
-	else if (strstr(instsys.version, "(GENERIC32_IP12)"))
+	else if (strstr(instsys.version, "(GENERIC32_IP12"))
 		set_kernel_set(SET_KERNEL_3);
 }
 
@@ -156,12 +156,12 @@ md_pre_disklabel(void)
 int
 md_post_disklabel(void)
 {
-if (strstr(instsys.version, "(INSTALL32_IP3x)"))
+if (strstr(instsys.version, "(INSTALL32_IP3x"))
 		return run_program(RUN_DISPLAY,
 		"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
 		pm->diskdev);
 
-	if (strstr(instsys.version, "(INSTALL32_IP2x)")) {
+	if (strstr(instsys.version, "(INSTALL32_IP2x")) {
 		run_program(RUN_DISPLAY,
 		  "%s %s", "/usr/mdec/sgivol -f -w aoutboot /usr/mdec/aoutboot",
 		  pm->diskdev);
@@ -198,7 +198,7 @@ md_cleanup_install(void)
 	enable_rc_conf();
 #endif
 
-	if (strstr(instsys.version, "(GENERIC32_IP12)"))
+	if (strstr(instsys.version, "(GENERIC32_IP12"))
 		run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
 			target_expand("/netbsd.ecoff"), pm->diskdev);
 }

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:11:29 UTC 2018

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

Log Message:
Ticket #158


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

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.94 src/doc/CHANGES-7.0.3:1.1.2.95
--- src/doc/CHANGES-7.0.3:1.1.2.94	Wed Mar 21 08:11:25 2018
+++ src/doc/CHANGES-7.0.3	Wed Mar 21 11:11:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.94 2018/03/21 08:11:25 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.95 2018/03/21 11:11:29 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5323,3 +5323,10 @@ sys/dev/ppbus/if_plip.c1.28
 	Fix an spl(9) leak.
 	[msaitoh, ticket #1579]
 
+sys/sys/bitops.h1.12-1.14
+
+	Fix sign issues.
+	Avoid undefined behaviour when a left shift may be greater than
+	the size of the bitmap type.
+	[mrg, ticket #1582]
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:10:57 UTC 2018

Modified Files:
src/sys/sys [netbsd-7-0]: bitops.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1582):
sys/sys/bitops.h: revision 1.12
sys/sys/bitops.h: revision 1.13
sys/sys/bitops.h: revision 1.14
fix sign issues

use 1ul for a left shift that may be greater than int sized.
noticed by martin.
fixes PR#53081.

PR/53081: Fix size of the shift to depend on the type of the bitmap so that
we get the correct width.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.16.1 src/sys/sys/bitops.h

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

Modified files:

Index: src/sys/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.11 src/sys/sys/bitops.h:1.11.16.1
--- src/sys/sys/bitops.h:1.11	Fri Dec  7 02:27:58 2012
+++ src/sys/sys/bitops.h	Wed Mar 21 11:10:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bitops.h,v 1.11 2012/12/07 02:27:58 christos Exp $	*/
+/*	$NetBSD: bitops.h,v 1.11.16.1 2018/03/21 11:10:57 martin Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -271,8 +271,8 @@ fast_divide32_prepare(uint32_t _div, uin
 	_l = fls32(_div - 1);
 	_mt = (uint64_t)(0x1ULL * ((1ULL << _l) - _div));
 	*_m = (uint32_t)(_mt / _div + 1);
-	*_s1 = (_l > 1) ? 1 : _l;
-	*_s2 = (_l == 0) ? 0 : _l - 1;
+	*_s1 = (_l > 1) ? 1U : (uint8_t)_l;
+	*_s2 = (_l == 0) ? 0 : (uint8_t)(_l - 1);
 }
 
 /* ARGSUSED */
@@ -304,7 +304,7 @@ fast_remainder32(uint32_t _v, uint32_t _
 #define __BITMAP_SIZE(__t, __n) \
 (((__n) + (__BITMAP_BITS(__t) - 1)) / __BITMAP_BITS(__t))
 #define __BITMAP_BIT(__n, __v) \
-(1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
+((__typeof__((__v)->_b[0]))1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
 #define __BITMAP_WORD(__n, __v) \
 ((__n) >> __BITMAP_SHIFT(*(__v)->_b))
 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:09:50 UTC 2018

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

Log Message:
Ticket #1582


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-7.1.3

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

Modified files:

Index: src/doc/CHANGES-7.1.3
diff -u src/doc/CHANGES-7.1.3:1.1.2.1 src/doc/CHANGES-7.1.3:1.1.2.2
--- src/doc/CHANGES-7.1.3:1.1.2.1	Tue Mar 20 17:49:24 2018
+++ src/doc/CHANGES-7.1.3	Wed Mar 21 11:09:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.3,v 1.1.2.1 2018/03/20 17:49:24 martin Exp $
+# $NetBSD: CHANGES-7.1.3,v 1.1.2.2 2018/03/21 11:09:49 martin Exp $
 
 A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3
 release:
@@ -15,3 +15,10 @@ sys/dev/ppbus/if_plip.c1.28
 	Fix an spl(9) leak.
 	[msaitoh, ticket #1579]
 
+sys/sys/bitops.h1.12-1.14
+
+	Fix sign issues.
+	Avoid undefined behaviour when a left shift may be greater than
+	the size of the bitmap type.
+	[mrg, ticket #1582]
+

CVS commit: [netbsd-7-1] src/sys/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:09:27 UTC 2018

Modified Files:
src/sys/sys [netbsd-7-1]: bitops.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1582):
sys/sys/bitops.h: revision 1.12
sys/sys/bitops.h: revision 1.13
sys/sys/bitops.h: revision 1.14
fix sign issues

use 1ul for a left shift that may be greater than int sized.
noticed by martin.
fixes PR#53081.

PR/53081: Fix size of the shift to depend on the type of the bitmap so that
we get the correct width.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.22.1 src/sys/sys/bitops.h

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

Modified files:

Index: src/sys/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.11 src/sys/sys/bitops.h:1.11.22.1
--- src/sys/sys/bitops.h:1.11	Fri Dec  7 02:27:58 2012
+++ src/sys/sys/bitops.h	Wed Mar 21 11:09:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bitops.h,v 1.11 2012/12/07 02:27:58 christos Exp $	*/
+/*	$NetBSD: bitops.h,v 1.11.22.1 2018/03/21 11:09:27 martin Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -271,8 +271,8 @@ fast_divide32_prepare(uint32_t _div, uin
 	_l = fls32(_div - 1);
 	_mt = (uint64_t)(0x1ULL * ((1ULL << _l) - _div));
 	*_m = (uint32_t)(_mt / _div + 1);
-	*_s1 = (_l > 1) ? 1 : _l;
-	*_s2 = (_l == 0) ? 0 : _l - 1;
+	*_s1 = (_l > 1) ? 1U : (uint8_t)_l;
+	*_s2 = (_l == 0) ? 0 : (uint8_t)(_l - 1);
 }
 
 /* ARGSUSED */
@@ -304,7 +304,7 @@ fast_remainder32(uint32_t _v, uint32_t _
 #define __BITMAP_SIZE(__t, __n) \
 (((__n) + (__BITMAP_BITS(__t) - 1)) / __BITMAP_BITS(__t))
 #define __BITMAP_BIT(__n, __v) \
-(1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
+((__typeof__((__v)->_b[0]))1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
 #define __BITMAP_WORD(__n, __v) \
 ((__n) >> __BITMAP_SHIFT(*(__v)->_b))
 

CVS commit: [netbsd-7] src/sys/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:08:05 UTC 2018

Modified Files:
src/sys/sys [netbsd-7]: bitops.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1582):
sys/sys/bitops.h: revision 1.12
sys/sys/bitops.h: revision 1.13
sys/sys/bitops.h: revision 1.14
fix sign issues

use 1ul for a left shift that may be greater than int sized.
noticed by martin.
fixes PR#53081.

PR/53081: Fix size of the shift to depend on the type of the bitmap so that
we get the correct width.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.12.1 src/sys/sys/bitops.h

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

Modified files:

Index: src/sys/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.11 src/sys/sys/bitops.h:1.11.12.1
--- src/sys/sys/bitops.h:1.11	Fri Dec  7 02:27:58 2012
+++ src/sys/sys/bitops.h	Wed Mar 21 11:08:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bitops.h,v 1.11 2012/12/07 02:27:58 christos Exp $	*/
+/*	$NetBSD: bitops.h,v 1.11.12.1 2018/03/21 11:08:05 martin Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -271,8 +271,8 @@ fast_divide32_prepare(uint32_t _div, uin
 	_l = fls32(_div - 1);
 	_mt = (uint64_t)(0x1ULL * ((1ULL << _l) - _div));
 	*_m = (uint32_t)(_mt / _div + 1);
-	*_s1 = (_l > 1) ? 1 : _l;
-	*_s2 = (_l == 0) ? 0 : _l - 1;
+	*_s1 = (_l > 1) ? 1U : (uint8_t)_l;
+	*_s2 = (_l == 0) ? 0 : (uint8_t)(_l - 1);
 }
 
 /* ARGSUSED */
@@ -304,7 +304,7 @@ fast_remainder32(uint32_t _v, uint32_t _
 #define __BITMAP_SIZE(__t, __n) \
 (((__n) + (__BITMAP_BITS(__t) - 1)) / __BITMAP_BITS(__t))
 #define __BITMAP_BIT(__n, __v) \
-(1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
+((__typeof__((__v)->_b[0]))1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
 #define __BITMAP_WORD(__n, __v) \
 ((__n) >> __BITMAP_SHIFT(*(__v)->_b))
 

CVS commit: [netbsd-7] src/share/man/man4

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 11:03:45 UTC 2018

Modified Files:
src/share/man/man4 [netbsd-7]: altq.4

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1580):
share/man/man4/altq.4: revision 1.3
Update URL for the cited paper


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.20.1 src/share/man/man4/altq.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/altq.4
diff -u src/share/man/man4/altq.4:1.2 src/share/man/man4/altq.4:1.2.20.1
--- src/share/man/man4/altq.4:1.2	Thu Jun 23 07:47:22 2011
+++ src/share/man/man4/altq.4	Wed Mar 21 11:03:45 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: altq.4,v 1.2 2011/06/23 07:47:22 wiz Exp $
+.\" $NetBSD: altq.4,v 1.2.20.1 2018/03/21 11:03:45 martin Exp $
 .\"
 .\" Copyright (c) 2011 Jukka Ruohonen 
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 22, 2011
+.Dd March 08, 2018
 .Dt ALTQ 4
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ are required in order to use a certain n
 .%D March, 2004
 .%C Taipei, Taiwan
 .%O Asia BSD conference
-.%U http://www.sonycsl.co.jp/~kjc/papers/fittingtheory.pdf
+.%U http://www.sonycsl.co.jp/person/kjc/papers/fittingtheory.pdf
 .Re
 .\" .Sh HISTORY
 .\"

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 10:52:15 UTC 2018

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

Log Message:
Tickets #552 and #648


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.149 -r1.1.2.150 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.149 src/doc/CHANGES-8.0:1.1.2.150
--- src/doc/CHANGES-8.0:1.1.2.149	Tue Mar 20 09:18:49 2018
+++ src/doc/CHANGES-8.0	Wed Mar 21 10:52:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.149 2018/03/20 09:18:49 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.150 2018/03/21 10:52:15 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -10461,3 +10461,50 @@ share/mk/bsd.own.mk1.1051
 	Don't barf if the ctf tools are not installed.
 	[martin, ticket #647]
 
+external/gpl3/gcc{.old}/dist/libsanitizer/asan/asan_linux.cc 1.4
+sys/arch/aarch64/include/mcontext.h 1.2
+sys/arch/alpha/include/mcontext.h   1.9
+sys/arch/amd64/include/mcontext.h   1.19
+sys/arch/arm/include/mcontext.h 1.19
+sys/arch/hppa/include/mcontext.h1.9
+sys/arch/i386/include/mcontext.h1.14
+sys/arch/ia64/include/mcontext.h1.6
+sys/arch/m68k/include/mcontext.h1.10
+sys/arch/mips/include/mcontext.h1.22
+sys/arch/or1k/include/mcontext.h1.2
+sys/arch/powerpc/include/mcontext.h 1.18
+sys/arch/riscv/include/mcontext.h   1.5
+sys/arch/sh3/include/mcontext.h 1.11
+sys/arch/sparc/include/mcontext.h   1.14-1.17
+sys/arch/sparc64/include/mcontext.h 1.10
+sys/arch/vax/include/mcontext.h 1.9
+tests/lib/libc/sys/Makefile 1.50
+tests/lib/libc/sys/t_ucontext.c 1.2-1.5
+sys/arch/hppa/include/mcontext.h		1.10
+sys/arch/ia64/include/mcontext.h		1.7
+
+	- Introduce _UC_MACHINE_FP().  _UC_MACHINE_FP() is a helper
+	  macro to extract from mcontext a frame pointer.
+	- Add new tests in lib/libc/sys/t_ucontext:
+	  * ucontext_sp (testing _UC_MACHINE_SP)
+	  * ucontext_fp (testing _UC_MACHINE_FP)
+	  * ucontext_pc (testing _UC_MACHINE_PC)
+	  * ucontext_intrv (testing _UC_MACHINE_INTRV)
+	Add a dummy implementation of _UC_MACHINE_INTRV() for ia64.
+	Implement _UC_MACHINE_INTRV() for hppa.
+	Make the t_ucontext.c test more portable.
+	We now have _UC_MACHINE_FP.
+	[kamil, ticket #552]
+
+sys/arch/i386/stand/efiboot/boot.c		1.7
+sys/arch/i386/stand/efiboot/devopen.c		1.3
+sys/arch/i386/stand/efiboot/efidisk.c		1.3
+sys/arch/i386/stand/lib/biosdisk.c		1.48
+
+	efiboot:
+	 - fix booting from HDD
+	 - add the "more" pager.
+	 - boot device is always efi_distlist first element.
+	 - fix boot partition lookup.
+	[nonaka, ticket #648]
+

CVS commit: [netbsd-8] src/sys/arch/i386/stand

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 10:50:50 UTC 2018

Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: boot.c devopen.c efidisk.c
src/sys/arch/i386/stand/lib [netbsd-8]: biosdisk.c

Log Message:
Pull up following revision(s) (requested by nonaka in ticket #648):
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.3
sys/arch/i386/stand/efiboot/devopen.c: revision 1.3
sys/arch/i386/stand/efiboot/boot.c: revision 1.7
sys/arch/i386/stand/lib/biosdisk.c: revision 1.48

efiboot: fix it can't boot from HDD.

efiboot: more pager.

efiboot: boot device is always efi_distlist first element.

efiboot: fix to find boot partition process.
NetBSD related partitions with no bootme flag set are also candidates
for boot partition.


To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.1.12.1 -r1.1.12.2 src/sys/arch/i386/stand/efiboot/devopen.c \
src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.46.6.1 -r1.46.6.2 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.1 src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.2
--- src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.1	Tue Mar 13 14:54:52 2018
+++ src/sys/arch/i386/stand/efiboot/boot.c	Wed Mar 21 10:50:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.5.2.1 2018/03/13 14:54:52 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.5.2.2 2018/03/21 10:50:49 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -627,6 +627,12 @@ command_devpath(char *arg)
 			break;
 
 		Print(L"DevicePathType %d\n", DevicePathType(dp0));
+		if (++row >= rows) {
+			row = 0;
+			Print(L"Press Any Key to continue :");
+			(void) awaitkey(-1, 0);
+			Print(L"\n");
+		}
 		for (dp = dp0;
 		 !IsDevicePathEnd(dp);
 		 dp = NextDevicePathNode(dp)) {

Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.1 src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.2
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.1	Tue Mar 13 14:54:52 2018
+++ src/sys/arch/i386/stand/efiboot/devopen.c	Wed Mar 21 10:50:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	 */
+/*	$NetBSD: devopen.c,v 1.1.12.2 2018/03/21 10:50:49 martin Exp $	 */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ dev2bios(char *devname, int unit, int *b
 
 	if (strcmp(devname, "hd") == 0)
 		*biosdev = 0x80 + unit;
-	if (strcmp(devname, "cd") == 0)
+	else if (strcmp(devname, "cd") == 0)
 		*biosdev = 0x80 + get_harddrives() + unit;
 	else
 		return ENXIO;
Index: src/sys/arch/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.1 src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.2
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.1	Tue Mar 13 14:54:52 2018
+++ src/sys/arch/i386/stand/efiboot/efidisk.c	Wed Mar 21 10:50:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: efidisk.c,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	*/
+/*	$NetBSD: efidisk.c,v 1.1.12.2 2018/03/21 10:50:49 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -106,14 +106,11 @@ next:
 	FreePool(handles);
 
 	if (efi_bootdp_type == BIOSDISK_TYPE_CD) {
-		TAILQ_FOREACH(edi, _disklist, list) {
-			if (edi->bootdev) {
-edi = TAILQ_FIRST(_disklist);
-edi->type = BIOSDISK_TYPE_CD;
-TAILQ_REMOVE(_disklist, edi, list);
-TAILQ_INSERT_TAIL(_disklist, edi, list);
-break;
-			}
+		edi = TAILQ_FIRST(_disklist);
+		if (edi != NULL && edi->bootdev) {
+			edi->type = BIOSDISK_TYPE_CD;
+			TAILQ_REMOVE(_disklist, edi, list);
+			TAILQ_INSERT_TAIL(_disklist, edi, list);
 		}
 	}
 

Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.1 src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.2
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.1	Tue Mar 13 14:54:52 2018
+++ src/sys/arch/i386/stand/lib/biosdisk.c	Wed Mar 21 10:50:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: biosdisk.c,v 1.46.6.1 2018/03/13 14:54:52 martin Exp $	*/
+/*	$NetBSD: biosdisk.c,v 1.46.6.2 2018/03/21 10:50:49 martin Exp $	*/
 
 /*
  * Copyright (c) 1996, 1998
@@ -802,20 +802,21 @@ biosdisk_findpartition(int biosdev, dadd
 			if (d->part[partition].fstype == FS_UNUSED)
 continue;
 #ifdef EFIBOOT
-			if (d->part[partition].attr & GPT_ENT_ATTR_BOOTME) {
-switch (d->part[partition].fstype) {
-case FS_BSDFFS:
-case FS_BSDLFS:
-case FS_RAID:
-case FS_CCD:
-case FS_CGD:
-case FS_ISO9660:
-	break;
+			switch (d->part[partition].fstype) {
+			case FS_BSDFFS:
+			case FS_BSDLFS:
+			case FS_RAID:
+			case FS_CCD:
+			case FS_CGD:
+			case FS_ISO9660:
+if 

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Mar 21 10:21:17 UTC 2018

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

Log Message:
Merge altq(4) HISTORY changes.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/altq.9

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

Modified files:

Index: src/share/man/man9/altq.9
diff -u src/share/man/man9/altq.9:1.16 src/share/man/man9/altq.9:1.17
--- src/share/man/man9/altq.9:1.16	Tue Mar 20 17:15:20 2018
+++ src/share/man/man9/altq.9	Wed Mar 21 10:21:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: altq.9,v 1.16 2018/03/20 17:15:20 sevan Exp $
+.\"	$NetBSD: altq.9,v 1.17 2018/03/21 10:21:17 wiz Exp $
 .\"	$OpenBSD: altq.9,v 1.4 2001/07/12 12:41:42 itojun Exp $
 .\"
 .\" Copyright (C) 2001
@@ -595,7 +595,7 @@ is called immediately after
 .Sh HISTORY
 The
 .Nm
-system first appeared in March 1997 and found home in the KAME project
-(http://www.kame.net). It was imported to
-.Nx
-in 1.6 .
+system first appeared in March 1997 and found its home in the KAME project
+.Lk ( http://www.kame.net ) .
+It was imported into
+.Nx 1.6 .

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Mar 21 10:20:33 UTC 2018

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

Log Message:
Improve HISTORY section.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/altq.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/altq.4
diff -u src/share/man/man4/altq.4:1.6 src/share/man/man4/altq.4:1.7
--- src/share/man/man4/altq.4:1.6	Tue Mar 20 20:13:33 2018
+++ src/share/man/man4/altq.4	Wed Mar 21 10:20:33 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: altq.4,v 1.6 2018/03/20 20:13:33 sevan Exp $
+.\" $NetBSD: altq.4,v 1.7 2018/03/21 10:20:33 wiz Exp $
 .\"
 .\" Copyright (c) 2011 Jukka Ruohonen 
 .\"
@@ -83,10 +83,10 @@ are required in order to use a certain n
 .Sh HISTORY
 The
 .Nm
-system first appeared in March 1997 and found home in the KAME project
-(http://www.kame.net). It was imported to
-.Nx
-in 1.6 .
+system first appeared in March 1997 and found its home in the KAME project
+.Lk ( http://www.kame.net ) .
+It was imported into
+.Nx 1.6 .
 .Sh CAVEATS
 Please note that you must compile
 .Xr pf 4

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 21 10:12:49 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio compat_80_mod.c
files.common
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/modules/compat_50 [pgoyette-compat]: Makefile
src/sys/net [pgoyette-compat]: if_spppsubr.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Added Files:
src/sys/compat/common [pgoyette-compat]: if_spppsubr50.c
if_spppsubr50.h
src/sys/modules/compat_80 [pgoyette-compat]: Makefile

Log Message:
Move if_spppsubr compat code into the compat50 module.

More prep work for compat80 module (for raidframe)


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.6 -r1.7.18.7 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_80_mod.c
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/compat/common/files.common
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/if_spppsubr50.c \
src/sys/compat/common/if_spppsubr50.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_50/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_80/Makefile
cvs rdiff -u -r1.179 -r1.179.2.1 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/sys/compat_stub.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/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.6 src/sys/compat/common/Makefile.sysio:1.7.18.7
--- src/sys/compat/common/Makefile.sysio:1.7.18.6	Wed Mar 21 04:48:31 2018
+++ src/sys/compat/common/Makefile.sysio	Wed Mar 21 10:12:48 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.6 2018/03/21 04:48:31 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.7 2018/03/21 10:12:48 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -35,10 +35,14 @@ SRCS+=	vfs_syscalls_40.c uipc_syscalls_4
 
 # Compatibility code for NetBSD 5.0
 SRCS+=	kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \
-	vfs_syscalls_50.c  uipc_syscalls_50.c uvm_50.c clockctl_50.c
+	vfs_syscalls_50.c uipc_syscalls_50.c uvm_50.c clockctl_50.c \
+	if_spppsubr50.c
 
 # Compatibility code for NetBSD 6.0
 SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c kern_cpu_60.c ccd_60.c
 
 # Compatibility code for NetBSD 7.0
 SRCS+=	rtsock_70.c uipc_usrreq_70.c
+
+# Compatability code for NetBSD 8.0
+SRCS+=	raidframe80.c

Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.1.2.1 src/sys/compat/common/compat_80_mod.c:1.1.2.2
--- src/sys/compat/common/compat_80_mod.c:1.1.2.1	Wed Mar 21 10:01:04 2018
+++ src/sys/compat/common/compat_80_mod.c	Wed Mar 21 10:12:48 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_80_mod.c,v 1.1.2.1 2018/03/21 10:01:04 pgoyette Exp $	*/
+/*	$NetBSD: compat_80_mod.c,v 1.1.2.2 2018/03/21 10:12:48 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.1 2018/03/21 10:01:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.2 2018/03/21 10:12:48 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -54,20 +54,24 @@ __KERNEL_RCSID(0, "$NetBSD: compat_80_mo
 #include 
 #include 
 
-int compat_70_init(void)
+int compat_80_init(void)
 {
+	int error;
 
-	vec_ocreds_valid = true;
-	rtsock_70_init();
+	error = raidframe_80_init();
+	if (error != 0)
+		return error;
 
 	return 0;
 }
 
-int compat_70_fini(void)
+int compat_80_fini(void)
 {
+	int error;
 
-	rtsock_70_fini();
-	vec_ocreds_valid = false;
+	error = raidframe_80_fini();
+	if (error != 0)
+		return error;
 
 	return 0;
 }
@@ -83,10 +87,10 @@ compat_70_modcmd(modcmd_t cmd, void *arg
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		return compat_70_init();
+		return compat_80_init();
 
 	case MODULE_CMD_FINI:
-		return compat_70_fini();
+		return compat_80_fini();
 
 	default:
 		return ENOTTY;

Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.15 src/sys/compat/common/files.common:1.1.2.16
--- src/sys/compat/common/files.common:1.1.2.15	Wed Mar 21 04:48:31 2018
+++ src/sys/compat/common/files.common	Wed Mar 21 10:12:48 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.common,v 1.1.2.15 2018/03/21 04:48:31 pgoyette Exp $
+#	$NetBSD: files.common,v 1.1.2.16 2018/03/21 10:12:48 pgoyette Exp $
 
 #
 # Generic files, used by all compat options.
@@ -65,6 +65,7 @@ file	compat/common/rtsock_50.c		compat_5
 file	compat/common/vfs_syscalls_50.c		compat_50
 file	compat/common/uipc_syscalls_50.c	compat_50
 file	compat/common/clockctl_50.c		compat_50 & clockctl
+file	compat/common/if_spppsubr50.c		compat_50 & sppp
 file	compat/common/uvm_50.c			compat_50
 
 # Compatibility code for NetBSD 6.0
@@ 

CVS commit: src/sys/net/npf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 21 10:08:16 UTC 2018

Modified Files:
src/sys/net/npf: npf_inet.c

Log Message:
Don't read the L4 payload after IPPROTO_AH when handling IPv6 packets.

AH must be considered as the payload, otherwise a

block all
pass in proto ah from any
pass out proto ah from any

configuration will actually block everything, because NPF checks the
protocol against the one found after AH, and not AH itself.

In addition it may have been a problem for stateful connections; an AH
packet sent by an attacker with an incorrect authentication and a correct
TCP/UDP/whatever payload from an active connection could manage to change
NPF's FSM state, which would perhaps have altered the legitimate
connection with the authenticated remote IPsec host.

Note that IPv4 already doesn't go beyond AH, which is the correct
behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/net/npf/npf_inet.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/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.42 src/sys/net/npf/npf_inet.c:1.43
--- src/sys/net/npf/npf_inet.c:1.42	Sat Mar 17 10:21:09 2018
+++ src/sys/net/npf/npf_inet.c	Wed Mar 21 10:08:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.42 2018/03/17 10:21:09 maxv Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.43 2018/03/21 10:08:16 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.42 2018/03/17 10:21:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.43 2018/03/21 10:08:16 maxv Exp $");
 
 #include 
 #include 
@@ -323,6 +323,10 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
 	const uint8_t ver = *(const uint8_t *)nptr;
 	int flags = 0;
 
+	/*
+	 * We intentionally don't read the L4 payload after IPPROTO_AH.
+	 */
+
 	switch (ver >> 4) {
 	case IPVERSION: {
 		struct ip *ip;
@@ -404,9 +408,6 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
 flags |= NPC_IPFRAG;
 
 break;
-			case IPPROTO_AH:
-hlen = (ip6e->ip6e_len + 2) << 2;
-break;
 			default:
 hlen = 0;
 break;

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 10:08:03 UTC 2018

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/asan [netbsd-8]: asan_linux.cc
src/sys/arch/aarch64/include [netbsd-8]: mcontext.h
src/sys/arch/alpha/include [netbsd-8]: mcontext.h
src/sys/arch/amd64/include [netbsd-8]: mcontext.h
src/sys/arch/arm/include [netbsd-8]: mcontext.h
src/sys/arch/hppa/include [netbsd-8]: mcontext.h
src/sys/arch/i386/include [netbsd-8]: mcontext.h
src/sys/arch/ia64/include [netbsd-8]: mcontext.h
src/sys/arch/m68k/include [netbsd-8]: mcontext.h
src/sys/arch/mips/include [netbsd-8]: mcontext.h
src/sys/arch/or1k/include [netbsd-8]: mcontext.h
src/sys/arch/powerpc/include [netbsd-8]: mcontext.h
src/sys/arch/riscv/include [netbsd-8]: mcontext.h
src/sys/arch/sh3/include [netbsd-8]: mcontext.h
src/sys/arch/sparc/include [netbsd-8]: mcontext.h
src/sys/arch/sparc64/include [netbsd-8]: mcontext.h
src/sys/arch/vax/include [netbsd-8]: mcontext.h
src/tests/lib/libc/sys [netbsd-8]: Makefile t_ucontext.c

Log Message:
Pull up the following, requested by kamil in ticket #552:

external/gpl3/gcc{.old}/dist/libsanitizer/asan/asan_linux.cc 1.4
sys/arch/aarch64/include/mcontext.h 1.2
sys/arch/alpha/include/mcontext.h   1.9
sys/arch/amd64/include/mcontext.h   1.19
sys/arch/arm/include/mcontext.h 1.19
sys/arch/hppa/include/mcontext.h1.9
sys/arch/i386/include/mcontext.h1.14
sys/arch/ia64/include/mcontext.h1.6
sys/arch/m68k/include/mcontext.h1.10
sys/arch/mips/include/mcontext.h1.22
sys/arch/or1k/include/mcontext.h1.2
sys/arch/powerpc/include/mcontext.h 1.18
sys/arch/riscv/include/mcontext.h   1.5
sys/arch/sh3/include/mcontext.h 1.11
sys/arch/sparc/include/mcontext.h   1.14-1.17
sys/arch/sparc64/include/mcontext.h 1.10
sys/arch/vax/include/mcontext.h 1.9
tests/lib/libc/sys/Makefile 1.50
tests/lib/libc/sys/t_ucontext.c 1.2-1.5
sys/arch/hppa/include/mcontext.h1.10
sys/arch/ia64/include/mcontext.h1.7

- Introduce _UC_MACHINE_FP().  _UC_MACHINE_FP() is a helper
  macro to extract from mcontext a frame pointer.
- Add new tests in lib/libc/sys/t_ucontext:
  * ucontext_sp (testing _UC_MACHINE_SP)
  * ucontext_fp (testing _UC_MACHINE_FP)
  * ucontext_pc (testing _UC_MACHINE_PC)
  * ucontext_intrv (testing _UC_MACHINE_INTRV)

Add a dummy implementation of _UC_MACHINE_INTRV() for ia64.

Implement _UC_MACHINE_INTRV() for hppa.

Make the t_ucontext.c test more portable.

We now have _UC_MACHINE_FP.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.8.1 \
src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
cvs rdiff -u -r1.1.22.2 -r1.1.22.3 src/sys/arch/aarch64/include/mcontext.h
cvs rdiff -u -r1.8.32.2 -r1.8.32.3 src/sys/arch/alpha/include/mcontext.h
cvs rdiff -u -r1.18.20.2 -r1.18.20.3 src/sys/arch/amd64/include/mcontext.h
cvs rdiff -u -r1.18.10.2 -r1.18.10.3 src/sys/arch/arm/include/mcontext.h
cvs rdiff -u -r1.8.22.2 -r1.8.22.3 src/sys/arch/hppa/include/mcontext.h
cvs rdiff -u -r1.12.22.2 -r1.12.22.3 src/sys/arch/i386/include/mcontext.h
cvs rdiff -u -r1.5.8.2 -r1.5.8.3 src/sys/arch/ia64/include/mcontext.h
cvs rdiff -u -r1.9.42.2 -r1.9.42.3 src/sys/arch/m68k/include/mcontext.h
cvs rdiff -u -r1.21.10.2 -r1.21.10.3 src/sys/arch/mips/include/mcontext.h
cvs rdiff -u -r1.1.12.2 -r1.1.12.3 src/sys/arch/or1k/include/mcontext.h
cvs rdiff -u -r1.17.12.2 -r1.17.12.3 src/sys/arch/powerpc/include/mcontext.h
cvs rdiff -u -r1.4.10.2 -r1.4.10.3 src/sys/arch/riscv/include/mcontext.h
cvs rdiff -u -r1.10.32.2 -r1.10.32.3 src/sys/arch/sh3/include/mcontext.h
cvs rdiff -u -r1.13.32.2 -r1.13.32.3 src/sys/arch/sparc/include/mcontext.h
cvs rdiff -u -r1.9.32.2 -r1.9.32.3 src/sys/arch/sparc64/include/mcontext.h
cvs rdiff -u -r1.8.40.2 -r1.8.40.3 src/sys/arch/vax/include/mcontext.h
cvs rdiff -u -r1.49.4.2 -r1.49.4.3 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.1.34.2 -r1.1.34.3 src/tests/lib/libc/sys/t_ucontext.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/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.9 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.9.8.1
--- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.9	Wed Jun  1 00:53:35 2016
+++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc	Wed Mar 21 10:08:03 2018
@@ -162,40 +162,42 @@ void AsanCheckIncompatibleRT() {
 
 void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
 #ifdef __NetBSD__
-# define 

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 21 10:01:04 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_50_mod.c
compat_60_mod.c compat_70_mod.c
Added Files:
src/sys/compat/common [pgoyette-compat]: compat_80_mod.c

Log Message:
Add a compat_80 module - we need this for some raidframe stuff.

Update other modules to add compat_80 to the required lists.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/compat_70_mod.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_80_mod.c

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

Modified files:

Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.2 src/sys/compat/common/compat_50_mod.c:1.1.2.3
--- src/sys/compat/common/compat_50_mod.c:1.1.2.2	Wed Mar 21 04:48:31 2018
+++ src/sys/compat/common/compat_50_mod.c	Wed Mar 21 10:01:04 2018
@@ -1,11 +1,11 @@
-/*	$NetBSD: compat_50_mod.c,v 1.1.2.2 2018/03/21 04:48:31 pgoyette Exp $	*/
+/*	$NetBSD: compat_50_mod.c,v 1.1.2.3 2018/03/21 10:01:04 pgoyette Exp $	*/
 
 /*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software developed for The NetBSD Foundation
- * by Andrew Doran.
+ * by Paul Goyette
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.2 2018/03/21 04:48:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.3 2018/03/21 10:01:04 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_50_mo
 
 #include 
 #include 
+#include 
 
 int
 compat_50_init(void)
@@ -77,6 +78,7 @@ compat_50_init(void)
 	uvm_50_init();
 	if_50_init();
 	clockctl_50_init();
+	if_spppsubr_50_init();
 
 	return error;
 
@@ -97,6 +99,7 @@ compat_50_fini(void)
 {
 	int error = 0;
 
+	if_spppsubr_50_fini();
 	clockctl_50_fini();
 	if_50_fini();
 	uvm_50_fini();
@@ -130,15 +133,16 @@ compat_50_fini(void)
 	uvm_50_init();
 	if_50_init();
 	clockctl_50_init();
+	if_spppsubr_50_init();
 
 	return error;
 }
 
 #ifdef _MODULE
 
-#define REQUIRED_50	"compat_70,compat_60"	/* XXX No compat_80 yet */
+#define REQD_50	"compat_80,compat_70,compat_60"
 
-MODULE(MODULE_CLASS_EXEC, compat_50, REQUIRED_50);
+MODULE(MODULE_CLASS_EXEC, compat_50, REQD_50);
 
 static int
 compat_50_modcmd(modcmd_t cmd, void *arg)

Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.11 src/sys/compat/common/compat_60_mod.c:1.1.2.12
--- src/sys/compat/common/compat_60_mod.c:1.1.2.11	Mon Mar 19 21:54:43 2018
+++ src/sys/compat/common/compat_60_mod.c	Wed Mar 21 10:01:04 2018
@@ -1,11 +1,11 @@
-/*	$NetBSD: compat_60_mod.c,v 1.1.2.11 2018/03/19 21:54:43 pgoyette Exp $	*/
+/*	$NetBSD: compat_60_mod.c,v 1.1.2.12 2018/03/21 10:01:04 pgoyette Exp $	*/
 
 /*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software developed for The NetBSD Foundation
- * by Andrew Doran.
+ * by Paul Goyette
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.11 2018/03/19 21:54:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.12 2018/03/21 10:01:04 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -116,7 +116,7 @@ compat_60_fini(void)
 
 #ifdef _MODULE
 
-#define REQUIRED_60 "compat_70"		/* XXX No compat_80 yet */
+#define REQUIRED_60 "compat_70,compat_80"
 MODULE(MODULE_CLASS_EXEC, compat_60, REQUIRED_60);
 
 static int

Index: src/sys/compat/common/compat_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.1.2.5 src/sys/compat/common/compat_70_mod.c:1.1.2.6
--- src/sys/compat/common/compat_70_mod.c:1.1.2.5	Sat Mar 17 00:44:38 2018
+++ src/sys/compat/common/compat_70_mod.c	Wed Mar 21 10:01:04 2018
@@ -1,11 +1,11 @@
-/*	$NetBSD: compat_70_mod.c,v 1.1.2.5 2018/03/17 00:44:38 pgoyette Exp $	*/
+/*	$NetBSD: compat_70_mod.c,v 1.1.2.6 2018/03/21 10:01:04 pgoyette Exp $	*/
 
 /*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software developed for The NetBSD Foundation
- * by Andrew Doran.
+ * by Paul Goyette
  *
  * Redistribution and use in source and 

CVS commit: src/share/misc

[Eitan Adler]

Module Name:src
Committed By:   eadler
Date:   Wed Mar 21 09:54:39 UTC 2018

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

Log Message:
[bsd-family-tree] announce NetBSD 7.1.2 & 6.0.6

rearrange some elements to better reflect the release timings

ok pgoyette@


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 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.64 src/share/misc/bsd-family-tree:1.65
--- src/share/misc/bsd-family-tree:1.64	Sat Dec 16 07:16:03 2017
+++ src/share/misc/bsd-family-tree	Wed Mar 21 09:54:39 2018
@@ -290,6 +290,9 @@ FreeBSD 5.2   |  |  
  | |   |  |  | |  ||   |
  | |   |  |  | |   NetBSD  |   |
  | |   |  |  | |6.0.5  |   |
+ | |   |  |  | |  ||   |
+ | |   |  |  | |   NetBSD  |   |
+ | |   |  |  | |6.0.6  |   |
  | |   |  |  | |   |   |
  | |   |  |  | |`-NetBSD 6.1   |   |
  | |FreeBSD   |  |   | |   |
@@ -352,15 +355,19 @@ FreeBSD 5.2   |  |  
  |   11.0 | 10.12   | | NetBSD 7.0.2   |   |
  | |  |   | | ||   |
  | |  |   | | *- NetBSD 7.1|   |
- | |  | macOS   |  |   DragonFly 4.8.0
- | |  | 10.13   | OpenBSD 6.1  |
- |  FreeBSD   |   | |  |   DragonFly 5.0.0
- |   11.1  FreeBSD| |  |   |
- | |10.4  | | OpenBSD 6.2  DragonFly 5.0.1
- | |  | |  |   |
- | |  | |  |   DragonFly 5.0.2
- | |  | |  |   |
- | |  | |  |   |
+ | |  |   | |  |   |   |
+ | |  |   | |  |   |   |
+ | |  | macOS   |  |   |   DragonFly 4.8.0
+ | |  | 10.13   |  |  OpenBSD 6.1  |
+ |  FreeBSD   |   | |  |   |   DragonFly 5.0.0
+ |   11.1  FreeBSD| |  |   |   |
+ | |10.4  | |  |  OpenBSD 6.2  DragonFly 5.0.1
+ | |  | |  |   |   |
+ | |  | |  NetBSD 7.1.1|   DragonFly 5.0.2
+ | |  | |  |   |   |
+ | |  | |  NetBSD 7.1.2|   |
+ | |  | |  |   |   |
+ | |  | |  v   |   |
  | v  | |  |   |
  || |  |   |
 FreeBSD 12 -current   | NetBSD -current   OpenBSD -currentDragonFly -current
@@ -687,14 +694,15 @@ NetBSD 6.0.4		2014-01-25 [NBD]
 NetBSD 6.1.3		2014-01-25 [NBD]
 DragonFly 3.6.1 	2014-02-22 [DFB]
 DragonFly 3.6.2		2014-04-10 [DFB]
-NetBSD 6.0.5		2014-04-12 [NDB]
-NetBSD 6.1.4		2014-04-12 [NDB]
+NetBSD 6.0.5		2014-04-12 [NBD]
+NetBSD 6.1.4		2014-04-12 [NBD]
 OpenBSD 5.5		2014-05-01 [OBD]
 DragonFly 3.8.0		2014-06-04 [DFB]
 DragonFly 3.8.1		2014-06-16 [DFB]
 DragonFly 3.6.3		2014-06-17 [DFB]
 FreeBSD 9.3		2014-07-05 [FBD]
 DragonFly 3.8.2		2014-08-08 [DFB]
+NetBSD 6.0.6		2014-09-22 [NBD]
 NetBSD 6.1.5		2014-09-22 [NBD]
 Mac OS X 10.10		2014-10-16 [APL]
 OpenBSD 5.6		2014-11-01 [OBD]
@@ -717,8 +725,8 @@ NetBSD 7.0.1		2016-05-22 [NBD]
 DragonFly 4.6.0		2016-08-02 [DFB]
 OpenBSD 6.0		2016-09-01 [OBD]
 macOS 10.12		2016-09-20 [APL]
-NetBSD 7.0.2		2016-10-21 [NBD]
 FreeBSD 11.0		2016-10-10 [FBD]
+NetBSD 7.0.2		2016-10-21 [NBD]
 NetBSD 7.1		2017-03-11 [NBD]
 DragonFly 4.8.0		2017-03-27 [DFB]
 OpenBSD 6.1		2017-04-11 [OBD]
@@ -729,6 +737,8 @@ OpenBSD 6.2		2017-10-09 [OBD]
 DragonFly 5.0.0		2017-10-16 [DFB]
 DragonFly 5.0.1		2017-11-06 [DFB]
 DragonFly 5.0.2		2017-12-04 [DFB]
+NetBSD 7.1.1		2017-12-22 [NBD]
+NetBSD 7.1.2		2018-03-15 [NBD]
 
 Bibliography
 
@@ -793,5 +803,5 @@ Steven M. Schultz for providing 2.8BSD, 
 Copyright (c) 1997-2012 Wolfram Schneider 

CVS commit: [netbsd-7-0] src/sys/dev/ppbus

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 08:11:39 UTC 2018

Modified Files:
src/sys/dev/ppbus [netbsd-7-0]: if_plip.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1579):
sys/dev/ppbus/if_plip.c: revision 1.28
spl leak, found by Mootja


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.6.1 src/sys/dev/ppbus/if_plip.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/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.25 src/sys/dev/ppbus/if_plip.c:1.25.6.1
--- src/sys/dev/ppbus/if_plip.c:1.25	Thu Jun  5 23:48:16 2014
+++ src/sys/dev/ppbus/if_plip.c	Wed Mar 21 08:11:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.25 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_plip.c,v 1.25.6.1 2018/03/21 08:11:39 martin Exp $ */
 
 /*-
  * Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.25 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.25.6.1 2018/03/21 08:11:39 martin Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
@@ -445,6 +445,7 @@ lpioctl(struct ifnet *ifp, u_long cmd, v
 		case AF_INET:
 			break;
 		default:
+			splx(s);
 			return EAFNOSUPPORT;
 		}
 		break;

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 21 08:11:25 UTC 2018

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

Log Message:
Ticket #1589


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

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.93 src/doc/CHANGES-7.0.3:1.1.2.94
--- src/doc/CHANGES-7.0.3:1.1.2.93	Tue Mar 20 17:18:56 2018
+++ src/doc/CHANGES-7.0.3	Wed Mar 21 08:11:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.93 2018/03/20 17:18:56 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.94 2018/03/21 08:11:25 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5318,4 +5318,8 @@ sys/arch/xen/x86/cpu.c1.102-1.103
 	Retrieve cpuid7 (Structured Extended Features) into ci_feat_val.
 	[msaitoh, ticket #1118]
 
+sys/dev/ppbus/if_plip.c1.28
+
+	Fix an spl(9) leak.
+	[msaitoh, ticket #1579]