CVS commit: src/sys/dev/usb

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Tue May 23 04:58:49 UTC 2017

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

Log Message:
Revert locking changes back to rev 1.149.  Dropping and reaquiring the
interrupt lock was not necessary for the proper operation of uaudio
devices.


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

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

Modified files:

Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.151 src/sys/dev/usb/uaudio.c:1.152
--- src/sys/dev/usb/uaudio.c:1.151	Fri May 19 09:58:28 2017
+++ src/sys/dev/usb/uaudio.c	Tue May 23 04:58:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaudio.c,v 1.151 2017/05/19 09:58:28 nat Exp $	*/
+/*	$NetBSD: uaudio.c,v 1.152 2017/05/23 04:58:49 nat Exp $	*/
 
 /*
  * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.151 2017/05/19 09:58:28 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.152 2017/05/23 04:58:49 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2894,9 +2894,7 @@ uaudio_chan_pintr(struct usbd_xfer *xfer
 	while (ch->transferred >= ch->blksize) {
 		ch->transferred -= ch->blksize;
 		DPRINTFN(5, "call %p(%p)\n", ch->intr, ch->arg);
-		mutex_exit(>sc->sc_intr_lock);
 		ch->intr(ch->arg);
-		mutex_enter(>sc->sc_intr_lock);
 	}
 	mutex_exit(>sc->sc_intr_lock);
 
@@ -2997,9 +2995,7 @@ uaudio_chan_rintr(struct usbd_xfer *xfer
 	while (ch->transferred >= ch->blksize) {
 		ch->transferred -= ch->blksize;
 		DPRINTFN(5, "call %p(%p)\n", ch->intr, ch->arg);
-		mutex_exit(>sc->sc_intr_lock);
 		ch->intr(ch->arg);
-		mutex_enter(>sc->sc_intr_lock);
 	}
 	mutex_exit(>sc->sc_intr_lock);
 

CVS commit: src/sys/dev/ic

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 23 04:51:31 UTC 2017

Modified Files:
src/sys/dev/ic: am7990.c am79900.c

Log Message:
Fix builds


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/am7990.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/am79900.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/ic/am7990.c
diff -u src/sys/dev/ic/am7990.c:1.76 src/sys/dev/ic/am7990.c:1.77
--- src/sys/dev/ic/am7990.c:1.76	Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/am7990.c	Tue May 23 04:51:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: am7990.c,v 1.76 2017/05/23 02:19:14 ozaki-r Exp $	*/
+/*	$NetBSD: am7990.c,v 1.77 2017/05/23 04:51:31 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.76 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.77 2017/05/23 04:51:31 ozaki-r Exp $");
 
 #include 
 #include 
@@ -114,7 +114,7 @@ am7990_config(struct am7990_softc *sc)
 	sc->lsc.sc_start = am7990_start;
 
 	lance_config(>lsc);
-	if_deferred_start_init(ifp, NULL);
+	if_deferred_start_init(>lsc.sc_ethercom.ec_if, NULL);
 
 	mem = 0;
 	sc->lsc.sc_initaddr = mem;

Index: src/sys/dev/ic/am79900.c
diff -u src/sys/dev/ic/am79900.c:1.25 src/sys/dev/ic/am79900.c:1.26
--- src/sys/dev/ic/am79900.c:1.25	Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/am79900.c	Tue May 23 04:51:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: am79900.c,v 1.25 2017/05/23 02:19:14 ozaki-r Exp $	*/
+/*	$NetBSD: am79900.c,v 1.26 2017/05/23 04:51:31 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.25 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.26 2017/05/23 04:51:31 ozaki-r Exp $");
 
 #include 
 #include 
@@ -152,7 +152,7 @@ am79900_config(struct am79900_softc *sc)
 	sc->lsc.sc_start = am79900_start;
 
 	lance_config(>lsc);
-	if_deferred_start_init(ifp, NULL);
+	if_deferred_start_init(>lsc.sc_ethercom.ec_if, NULL);
 
 	mem = 0;
 	sc->lsc.sc_initaddr = mem;

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 23 04:26:08 UTC 2017

Modified Files:
src/sys/netipsec: ipsec.c key.c

Log Message:
Disable secspacq stuffs that are now unused

The stuffs are used only if sp->policy == IPSEC_POLICY_IPSEC
&& sp->req == NULL (see ipsec{4,6}_checkpolicy). However, in the
current implementation, sp->req never be NULL (except for the
moments of SP allocation and deallocation) if sp->policy is
IPSEC_POLICY_IPSEC.

It seems that the facility was partially implemented in the KAME
era and wasn't completed. Make it clear that the facility is
unused for now by #ifdef notyet. Eventually we should complete
the implementation or remove it entirely.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.138 -r1.139 src/sys/netipsec/key.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.92 src/sys/netipsec/ipsec.c:1.93
--- src/sys/netipsec/ipsec.c:1.92	Fri May 19 04:34:09 2017
+++ src/sys/netipsec/ipsec.c	Tue May 23 04:26:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.c,v 1.92 2017/05/19 04:34:09 ozaki-r Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.93 2017/05/23 04:26:08 ozaki-r Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.92 2017/05/19 04:34:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.93 2017/05/23 04:26:08 ozaki-r Exp $");
 
 /*
  * IPsec controller part.
@@ -644,8 +644,7 @@ ipsec4_checkpolicy(struct mbuf *m, u_int
 		sp = NULL;		/* NB: force NULL result */
 		break;
 	case IPSEC_POLICY_IPSEC:
-		if (sp->req == NULL)	/* acquire an SA */
-			*error = key_spdacquire(sp);
+		KASSERT(sp->req != NULL);
 		break;
 	}
 	if (*error != 0) {
@@ -890,8 +889,7 @@ ipsec6_checkpolicy(struct mbuf *m, u_int
 		sp = NULL;	  /* NB: force NULL result */
 		break;
 	case IPSEC_POLICY_IPSEC:
-		if (sp->req == NULL)	/* acquire an SA */
-			*error = key_spdacquire(sp);
+		KASSERT(sp->req != NULL);
 		break;
 	}
 	if (*error != 0) {

Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.138 src/sys/netipsec/key.c:1.139
--- src/sys/netipsec/key.c:1.138	Tue May 23 03:13:52 2017
+++ src/sys/netipsec/key.c	Tue May 23 04:26:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.138 2017/05/23 03:13:52 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.139 2017/05/23 04:26:08 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.138 2017/05/23 03:13:52 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.139 2017/05/23 04:26:08 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -150,7 +150,9 @@ static LIST_HEAD(_regtree, secreg) regtr
 #ifndef IPSEC_NONBLOCK_ACQUIRE
 static LIST_HEAD(_acqtree, secacq) acqtree;		/* acquiring list */
 #endif
+#ifdef notyet
 static LIST_HEAD(_spacqtree, secspacq) spacqtree;	/* SP acquiring list */
+#endif
 
 /* search order for SAs */
 	/*
@@ -488,8 +490,10 @@ static struct secacq *key_newacq (const 
 static struct secacq *key_getacq (const struct secasindex *);
 static struct secacq *key_getacqbyseq (u_int32_t);
 #endif
+#ifdef notyet
 static struct secspacq *key_newspacq (const struct secpolicyindex *);
 static struct secspacq *key_getspacq (const struct secpolicyindex *);
+#endif
 static int key_acquire2 (struct socket *, struct mbuf *,
 	const struct sadb_msghdr *);
 static int key_register (struct socket *, struct mbuf *,
@@ -1957,8 +1961,11 @@ key_spdadd(struct socket *so, struct mbu
 
 	newsp->refcnt = 1;	/* do not reclaim until I say I do */
 	newsp->state = IPSEC_SPSTATE_ALIVE;
+	if (newsp->policy == IPSEC_POLICY_IPSEC)
+		KASSERT(newsp->req != NULL);
 	LIST_INSERT_TAIL([newsp->spidx.dir], newsp, secpolicy, chain);
 
+#ifdef notyet
 	/* delete the entry in spacqtree */
 	if (mhp->msg->sadb_msg_type == SADB_X_SPDUPDATE) {
 		struct secspacq *spacq = key_getspacq();
@@ -1968,6 +1975,7 @@ key_spdadd(struct socket *so, struct mbu
 			spacq->count = 0;
 		}
 	}
+#endif
 
 	/* Invalidate all cached SPD pointers in the PCBs. */
 	ipsec_invalpcbcacheall();
@@ -2312,6 +2320,7 @@ key_spdget(struct socket *so, struct mbu
 		return key_senderror(so, m, ENOBUFS);
 }
 
+#ifdef notyet
 /*
  * SADB_X_SPDACQUIRE processing.
  * Acquire policy and SA(s) for a *OUTBOUND* packet.
@@ -2382,6 +2391,7 @@ fail:
 		m_freem(result);
 	return error;
 }
+#endif /* notyet */
 
 /*
  * SADB_SPDFLUSH processing
@@ -4669,6 +4679,7 @@ key_timehandler_work(struct work *wk, vo
 }
 #endif
 
+#ifdef notyet
 	/* SP ACQ tree */
 {
 	struct secspacq *acq, *nextacq;
@@ -4681,6 

CVS commit: src/sys/arch/x86

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue May 23 03:23:58 UTC 2017

Modified Files:
src/sys/arch/x86/include: i82093var.h
src/sys/arch/x86/x86: lapic.c

Log Message:
whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/include/i82093var.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/lapic.c

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

Modified files:

Index: src/sys/arch/x86/include/i82093var.h
diff -u src/sys/arch/x86/include/i82093var.h:1.15 src/sys/arch/x86/include/i82093var.h:1.16
--- src/sys/arch/x86/include/i82093var.h:1.15	Tue May 23 03:18:40 2017
+++ src/sys/arch/x86/include/i82093var.h	Tue May 23 03:23:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: i82093var.h,v 1.15 2017/05/23 03:18:40 nonaka Exp $ */
+/* $NetBSD: i82093var.h,v 1.16 2017/05/23 03:23:58 nonaka Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
 #include 
 #include 
 
-struct ioapic_pin 
-{
+struct ioapic_pin {
 	struct ioapic_pin	*ip_next;	/* next pin on this vector */
 	struct mp_intr_map 	*ip_map;
 	int			ip_vector;	/* IDT vector */
@@ -52,7 +51,7 @@ struct ioapic_softc {
 	struct ioapic_softc	*sc_next;
 	int			sc_apic_vers;
 	int			sc_apic_vecbase; /* global int base if ACPI */
-	int			sc_apic_sz;	/* apic size*/
+	int			sc_apic_sz;	/* apic size */
 	int			sc_flags;
 	paddr_t			sc_pa;		/* PA of ioapic */
 	volatile uint32_t	*sc_reg;	/* KVA of ioapic addr */
@@ -71,7 +70,7 @@ struct ioapic_softc {
  * (ih&0x000ff800)>>43 -> MSI/MSI-X device id.
  * (ih&0x07ff)>>32 -> MSI/MSI-X vector id in a device.
  */
-#define	MPSAFE_MASK		0x8000ULL
+#define MPSAFE_MASK		0x8000ULL
 #define APIC_INT_VIA_APIC	0x1000ULL
 #define APIC_INT_VIA_MSI	0x2000ULL
 #define APIC_INT_APIC_MASK	0x00ffULL

Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.56 src/sys/arch/x86/x86/lapic.c:1.57
--- src/sys/arch/x86/x86/lapic.c:1.56	Sat Apr 22 04:29:31 2017
+++ src/sys/arch/x86/x86/lapic.c	Tue May 23 03:23:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapic.c,v 1.56 2017/04/22 04:29:31 nonaka Exp $	*/
+/*	$NetBSD: lapic.c,v 1.57 2017/05/23 03:23:58 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.56 2017/04/22 04:29:31 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.57 2017/05/23 03:23:58 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -85,7 +85,7 @@ struct pic local_pic = {
 	.pic_lock = __SIMPLELOCK_UNLOCKED,
 	.pic_hwmask = lapic_hwmask,
 	.pic_hwunmask = lapic_hwunmask,
-	.pic_addroute =lapic_setup,
+	.pic_addroute = lapic_setup,
 	.pic_delroute = lapic_setup,
 };
 

CVS commit: src/sys/arch/x86

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue May 23 03:18:40 UTC 2017

Modified Files:
src/sys/arch/x86/include: i82093var.h
src/sys/arch/x86/x86: mpbios.c

Log Message:
x86: No ioapic_softc.sc_apicid is used anymore. Use 
ioapic_softc.sc_pic.pic_apicid.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/i82093var.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/mpbios.c

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

Modified files:

Index: src/sys/arch/x86/include/i82093var.h
diff -u src/sys/arch/x86/include/i82093var.h:1.14 src/sys/arch/x86/include/i82093var.h:1.15
--- src/sys/arch/x86/include/i82093var.h:1.14	Mon Apr 27 07:03:58 2015
+++ src/sys/arch/x86/include/i82093var.h	Tue May 23 03:18:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: i82093var.h,v 1.14 2015/04/27 07:03:58 knakahara Exp $ */
+/* $NetBSD: i82093var.h,v 1.15 2017/05/23 03:18:40 nonaka Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@ struct ioapic_softc {
 	device_t		sc_dev;
 	struct pic		sc_pic;
 	struct ioapic_softc	*sc_next;
-	int			sc_apicid;
 	int			sc_apic_vers;
 	int			sc_apic_vecbase; /* global int base if ACPI */
 	int			sc_apic_sz;	/* apic size*/

Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.65 src/sys/arch/x86/x86/mpbios.c:1.66
--- src/sys/arch/x86/x86/mpbios.c:1.65	Fri Jul 17 06:41:18 2015
+++ src/sys/arch/x86/x86/mpbios.c	Tue May 23 03:18:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpbios.c,v 1.65 2015/07/17 06:41:18 msaitoh Exp $	*/
+/*	$NetBSD: mpbios.c,v 1.66 2017/05/23 03:18:40 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.65 2015/07/17 06:41:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.66 2017/05/23 03:18:40 nonaka Exp $");
 
 #include "acpica.h"
 #include "lapic.h"
@@ -752,7 +752,7 @@ mpbios_scan(device_t self, int *ncpup)
 	struct ioapic_softc *sc;
 	for (sc = ioapics ; sc != NULL;
 	 sc = sc->sc_next) {
-		ie.dst_apic_id = sc->sc_apicid;
+		ie.dst_apic_id = sc->sc_pic.pic_apicid;
 		mpbios_int((char *), type,
 		_intrs[cur_intr++]);
 	}

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 23 03:13:52 UTC 2017

Modified Files:
src/sys/netipsec: key.c

Log Message:
Prepare to retire __LIST_CHAINED

We shouldn't relpy on the band-aid and instead use a lock or
refcnt to maintain chains properly. Before removing them,
replace conditionals with KASSERTs and see what will happen.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.137 src/sys/netipsec/key.c:1.138
--- src/sys/netipsec/key.c:1.137	Mon May 22 04:40:23 2017
+++ src/sys/netipsec/key.c	Tue May 23 03:13:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.137 2017/05/22 04:40:23 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.138 2017/05/23 03:13:52 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.137 2017/05/22 04:40:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.138 2017/05/23 03:13:52 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -586,11 +586,10 @@ key_sp_unlink(struct secpolicy *sp)
 {
 
 	/* remove from SP index */
-	if (__LIST_CHAINED(sp)) {
-		LIST_REMOVE(sp, chain);
-		/* Release refcount held just for being on chain */
-		KEY_FREESP();
-	}
+	KASSERT(__LIST_CHAINED(sp));
+	LIST_REMOVE(sp, chain);
+	/* Release refcount held just for being on chain */
+	KEY_FREESP();
 }
 
 
@@ -2902,8 +2901,8 @@ key_delsah(struct secashead *sah)
 	rtcache_free(>sa_route);
 
 	/* remove from tree of SA index */
-	if (__LIST_CHAINED(sah))
-		LIST_REMOVE(sah, chain);
+	KASSERT(__LIST_CHAINED(sah));
+	LIST_REMOVE(sah, chain);
 
 	if (sah->idents != NULL)
 		kmem_free(sah->idents, sah->idents_len);
@@ -3014,8 +3013,8 @@ key_delsav(struct secasvar *sav)
 	KASSERTMSG(sav->refcnt == 0, "reference count %u > 0", sav->refcnt);
 
 	/* remove from SA header */
-	if (__LIST_CHAINED(sav))
-		LIST_REMOVE(sav, chain);
+	KASSERT(__LIST_CHAINED(sav));
+	LIST_REMOVE(sav, chain);
 
 	/*
 	 * Cleanup xform state.  Note that zeroize'ing causes the
@@ -4661,8 +4660,8 @@ key_timehandler_work(struct work *wk, vo
 	struct secacq *acq, *nextacq;
 
 	LIST_FOREACH_SAFE(acq, , chain, nextacq) {
-		if (now - acq->created > key_blockacq_lifetime &&
-		__LIST_CHAINED(acq)) {
+		if (now - acq->created > key_blockacq_lifetime) {
+			KASSERT(__LIST_CHAINED(acq));
 			LIST_REMOVE(acq, chain);
 			kmem_free(acq, sizeof(*acq));
 		}
@@ -4675,8 +4674,8 @@ key_timehandler_work(struct work *wk, vo
 	struct secspacq *acq, *nextacq;
 
 	LIST_FOREACH_SAFE(acq, , chain, nextacq) {
-		if (now - acq->created > key_blockacq_lifetime &&
-		__LIST_CHAINED(acq)) {
+		if (now - acq->created > key_blockacq_lifetime) {
+			KASSERT(__LIST_CHAINED(acq));
 			LIST_REMOVE(acq, chain);
 			kmem_free(acq, sizeof(*acq));
 		}
@@ -6751,7 +6750,8 @@ key_freereg(struct socket *so)
 	 */
 	for (i = 0; i <= SADB_SATYPE_MAX; i++) {
 		LIST_FOREACH(reg, [i], chain) {
-			if (reg->so == so && __LIST_CHAINED(reg)) {
+			if (reg->so == so) {
+KASSERT(__LIST_CHAINED(reg));
 LIST_REMOVE(reg, chain);
 kmem_free(reg, sizeof(*reg));
 break;
@@ -7866,8 +7866,8 @@ key_sa_chgstate(struct secasvar *sav, u_
 	if (sav->state == state)
 		return;
 
-	if (__LIST_CHAINED(sav))
-		LIST_REMOVE(sav, chain);
+	KASSERT(__LIST_CHAINED(sav));
+	LIST_REMOVE(sav, chain);
 
 	sav->state = state;
 	LIST_INSERT_HEAD(>sah->savtree[state], sav, chain);

CVS commit: src/sys/dev/ic

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 23 02:43:13 UTC 2017

Modified Files:
src/sys/dev/ic: smc90cx6.c

Log Message:
Remove an out-of-date comment

Pointed out by knakahara@


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/ic/smc90cx6.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/ic/smc90cx6.c
diff -u src/sys/dev/ic/smc90cx6.c:1.69 src/sys/dev/ic/smc90cx6.c:1.70
--- src/sys/dev/ic/smc90cx6.c:1.69	Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/smc90cx6.c	Tue May 23 02:43:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: smc90cx6.c,v 1.69 2017/05/23 02:19:14 ozaki-r Exp $ */
+/*	$NetBSD: smc90cx6.c,v 1.70 2017/05/23 02:43:13 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.69 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.70 2017/05/23 02:43:13 ozaki-r Exp $");
 
 /* #define BAHSOFTCOPY */
 #define BAHRETRANSMIT /**/
@@ -709,7 +709,6 @@ bah_tint(struct bah_softc *sc, int isr)
 	/* schedule soft int to fill a new buffer for us */
 	softint_schedule(sc->sc_txcookie);
 #else
-	/* call it directly */
 	if_schedule_deferred_start(ifp);
 #endif
 }

CVS commit: src/sys/dev

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 23 02:19:14 UTC 2017

Modified Files:
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: aic6915.c am7990.c am79900.c an.c arn5008.c arn9003.c
awi.c dp8390.c dp83932.c hme.c lemac.c mb86960.c rt2560.c rt2661.c
rt2860.c rtw.c smc90cx6.c smc91cxx.c tulip.c
src/sys/dev/pci: if_ale.c if_ipw.c if_iwi.c if_tl.c if_vte.c if_wpi.c

Log Message:
Apply deferred if_start to more drivers

And annotate some XXX_start as it runs in softint to clarify that
it doesn't need deferred if_start.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/aic6915.c src/sys/dev/ic/rt2661.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/am7990.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/am79900.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ic/an.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/arn5008.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/arn9003.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/ic/awi.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/ic/dp8390.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/dp83932.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/lemac.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ic/mb86960.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/rt2860.c
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/smc90cx6.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.189 -r1.190 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/pci/if_iwi.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_wpi.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/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.10 src/sys/dev/cadence/if_cemac.c:1.11
--- src/sys/dev/cadence/if_cemac.c:1.10	Thu Dec 15 09:28:04 2016
+++ src/sys/dev/cadence/if_cemac.c	Tue May 23 02:19:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cemac.c,v 1.10 2016/12/15 09:28:04 ozaki-r Exp $	*/
+/*	$NetBSD: if_cemac.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.10 2016/12/15 09:28:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.11 2017/05/23 02:19:14 ozaki-r Exp $");
 
 #include 
 #include 
@@ -384,8 +384,8 @@ cemac_intr(void *arg)
 		}
 	}
 
-	if (cemac_gctx(sc) > 0 && IFQ_IS_EMPTY(>if_snd) == 0)
-		cemac_ifstart(ifp);
+	if (cemac_gctx(sc) > 0)
+		if_schedule_deferred_start(ifp);
 #if 0 // reloop
 	irq = CEMAC_READ(IntStsC);
 	if ((irq & (IntSts_RxSQ|IntSts_ECI)) != 0)
@@ -621,6 +621,7 @@ cemac_init(struct cemac_softc *sc)
 	ifp->if_softc = sc;
 IFQ_SET_READY(>if_snd);
 if_attach(ifp);
+	if_deferred_start_init(ifp, NULL);
 ether_ifattach(ifp, (sc)->sc_enaddr);
 }
 

Index: src/sys/dev/ic/aic6915.c
diff -u src/sys/dev/ic/aic6915.c:1.34 src/sys/dev/ic/aic6915.c:1.35
--- src/sys/dev/ic/aic6915.c:1.34	Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/aic6915.c	Tue May 23 02:19:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6915.c,v 1.34 2016/12/15 09:28:05 ozaki-r Exp $	*/
+/*	$NetBSD: aic6915.c,v 1.35 2017/05/23 02:19:14 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.34 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.35 2017/05/23 02:19:14 ozaki-r Exp $");
 
 
 #include 
@@ -283,6 +283,7 @@ sf_attach(struct sf_softc *sc)
 	 * Attach the interface.
 	 */
 	if_attach(ifp);
+	if_deferred_start_init(ifp, NULL);
 	ether_ifattach(ifp, enaddr);
 
 	/*
@@ -605,7 +606,7 @@ sf_intr(void *arg)
 			sf_init(>sc_ethercom.ec_if);
 
 		/* Try and get more packets going. */
-		sf_start(>sc_ethercom.ec_if);
+		if_schedule_deferred_start(>sc_ethercom.ec_if);
 	}
 
 	return (handled);
Index: src/sys/dev/ic/rt2661.c
diff -u src/sys/dev/ic/rt2661.c:1.34 src/sys/dev/ic/rt2661.c:1.35
--- src/sys/dev/ic/rt2661.c:1.34	Thu Feb  2 10:05:35 2017
+++ src/sys/dev/ic/rt2661.c	Tue May 23 02:19:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rt2661.c,v 1.34 2017/02/02 10:05:35 nonaka Exp $	*/
+/*	$NetBSD: rt2661.c,v 1.35 2017/05/23 02:19:14 ozaki-r Exp $	*/
 /*	$OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $	*/
 /*	$FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $	*/
 
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.34 2017/02/02 10:05:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.35 2017/05/23 02:19:14 ozaki-r 

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 23 00:54:13 UTC 2017

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
XXX: Remove -fPIE for profiled libraries because this breaks relocations for
the call to __mcount.


To generate a diff of this commit:
cvs rdiff -u -r1.370 -r1.371 src/share/mk/bsd.lib.mk

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

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.370 src/share/mk/bsd.lib.mk:1.371
--- src/share/mk/bsd.lib.mk:1.370	Mon Apr 24 13:09:37 2017
+++ src/share/mk/bsd.lib.mk	Mon May 22 20:54:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.370 2017/04/24 17:09:37 chs Exp $
+#	$NetBSD: bsd.lib.mk,v 1.371 2017/05/23 00:54:13 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -43,6 +43,10 @@ realinstall:	checkver libinstall
 # Perhaps a more correct solution is to always generate _pic.a
 # files or always have a shared library.
 # XXX: This breaks profiling (__mcount relocation is wrong)
+# XXX: This is why we remove the PIE_CFLAGS from the profile
+# built-in rule below.
+# Another fix is to provide rcrt0.o like OpenBSD does and
+# do relocations for static PIE.
 .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=${PIE_CFLAGS}
 AFLAGS+=${PIE_AFLAGS}
@@ -220,7 +224,8 @@ LIBSTRIPSHLIBOBJS=	yes
 
 .c.po:
 	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
+	# XXX: See __mcount comment above
+	${COMPILE.c:S/${PIE_CFLAGS}//} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif

CVS commit: src/share/man/man4

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue May 23 00:48:29 UTC 2017

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

Log Message:
Document a caveat with the Synet MW-P54SS

The MW-P54SS USB Wireless Broadband Router from Synet will only attach
after ejecting the virtual optical drive coming up first.

off to wizd(8)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/rum.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/rum.4
diff -u src/share/man/man4/rum.4:1.8 src/share/man/man4/rum.4:1.9
--- src/share/man/man4/rum.4:1.8	Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/rum.4	Tue May 23 00:48:29 2017
@@ -1,5 +1,5 @@
 .\" $OpenBSD: rum.4,v 1.17 2006/10/22 08:29:01 damien Exp $
-.\" $NetBSD: rum.4,v 1.8 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: rum.4,v 1.9 2017/05/23 00:48:29 khorben Exp $
 .\"
 .\" Copyright (c) 2005, 2006
 .\"	Damien Bergamini 
@@ -241,6 +241,7 @@ The following adapters should work:
 .It Senao NUB-3701
 .It Sitecom WL-113 ver 2
 .It Sitecom WL-172
+.It Synet MW-P54SS
 .It TP-LINK TL-WN321G
 .El
 .Sh EXAMPLES
@@ -325,3 +326,11 @@ driver supports automatic control of the
 Therefore the use of a
 .Nm
 adapter in Host AP mode is discouraged.
+.Pp
+The Synet MW-P54SS USB Wireless Broadband Router first attaches as a virtual
+.Xr cd 4
+device on the
+.Xr umass 4
+mass storage bus. It will re-attach with this driver after using
+.Xr eject 1
+on the corresponding device.

CVS commit: src/sys/dev/usb

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue May 23 00:32:47 UTC 2017

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

Log Message:
Also attach the MW-P54SS USB Wireless Broadband Router from Synet

Tested on NetBSD/amd64 (in HostAP mode)


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

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

Modified files:

Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.57 src/sys/dev/usb/if_rum.c:1.58
--- src/sys/dev/usb/if_rum.c:1.57	Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/if_rum.c	Tue May 23 00:32:47 2017
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $	*/
-/*	$NetBSD: if_rum.c,v 1.57 2016/11/25 12:56:29 skrll Exp $	*/
+/*	$NetBSD: if_rum.c,v 1.58 2017/05/23 00:32:47 khorben Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini 
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.57 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.58 2017/05/23 00:32:47 khorben Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -138,6 +138,7 @@ static const struct usb_devno rum_devs[]
 	{ USB_VENDOR_SITECOMEU,		USB_PRODUCT_SITECOMEU_WL172 },
 	{ USB_VENDOR_SPARKLAN,		USB_PRODUCT_SPARKLAN_RT2573 },
 	{ USB_VENDOR_SURECOM,		USB_PRODUCT_SURECOM_RT2573 },
+	{ USB_VENDOR_SYNET,		USB_PRODUCT_SYNET_MWP54SS },
 	{ USB_VENDOR_ZYXEL,		USB_PRODUCT_ZYXEL_RT2573 }
 };
 

CVS commit: src/sys/dev/usb

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue May 23 00:29:20 UTC 2017

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

Log Message:
Add Synet MW-P54SS USB Wireless Broadband Router


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

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.734 src/sys/dev/usb/usbdevs:1.735
--- src/sys/dev/usb/usbdevs:1.734	Thu May  4 14:21:01 2017
+++ src/sys/dev/usb/usbdevs	Tue May 23 00:29:20 2017
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.734 2017/05/04 14:21:01 hauke Exp $
+$NetBSD: usbdevs,v 1.735 2017/05/23 00:29:20 khorben Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -321,6 +321,7 @@ vendor STSN		0x07ef	STSN
 vendor CENTURY		0x07f7	CENTURY Corporation
 vendor BEWAN		0x07fa	Bewan
 vendor ZOOM		0x0803	Zoom Telephonics
+vendor SYNET		0x0812	Synet Electronics
 vendor BROADLOGIC	0x0827	BroadLogic
 vendor HANDSPRING	0x082d	Handspring
 vendor PALM		0x0830	Palm Computing
@@ -3196,6 +3197,9 @@ product SWEEX2 LW154		0x0154	LW154
 product SWEEX2 LW303		0x0302	LW303
 product SWEEX2 LW313		0x0313	LW313
 
+/* Synet Electronics products */
+product SYNET MWP54SS		0x3101	MW-P54SS USB Wireless Broadband Router
+
 /* System TALKS, Inc. */
 product SYSTEMTALKS SGCX2UL	0x1920	SGC-X2UL
 

CVS commit: src/tests/fs/psshfs

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 22 21:22:30 UTC 2017

Modified Files:
src/tests/fs/psshfs: sshd_config.in

Log Message:
there is no more UsePrivilegeSeparation


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/psshfs/sshd_config.in

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

Modified files:

Index: src/tests/fs/psshfs/sshd_config.in
diff -u src/tests/fs/psshfs/sshd_config.in:1.2 src/tests/fs/psshfs/sshd_config.in:1.3
--- src/tests/fs/psshfs/sshd_config.in:1.2	Fri Feb 11 08:19:46 2011
+++ src/tests/fs/psshfs/sshd_config.in	Mon May 22 17:22:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: sshd_config.in,v 1.2 2011/02/11 13:19:46 pooka Exp $
+# $NetBSD: sshd_config.in,v 1.3 2017/05/22 21:22:30 christos Exp $
 
 # Basic settings.
 Port 1
@@ -23,7 +23,6 @@ StrictModes no
 PidFile @WORKDIR@/sshd.pid
 Subsystem sftp @WORKDIR@/sftp-server
 UsePam no
-UsePrivilegeSeparation no
 
 # The root user should also be able to run the tests.
 PermitRootLogin yes

CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 22 19:16:25 UTC 2017

Modified Files:
src/lib/libedit: chartype.h

Log Message:
Add DragonFly.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libedit/chartype.h

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

Modified files:

Index: src/lib/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.34 src/lib/libedit/chartype.h:1.35
--- src/lib/libedit/chartype.h:1.34	Mon May  9 17:46:56 2016
+++ src/lib/libedit/chartype.h	Mon May 22 15:16:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: chartype.h,v 1.34 2016/05/09 21:46:56 christos Exp $	*/
+/*	$NetBSD: chartype.h,v 1.35 2017/05/22 19:16:25 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,12 @@
  * supports non-BMP code points without requiring UTF-16, but nothing
  * seems to actually advertise this properly, despite Unicode 3.1 having
  * been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+#if	!defined(__NetBSD__) && \
+	!defined(__sun) && \
+	!(defined(__APPLE__) && defined(__MACH__)) && \
+	!defined(__OpenBSD__) && \
+	!defined(__FreeBSD__) && \
+	!defined(__DragonFly__)
 #ifndef __STDC_ISO_10646__
 /* In many places it is assumed that the first 127 code points are ASCII
  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

CVS commit: src/sys/dev/wsfont

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 22 19:04:34 UTC 2017

Modified Files:
src/sys/dev/wsfont: files.wsfont

Log Message:
vcons needs fonts now.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/wsfont/files.wsfont

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/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.22 src/sys/dev/wsfont/files.wsfont:1.23
--- src/sys/dev/wsfont/files.wsfont:1.22	Sun Nov 20 10:55:31 2016
+++ src/sys/dev/wsfont/files.wsfont	Mon May 22 15:04:34 2017
@@ -1,11 +1,11 @@
-# 	$NetBSD: files.wsfont,v 1.22 2016/11/20 15:55:31 macallan Exp $
+# 	$NetBSD: files.wsfont,v 1.23 2017/05/22 19:04:34 christos Exp $
 
 defpseudo wsfont
 
 # Note: `wsfont_glue' is only here to force the header file's name
 #	hence it must be mentioned first  (shudder...)
 file	dev/wsfont/wsfont.c	(wsfont_glue & rasops_rotation) |
-rasterconsole | wsdisplay | wsfont		needs-flag
+rasterconsole | wsdisplay | wsfont | vcons		needs-flag
 
 defflag	opt_wsfont.h		FONT_BOLD8x16
 FONT_GLASS10x19

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon May 22 18:57:05 UTC 2017

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

Log Message:
Ammend entry for ticket #1394.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 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.18 src/doc/CHANGES-7.2:1.1.2.19
--- src/doc/CHANGES-7.2:1.1.2.18	Tue May 16 22:52:57 2017
+++ src/doc/CHANGES-7.2	Mon May 22 18:57:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.18 2017/05/16 22:52:57 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.19 2017/05/22 18:57:05 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -1045,10 +1045,11 @@ share/misc/bsd-family-tree			1.59
 	Sync with r316082 from FreeBSD
 	[sevan, ticket #1392]
 
-sys/net/npf/npf_inet.c1.34, 1.35 via patch
+sys/net/npf/npf_inet.c1.33-1.35 via patch
 sys/net/npf/npf_mbuf.c1.16
 sys/net/npf/npf_nat.c1.40
 
+	Make DDB print ipv6 addresses too.
 	Fix build without INET6.
 	[jnemeth, ticket #1394]
 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon May 22 18:56:35 UTC 2017

Modified Files:
src/sys/net/npf [netbsd-7]: npf_inet.c

Log Message:
Pull up missing part of rev 1.33, partly pulled up in ticket #1394:
make DDB print ipv6 addresses too


To generate a diff of this commit:
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 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.32.2.1 src/sys/net/npf/npf_inet.c:1.32.2.2
--- src/sys/net/npf/npf_inet.c:1.32.2.1	Fri May 12 05:32:12 2017
+++ src/sys/net/npf/npf_inet.c	Mon May 22 18:56:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.32.2.1 2017/05/12 05:32:12 snj Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.32.2.2 2017/05/22 18:56:35 martin Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.32.2.1 2017/05/12 05:32:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.32.2.2 2017/05/22 18:56:35 martin Exp $");
 
 #include 
 #include 
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

CVS commit: src/sys/dev/ic

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:23:49 UTC 2017

Modified Files:
src/sys/dev/ic: sgec.c sgecvar.h

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/sgec.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/sgecvar.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/sgec.c
diff -u src/sys/dev/ic/sgec.c:1.45 src/sys/dev/ic/sgec.c:1.46
--- src/sys/dev/ic/sgec.c:1.45	Thu Dec 15 09:33:25 2016
+++ src/sys/dev/ic/sgec.c	Mon May 22 17:23:49 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: sgec.c,v 1.45 2016/12/15 09:33:25 ozaki-r Exp $ */
+/*  $NetBSD: sgec.c,v 1.46 2017/05/22 17:23:49 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -10,12 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -45,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.45 2016/12/15 09:33:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.46 2017/05/22 17:23:49 ragge Exp $");
 
 #include "opt_inet.h"
 

Index: src/sys/dev/ic/sgecvar.h
diff -u src/sys/dev/ic/sgecvar.h:1.8 src/sys/dev/ic/sgecvar.h:1.9
--- src/sys/dev/ic/sgecvar.h:1.8	Tue Mar 11 05:34:01 2008
+++ src/sys/dev/ic/sgecvar.h	Mon May 22 17:23:49 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: sgecvar.h,v 1.8 2008/03/11 05:34:01 matt Exp $ */
+/*  $NetBSD: sgecvar.h,v 1.9 2017/05/22 17:23:49 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -10,12 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

CVS commit: src/sys/dev/qbus

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:22:29 UTC 2017

Modified Files:
src/sys/dev/qbus: dz_uba.c if_de.c if_qe.c rl.c rlreg.h rlvar.h tsreg.h
uba.c ubareg.h uda.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/qbus/dz_uba.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/qbus/if_de.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/qbus/if_qe.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/qbus/rlreg.h src/sys/dev/qbus/tsreg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/qbus/rlvar.h
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/qbus/uba.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/qbus/ubareg.h
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/qbus/uda.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/qbus/dz_uba.c
diff -u src/sys/dev/qbus/dz_uba.c:1.28 src/sys/dev/qbus/dz_uba.c:1.29
--- src/sys/dev/qbus/dz_uba.c:1.28	Sat Mar 15 00:57:15 2008
+++ src/sys/dev/qbus/dz_uba.c	Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_uba.c,v 1.28 2008/03/15 00:57:15 matt Exp $ */
+/*	$NetBSD: dz_uba.c,v 1.29 2017/05/22 17:22:29 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -11,11 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -31,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.28 2008/03/15 00:57:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.29 2017/05/22 17:22:29 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/dev/qbus/if_de.c
diff -u src/sys/dev/qbus/if_de.c:1.31 src/sys/dev/qbus/if_de.c:1.32
--- src/sys/dev/qbus/if_de.c:1.31	Thu Dec 15 09:28:06 2016
+++ src/sys/dev/qbus/if_de.c	Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.31 2016/12/15 09:28:06 ozaki-r Exp $	*/
+/*	$NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -45,13 +45,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -64,8 +57,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)if_de.c	7.12 (Berkeley) 12/16/90
  */
 
 /*
@@ -81,7 +72,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.31 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $");
 
 #include "opt_inet.h"
 

Index: src/sys/dev/qbus/if_qe.c
diff -u src/sys/dev/qbus/if_qe.c:1.76 src/sys/dev/qbus/if_qe.c:1.77
--- src/sys/dev/qbus/if_qe.c:1.76	Thu Dec 15 09:28:06 2016
+++ src/sys/dev/qbus/if_qe.c	Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_qe.c,v 1.76 2016/12/15 09:28:06 ozaki-r Exp $ */
+/*  $NetBSD: if_qe.c,v 1.77 2017/05/22 17:22:29 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -10,12 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:17:25 UTC 2017

Modified Files:
src/sys/arch/vax/vsa: dz_vsbus.c hdc9224.c hdc9224.h smg.c vsbus.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/vsa/hdc9224.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/vax/vsa/vsbus.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/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.43 src/sys/arch/vax/vsa/dz_vsbus.c:1.44
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.43	Thu Jun 28 13:58:21 2012
+++ src/sys/arch/vax/vsa/dz_vsbus.c	Mon May 22 17:17:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $ */
+/*	$NetBSD: dz_vsbus.c,v 1.44 2017/05/22 17:17:25 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.44 2017/05/22 17:17:25 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/arch/vax/vsa/hdc9224.c
diff -u src/sys/arch/vax/vsa/hdc9224.c:1.57 src/sys/arch/vax/vsa/hdc9224.c:1.58
--- src/sys/arch/vax/vsa/hdc9224.c:1.57	Fri Jan  2 19:42:06 2015
+++ src/sys/arch/vax/vsa/hdc9224.c	Mon May 22 17:17:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $ */
+/*	$NetBSD: hdc9224.c,v 1.58 2017/05/22 17:17:25 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -13,12 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -51,7 +45,7 @@
 #undef	RDDEBUG
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.58 2017/05/22 17:17:25 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/arch/vax/vsa/hdc9224.h
diff -u src/sys/arch/vax/vsa/hdc9224.h:1.6 src/sys/arch/vax/vsa/hdc9224.h:1.7
--- src/sys/arch/vax/vsa/hdc9224.h:1.6	Sun Dec 11 12:19:37 2005
+++ src/sys/arch/vax/vsa/hdc9224.h	Mon May 22 17:17:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdc9224.h,v 1.6 2005/12/11 12:19:37 christos Exp $ */
+/*	$NetBSD: hdc9224.h,v 1.7 2017/05/22 17:17:25 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -13,12 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:15:45 UTC 2017

Modified Files:
src/sys/arch/vax/uba: qv.c uba_cmi.c uba_mainbus.c uba_sbi.c uba_ubi.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/uba/uba_cmi.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/uba/uba_mainbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/uba/uba_sbi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/uba/uba_ubi.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/uba/qv.c
diff -u src/sys/arch/vax/uba/qv.c:1.32 src/sys/arch/vax/uba/qv.c:1.33
--- src/sys/arch/vax/uba/qv.c:1.32	Thu Jul  7 06:55:39 2016
+++ src/sys/arch/vax/uba/qv.c	Mon May 22 17:15:45 2017
@@ -1,4 +1,4 @@
-/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $*/
+/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $*/
 /*
  * Copyright (c) 2015 Charles H. Dickman. All rights reserved.
  * Derived from smg.c
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -35,7 +31,7 @@
 /*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
 
 #include 
-__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/arch/vax/uba/uba_cmi.c
diff -u src/sys/arch/vax/uba/uba_cmi.c:1.15 src/sys/arch/vax/uba/uba_cmi.c:1.16
--- src/sys/arch/vax/uba/uba_cmi.c:1.15	Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/uba/uba_cmi.c	Mon May 22 17:15:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $	   */
+/*	$NetBSD: uba_cmi.c,v 1.16 2017/05/22 17:15:45 ragge Exp $	   */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -43,13 +43,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -68,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.16 2017/05/22 17:15:45 ragge Exp $");
 
 #define _VAX_BUS_DMA_PRIVATE
 

Index: src/sys/arch/vax/uba/uba_mainbus.c
diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.13 src/sys/arch/vax/uba/uba_mainbus.c:1.14
--- src/sys/arch/vax/uba/uba_mainbus.c:1.13	Fri Apr 22 18:12:47 2016
+++ src/sys/arch/vax/uba/uba_mainbus.c	Mon May 22 17:15:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_mainbus.c,v 1.13 2016/04/22 18:12:47 christos Exp $	   */
+/*	$NetBSD: uba_mainbus.c,v 1.14 2017/05/22 17:15:45 ragge Exp $	   */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -43,13 +43,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:13:09 UTC 2017

Modified Files:
src/sys/arch/vax/mba: hp.c hpreg.h mba.c mbareg.h mbavar.h

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/vax/mba/hp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/mba/hpreg.h \
src/sys/arch/vax/mba/mbareg.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/vax/mba/mba.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/mba/mbavar.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/vax/mba/hp.c
diff -u src/sys/arch/vax/mba/hp.c:1.53 src/sys/arch/vax/mba/hp.c:1.54
--- src/sys/arch/vax/mba/hp.c:1.53	Thu Jul  7 06:55:39 2016
+++ src/sys/arch/vax/mba/hp.c	Mon May 22 17:13:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $ */
+/*	$NetBSD: hp.c,v 1.54 2017/05/22 17:13:09 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -42,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.54 2017/05/22 17:13:09 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/arch/vax/mba/hpreg.h
diff -u src/sys/arch/vax/mba/hpreg.h:1.5 src/sys/arch/vax/mba/hpreg.h:1.6
--- src/sys/arch/vax/mba/hpreg.h:1.5	Sun Jun  4 18:04:39 2000
+++ src/sys/arch/vax/mba/hpreg.h	Mon May 22 17:13:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpreg.h,v 1.5 2000/06/04 18:04:39 ragge Exp $ */
+/*	$NetBSD: hpreg.h,v 1.6 2017/05/22 17:13:09 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/vax/mba/mbareg.h
diff -u src/sys/arch/vax/mba/mbareg.h:1.5 src/sys/arch/vax/mba/mbareg.h:1.6
--- src/sys/arch/vax/mba/mbareg.h:1.5	Thu Oct 16 12:47:22 2008
+++ src/sys/arch/vax/mba/mbareg.h	Mon May 22 17:13:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbareg.h,v 1.5 2008/10/16 12:47:22 hans Exp $ */
+/*	$NetBSD: mbareg.h,v 1.6 2017/05/22 17:13:09 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/mba/mba.c
diff -u src/sys/arch/vax/mba/mba.c:1.39 src/sys/arch/vax/mba/mba.c:1.40
--- src/sys/arch/vax/mba/mba.c:1.39	Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/mba/mba.c	Mon May 22 17:13:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $ */
+/*	$NetBSD: mba.c,v 1.40 2017/05/22 17:13:09 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
  * All rights 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:12:11 UTC 2017

Modified Files:
src/sys/arch/vax/include: cca.h clock.h cpu.h frame.h ka410.h ka420.h
ka43.h ka46.h ka48.h ka670.h ka680.h ka730.h ka750.h ka88.h lock.h
macros.h mtpr.h pcb.h pte.h ptrace.h reg.h rpb.h rsp.h scb.h sid.h
userret.h uvax.h vsbus.h

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/include/cca.h \
src/sys/arch/vax/include/frame.h src/sys/arch/vax/include/ka680.h \
src/sys/arch/vax/include/rsp.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/include/clock.h \
src/sys/arch/vax/include/ptrace.h src/sys/arch/vax/include/rpb.h
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/vax/include/cpu.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/ka410.h \
src/sys/arch/vax/include/ka88.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/include/ka420.h \
src/sys/arch/vax/include/ka46.h src/sys/arch/vax/include/ka48.h \
src/sys/arch/vax/include/ka670.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/ka43.h \
src/sys/arch/vax/include/uvax.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/include/ka730.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/include/ka750.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/include/lock.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/vax/include/macros.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/vax/include/mtpr.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/pcb.h \
src/sys/arch/vax/include/userret.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/include/pte.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/reg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/scb.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/include/sid.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/include/vsbus.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/vax/include/cca.h
diff -u src/sys/arch/vax/include/cca.h:1.2 src/sys/arch/vax/include/cca.h:1.3
--- src/sys/arch/vax/include/cca.h:1.2	Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/include/cca.h	Mon May 22 17:12:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cca.h,v 1.2 2008/03/11 05:34:02 matt Exp $	*/
+/*	$NetBSD: cca.h,v 1.3 2017/05/22 17:12:11 ragge Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/vax/include/frame.h
diff -u src/sys/arch/vax/include/frame.h:1.2 src/sys/arch/vax/include/frame.h:1.3
--- src/sys/arch/vax/include/frame.h:1.2	Sun Jun  4 19:30:15 2000
+++ src/sys/arch/vax/include/frame.h	Mon May 22 17:12:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: frame.h,v 1.2 2000/06/04 19:30:15 matt Exp $ */
+/*	$NetBSD: frame.h,v 1.3 2017/05/22 17:12:11 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/vax/include/ka680.h
diff -u src/sys/arch/vax/include/ka680.h:1.2 src/sys/arch/vax/include/ka680.h:1.3
--- src/sys/arch/vax/include/ka680.h:1.2	Sun Dec  1 21:21:45 2002
+++ src/sys/arch/vax/include/ka680.h	Mon May 22 17:12:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka680.h,v 1.2 2002/12/01 21:21:45 matt Exp $	*/
+/*	$NetBSD: ka680.h,v 1.3 2017/05/22 17:12:11 ragge Exp $	*/
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:02:41 UTC 2017

Modified Files:
src/sys/arch/vax/if: if_ze.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/if/if_ze.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/if/if_ze.c
diff -u src/sys/arch/vax/if/if_ze.c:1.17 src/sys/arch/vax/if/if_ze.c:1.18
--- src/sys/arch/vax/if/if_ze.c:1.17	Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/if/if_ze.c	Mon May 22 17:02:41 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $ */
+/*  $NetBSD: if_ze.c,v 1.18 2017/05/22 17:02:41 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -10,12 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -30,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.18 2017/05/22 17:02:41 ragge Exp $");
 
 #include "opt_cputype.h"
 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:00:55 UTC 2017

Modified Files:
src/sys/arch/vax/boot/xxboot: start.S

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/boot/xxboot/start.S

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

Modified files:

Index: src/sys/arch/vax/boot/xxboot/start.S
diff -u src/sys/arch/vax/boot/xxboot/start.S:1.5 src/sys/arch/vax/boot/xxboot/start.S:1.6
--- src/sys/arch/vax/boot/xxboot/start.S:1.5	Thu Apr  4 12:48:07 2013
+++ src/sys/arch/vax/boot/xxboot/start.S	Mon May 22 17:00:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: start.S,v 1.5 2013/04/04 12:48:07 martin Exp $ */
+/*	$NetBSD: start.S,v 1.6 2017/05/22 17:00:55 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -14,12 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 17:00:19 UTC 2017

Modified Files:
src/sys/arch/vax/boot/common: romread.S srt0.S str.S

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/boot/common/romread.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/boot/common/srt0.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/boot/common/str.S

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

Modified files:

Index: src/sys/arch/vax/boot/common/romread.S
diff -u src/sys/arch/vax/boot/common/romread.S:1.1 src/sys/arch/vax/boot/common/romread.S:1.2
--- src/sys/arch/vax/boot/common/romread.S:1.1	Sun Feb 24 01:04:25 2002
+++ src/sys/arch/vax/boot/common/romread.S	Mon May 22 17:00:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: romread.S,v 1.1 2002/02/24 01:04:25 matt Exp $ */
+/*	$NetBSD: romread.S,v 1.2 2017/05/22 17:00:19 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -14,12 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/boot/common/srt0.S
diff -u src/sys/arch/vax/boot/common/srt0.S:1.4 src/sys/arch/vax/boot/common/srt0.S:1.5
--- src/sys/arch/vax/boot/common/srt0.S:1.4	Mon Dec  2 20:23:32 2002
+++ src/sys/arch/vax/boot/common/srt0.S	Mon May 22 17:00:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: srt0.S,v 1.4 2002/12/02 20:23:32 ragge Exp $ */
+/*	$NetBSD: srt0.S,v 1.5 2017/05/22 17:00:19 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/boot/common/str.S
diff -u src/sys/arch/vax/boot/common/str.S:1.5 src/sys/arch/vax/boot/common/str.S:1.6
--- src/sys/arch/vax/boot/common/str.S:1.5	Sun Dec 11 12:19:34 2005
+++ src/sys/arch/vax/boot/common/str.S	Mon May 22 17:00:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.S,v 1.5 2005/12/11 12:19:34 christos Exp $ */
+/*	$NetBSD: str.S,v 1.6 2017/05/22 17:00:19 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 16:59:32 UTC 2017

Modified Files:
src/sys/arch/vax/boot/boot: autoconf.c conf.c consio.c consio2.S ctu.c
data.h devopen.c hp.c if_de.c if_le.c if_ni.c mfm.c ra.c rom.c
tmscp.c vaxstand.h

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/boot/boot/autoconf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/boot/boot/conf.c \
src/sys/arch/vax/boot/boot/consio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/boot/boot/consio2.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/boot/boot/ctu.c \
src/sys/arch/vax/boot/boot/if_de.c src/sys/arch/vax/boot/boot/tmscp.c \
src/sys/arch/vax/boot/boot/vaxstand.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/boot/boot/data.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/boot/boot/devopen.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/boot/boot/hp.c \
src/sys/arch/vax/boot/boot/rom.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/boot/boot/if_le.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/boot/boot/if_ni.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/boot/boot/mfm.c
cvs rdiff -u -r1.19 -r1.20 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/autoconf.c
diff -u src/sys/arch/vax/boot/boot/autoconf.c:1.28 src/sys/arch/vax/boot/boot/autoconf.c:1.29
--- src/sys/arch/vax/boot/boot/autoconf.c:1.28	Wed Mar 18 10:22:37 2009
+++ src/sys/arch/vax/boot/boot/autoconf.c	Mon May 22 16:59:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.28 2009/03/18 10:22:37 cegger Exp $ */
+/*	$NetBSD: autoconf.c,v 1.29 2017/05/22 16:59:32 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/boot/boot/conf.c
diff -u src/sys/arch/vax/boot/boot/conf.c:1.16 src/sys/arch/vax/boot/boot/conf.c:1.17
--- src/sys/arch/vax/boot/boot/conf.c:1.16	Fri Jun 28 01:13:40 2013
+++ src/sys/arch/vax/boot/boot/conf.c	Mon May 22 16:59:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.16 2013/06/28 01:13:40 matt Exp $ */
+/*	$NetBSD: conf.c,v 1.17 2017/05/22 16:59:32 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/vax/boot/boot/consio.c
diff -u src/sys/arch/vax/boot/boot/consio.c:1.16 src/sys/arch/vax/boot/boot/consio.c:1.17
--- src/sys/arch/vax/boot/boot/consio.c:1.16	Thu Jul  7 06:55:39 2016
+++ src/sys/arch/vax/boot/boot/consio.c	Mon May 22 16:59:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: consio.c,v 1.16 2016/07/07 06:55:39 msaitoh Exp $ */
+/*	$NetBSD: consio.c,v 1.17 2017/05/22 16:59:32 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 16:53:59 UTC 2017

Modified Files:
src/sys/arch/vax/bi: bi_mainbus.c bi_nmi.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/bi/bi_mainbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/bi/bi_nmi.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/bi/bi_mainbus.c
diff -u src/sys/arch/vax/bi/bi_mainbus.c:1.11 src/sys/arch/vax/bi/bi_mainbus.c:1.12
--- src/sys/arch/vax/bi/bi_mainbus.c:1.11	Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/bi/bi_mainbus.c	Mon May 22 16:53:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $	   */
+/*	$NetBSD: bi_mainbus.c,v 1.12 2017/05/22 16:53:59 ragge Exp $	   */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.12 2017/05/22 16:53:59 ragge Exp $");
 
 #define _VAX_BUS_DMA_PRIVATE
 

Index: src/sys/arch/vax/bi/bi_nmi.c
diff -u src/sys/arch/vax/bi/bi_nmi.c:1.8 src/sys/arch/vax/bi/bi_nmi.c:1.9
--- src/sys/arch/vax/bi/bi_nmi.c:1.8	Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/bi/bi_nmi.c	Mon May 22 16:53:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $	   */
+/*	$NetBSD: bi_nmi.c,v 1.9 2017/05/22 16:53:59 ragge Exp $	   */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.9 2017/05/22 16:53:59 ragge Exp $");
 
 #define _VAX_BUS_DMA_PRIVATE
 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 16:53:05 UTC 2017

Modified Files:
src/sys/arch/vax/vax: ka88.c locore.c multicpu.c nmi_mainbus.c
opcodes.c pmap.c sbi.c scb.c sig_machdep.c subr.S syscall.c trap.c
ubi.c unimpl_emul.S vm_machdep.c xmi_mainbus.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka88.c \
src/sys/arch/vax/vax/scb.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/vax/vax/locore.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/multicpu.c \
src/sys/arch/vax/vax/subr.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/vax/nmi_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/vax/opcodes.c
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/vax/vax/sbi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/sig_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/syscall.c
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/vax/vax/trap.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/ubi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/unimpl_emul.S
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/vax/vax/vm_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vax/xmi_mainbus.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/vax/ka88.c
diff -u src/sys/arch/vax/vax/ka88.c:1.18 src/sys/arch/vax/vax/ka88.c:1.19
--- src/sys/arch/vax/vax/ka88.c:1.18	Wed Mar 26 08:01:21 2014
+++ src/sys/arch/vax/vax/ka88.c	Mon May 22 16:53:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $	*/
+/*	$NetBSD: ka88.c,v 1.19 2017/05/22 16:53:05 ragge Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -39,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.19 2017/05/22 16:53:05 ragge Exp $");
 
 #include "opt_multiprocessor.h"
 
Index: src/sys/arch/vax/vax/scb.c
diff -u src/sys/arch/vax/vax/scb.c:1.18 src/sys/arch/vax/vax/scb.c:1.19
--- src/sys/arch/vax/vax/scb.c:1.18	Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/scb.c	Mon May 22 16:53:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $ */
+/*	$NetBSD: scb.c,v 1.19 2017/05/22 16:53:05 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed at Ludd, University of 
- *  Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -34,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.19 2017/05/22 16:53:05 ragge Exp $");
 
 #include 
 #include 

Index: src/sys/arch/vax/vax/locore.c
diff -u src/sys/arch/vax/vax/locore.c:1.83 src/sys/arch/vax/vax/locore.c:1.84
--- src/sys/arch/vax/vax/locore.c:1.83	Thu Aug 27 17:18:58 2015
+++ src/sys/arch/vax/vax/locore.c	Mon May 22 16:53:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.c,v 1.83 2015/08/27 17:18:58 jklos Exp $	*/
+/*	$NetBSD: locore.c,v 1.84 2017/05/22 16:53:05 ragge Exp $	*/
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer 

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 16:46:15 UTC 2017

Modified Files:
src/sys/arch/vax/vax: gencons.c gencons.h intvec.S ka410.c ka43.c
ka46.c ka48.c ka49.c ka53.c ka610.c ka6400.c ka660.c ka670.c
ka680.c ka730.c ka750.c

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/vax/vax/gencons.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vax/gencons.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/intvec.S \
src/sys/arch/vax/vax/ka48.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/ka410.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ka43.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/vax/vax/ka46.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/ka49.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/vax/ka53.c \
src/sys/arch/vax/vax/ka670.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vax/ka610.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka6400.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/vax/ka660.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/ka680.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/ka730.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/vax/vax/ka750.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/vax/gencons.c
diff -u src/sys/arch/vax/vax/gencons.c:1.55 src/sys/arch/vax/vax/gencons.c:1.56
--- src/sys/arch/vax/vax/gencons.c:1.55	Thu Jul  7 06:55:39 2016
+++ src/sys/arch/vax/vax/gencons.c	Mon May 22 16:46:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $	*/
+/*	$NetBSD: gencons.c,v 1.56 2017/05/22 16:46:15 ragge Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -13,9 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
  * 4. The name of the author may not be used to endorse or promote products
  *derived from this software without specific prior written permission
  *
@@ -36,7 +33,7 @@
  /* All bugs are subject to removal without further notice */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.56 2017/05/22 16:46:15 ragge Exp $");
 
 #include "opt_ddb.h"
 #include "opt_cputype.h"

Index: src/sys/arch/vax/vax/gencons.h
diff -u src/sys/arch/vax/vax/gencons.h:1.10 src/sys/arch/vax/vax/gencons.h:1.11
--- src/sys/arch/vax/vax/gencons.h:1.10	Sun Jun  3 15:07:20 2001
+++ src/sys/arch/vax/vax/gencons.h	Mon May 22 16:46:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gencons.h,v 1.10 2001/06/03 15:07:20 ragge Exp $ */
+/*	$NetBSD: gencons.h,v 1.11 2017/05/22 16:46:15 ragge Exp $ */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/vax/intvec.S
diff -u src/sys/arch/vax/vax/intvec.S:1.21 src/sys/arch/vax/vax/intvec.S:1.22
--- src/sys/arch/vax/vax/intvec.S:1.21	Thu Feb  2 18:31:41 2012
+++ src/sys/arch/vax/vax/intvec.S	Mon May 22 16:46:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: intvec.S,v 1.21 2012/02/02 18:31:41 matt Exp $   */
+/*	$NetBSD: intvec.S,v 1.22 2017/05/22 16:46:15 ragge Exp $   */
 
 /*
  * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *

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

[Anders Magnusson]

Module Name:src
Committed By:   ragge
Date:   Mon May 22 16:39:41 UTC 2017

Modified Files:
src/sys/arch/vax/vax: autoconf.c bus_mem.c cfl.c clock.c cmi.c
core_machdep.c ctu.c db_disasm.c db_disasm.h findcpu.c genassym.cf

Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/vax/bus_mem.c \
src/sys/arch/vax/vax/cmi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/cfl.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vax/clock.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/vax/core_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ctu.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/db_disasm.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vax/db_disasm.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/findcpu.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vax/genassym.cf

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/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.96 src/sys/arch/vax/vax/autoconf.c:1.97
--- src/sys/arch/vax/vax/autoconf.c:1.96	Tue May 20 16:02:37 2014
+++ src/sys/arch/vax/vax/autoconf.c	Mon May 22 16:39:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.97 2017/05/22 16:39:40 ragge Exp $	*/
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.97 2017/05/22 16:39:40 ragge Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cputype.h"

Index: src/sys/arch/vax/vax/bus_mem.c
diff -u src/sys/arch/vax/vax/bus_mem.c:1.13 src/sys/arch/vax/vax/bus_mem.c:1.14
--- src/sys/arch/vax/vax/bus_mem.c:1.13	Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/bus_mem.c	Mon May 22 16:39:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */
+/*	$NetBSD: bus_mem.c,v 1.14 2017/05/22 16:39:40 ragge Exp $ */
 /*
  * Copyright (c) 1998 Matt Thomas
  * All rights reserved.
@@ -13,12 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.14 2017/05/22 16:39:40 ragge Exp $");
 
 #include 
 #include 
Index: src/sys/arch/vax/vax/cmi.c
diff -u src/sys/arch/vax/vax/cmi.c:1.13 src/sys/arch/vax/vax/cmi.c:1.14
--- src/sys/arch/vax/vax/cmi.c:1.13	Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/cmi.c	Mon May 22 16:39:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmi.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */
+/*	$NetBSD: cmi.c,v 1.14 2017/05/22 16:39:40 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of 
- *	Lule}, Sweden and its contributors.
- * 4. The name of the 

CVS commit: [bouyer-socketcan] src/sys

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon May 22 16:11:23 UTC 2017

Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c
src/sys/netcan [bouyer-socketcan]: can.c can_var.h if_canloop.c

Log Message:
factor out if_attach() and bpf_attach() calls in can_ifattach().
Introduce can_ifdetach().
Introduce can_bpf_mtap(), which converts the can_id to network byte
order (as required by tcpdump/wireshark). Thanks to Guy Harris for
poiting this requirement.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/arm/allwinner/awin_can.c
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/netcan/can.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/netcan/can_var.h
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/netcan/if_canloop.c

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

Modified files:

Index: src/sys/arch/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.5 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.6
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.5	Fri Apr 21 13:08:55 2017
+++ src/sys/arch/arm/allwinner/awin_can.c	Mon May 22 16:11:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_can.c,v 1.1.2.5 2017/04/21 13:08:55 bouyer Exp $	*/
+/*	$NetBSD: awin_can.c,v 1.1.2.6 2017/05/22 16:11:23 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.5 2017/04/21 13:08:55 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.6 2017/05/22 16:11:23 bouyer Exp $");
 
 #include 
 #include 
@@ -55,7 +55,6 @@ __KERNEL_RCSID(1, "$NetBSD: awin_can.c,v
 #include 
 #include 
 #endif
-#include 
 
 #include 
 #include 
@@ -209,9 +208,7 @@ awin_can_attach(device_t parent, device_
 	/*  
 	 * Attach the interface.
 	 */
-	if_attach(ifp);
 	can_ifattach(ifp);
-	bpf_attach(ifp, DLT_CAN_SOCKETCAN, 0);
 	rnd_attach_source(>sc_rnd_source, device_xname(self),
 	RND_TYPE_NET, RND_FLAG_DEFAULT);
 #ifdef MBUFTRACE
@@ -278,7 +275,7 @@ awin_can_rx_intr(struct awin_can_softc *
 	ifp->if_ipackets++;
 	ifp->if_ibytes += m->m_len;
 	m_set_rcvif(m, ifp);
-	bpf_mtap(ifp, m);
+	can_bpf_mtap(ifp, m);
 	can_input(ifp, m);
 }
 
@@ -352,7 +349,7 @@ awin_can_tx_intr(struct awin_can_softc *
 	}
 	ifp->if_flags |= IFF_OACTIVE;
 	ifp->if_timer = 5;
-	bpf_mtap(ifp, m);
+	can_bpf_mtap(ifp, m);
 }
 
 static int

Index: src/sys/netcan/can.c
diff -u src/sys/netcan/can.c:1.1.2.13 src/sys/netcan/can.c:1.1.2.14
--- src/sys/netcan/can.c:1.1.2.13	Sun Apr 23 21:05:09 2017
+++ src/sys/netcan/can.c	Mon May 22 16:11:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: can.c,v 1.1.2.13 2017/04/23 21:05:09 bouyer Exp $	*/
+/*	$NetBSD: can.c,v 1.1.2.14 2017/05/22 16:11:23 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.13 2017/04/23 21:05:09 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.14 2017/05/22 16:11:23 bouyer Exp $");
 
 #include 
 #include 
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.
 #include 
 #include 
 #include 
+#include  
 
 #include 
 #include 
@@ -192,7 +193,9 @@ can_purgeif(struct socket *so, struct if
 }
 
 void
-can_ifattach(struct ifnet *ifp) {
+can_ifattach(struct ifnet *ifp)
+{
+	if_attach(ifp);
 	ifp->if_mtu = sizeof(struct can_frame);
 	ifp->if_type = IFT_OTHER;
 	ifp->if_hdrlen = 0;
@@ -201,6 +204,14 @@ can_ifattach(struct ifnet *ifp) {
 	ifp->if_output = NULL; /* unused */
 	IFQ_SET_READY(>if_snd);
 	if_alloc_sadl(ifp);
+	bpf_attach(ifp, DLT_CAN_SOCKETCAN, 0);
+}
+
+void
+can_ifdetach(struct ifnet *ifp)
+{
+	bpf_detach(ifp);
+	if_detach(ifp);
 }
 
 void
@@ -404,6 +415,20 @@ canintr(void)
 	mutex_exit(softnet_lock);
 }
 
+void
+can_bpf_mtap(struct ifnet *ifp, struct mbuf *m)
+{
+	/* bpf wants the CAN id in network byte order */
+	struct can_frame *cf;
+	canid_t oid;
+
+	cf = mtod(m, struct can_frame *);
+	oid = cf->can_id;
+	cf->can_id = htonl(oid);
+	bpf_mtap(ifp, m);
+	cf->can_id = oid;
+}
+
 static int
 can_attach(struct socket *so, int proto)
 {

Index: src/sys/netcan/can_var.h
diff -u src/sys/netcan/can_var.h:1.1.2.7 src/sys/netcan/can_var.h:1.1.2.8
--- src/sys/netcan/can_var.h:1.1.2.7	Tue Apr 18 21:29:40 2017
+++ src/sys/netcan/can_var.h	Mon May 22 16:11:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: can_var.h,v 1.1.2.7 2017/04/18 21:29:40 bouyer Exp $	*/
+/*	$NetBSD: can_var.h,v 1.1.2.8 2017/05/22 16:11:23 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -60,6 +60,7 @@ extern struct domain candomain;
 extern const struct pr_usrreqs can_usrreqs;
 
 void can_ifattach(struct ifnet *);
+void can_ifdetach(struct ifnet *);
 void can_ifinit_timings(struct canif_softc *);
 void can_mbuf_tag_clean(struct mbuf *);
 void can_input(struct ifnet *, struct mbuf *);
@@ -67,6 +68,7 @@ void *can_ctlinput(int, struct sockaddr 
 int can_ctloutput(int, struct 

CVS commit: src/sys/dev/acpi

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Mon May 22 14:07:00 UTC 2017

Modified Files:
src/sys/dev/acpi: apple_smc_acpi.c

Log Message:
Reassign my copyright to TNF.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/apple_smc_acpi.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/acpi/apple_smc_acpi.c
diff -u src/sys/dev/acpi/apple_smc_acpi.c:1.3 src/sys/dev/acpi/apple_smc_acpi.c:1.4
--- src/sys/dev/acpi/apple_smc_acpi.c:1.3	Tue Apr  1 17:49:40 2014
+++ src/sys/dev/acpi/apple_smc_acpi.c	Mon May 22 14:07:00 2017
@@ -1,13 +1,16 @@
-/*	$NetBSD: apple_smc_acpi.c,v 1.3 2014/04/01 17:49:40 riastradh Exp $	*/
+/*	$NetBSD: apple_smc_acpi.c,v 1.4 2017/05/22 14:07:00 riastradh Exp $	*/
 
 /*
  * Apple System Management Controller: ACPI Attachment
  */
 
 /*-
- * Copyright (c) 2013 Taylor R. Campbell
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,21 +20,21 @@
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_acpi.c,v 1.3 2014/04/01 17:49:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_acpi.c,v 1.4 2017/05/22 14:07:00 riastradh Exp $");
 
 #include 
 #include 

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon May 22 07:35:15 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
 Fix a bug that the driver prints "Link is up 1 Gbps" even if the link is
100Mbps. This change is the same as a part of ixv.c rev. 1.42.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/pci/ixgbe/ixgbe.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.83 src/sys/dev/pci/ixgbe/ixgbe.c:1.84
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.83	Mon May 22 07:23:55 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Mon May 22 07:35:14 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.83 2017/05/22 07:23:55 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.84 2017/05/22 07:35:14 msaitoh Exp $*/
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2381,7 +2381,7 @@ ixgbe_update_link_status(struct adapter 
 	device_t dev = adapter->dev;
 	struct ixgbe_hw *hw = >hw;
 
-	if (adapter->link_up){ 
+	if (adapter->link_up) {
 		if (adapter->link_active == FALSE) {
 			if (adapter->link_speed == IXGBE_LINK_SPEED_10GB_FULL){
 /*
@@ -2394,10 +2394,26 @@ ixgbe_update_link_status(struct adapter 
 IXGBE_READ_REG(hw, IXGBE_MRFC);
 			}
 
-			if (bootverbose)
-device_printf(dev,"Link is up %d Gbps %s \n",
-((adapter->link_speed == 128)? 10:1),
-"Full Duplex");
+			if (bootverbose) {
+const char *bpsmsg;
+
+switch (adapter->link_speed) {
+case IXGBE_LINK_SPEED_10GB_FULL:
+	bpsmsg = "10 Gbps";
+	break;
+case IXGBE_LINK_SPEED_1GB_FULL:
+	bpsmsg = "1 Gbps";
+	break;
+case IXGBE_LINK_SPEED_100_FULL:
+	bpsmsg = "100 Mbps";
+	break;
+default:
+	bpsmsg = "unknown speed";
+	break;
+}
+device_printf(dev,"Link is up %s %s \n",
+bpsmsg, "Full Duplex");
+			}
 			adapter->link_active = TRUE;
 			/* Update any Flow Control changes */
 			ixgbe_fc_enable(>hw);

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon May 22 07:23:55 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
 Document says M[LR]FC are valid when link is up and 10Gbps, so:
 - Add those values when link is up and 10Gbps
 - Discard those vaules when link becomes up and the speed is 10Gbps


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/ixgbe/ixgbe.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.82 src/sys/dev/pci/ixgbe/ixgbe.c:1.83
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.82	Thu May 18 08:27:19 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Mon May 22 07:23:55 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.82 2017/05/18 08:27:19 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.83 2017/05/22 07:23:55 msaitoh Exp $*/
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2379,9 +2379,21 @@ ixgbe_update_link_status(struct adapter 
 {
 	struct ifnet	*ifp = adapter->ifp;
 	device_t dev = adapter->dev;
+	struct ixgbe_hw *hw = >hw;
 
 	if (adapter->link_up){ 
 		if (adapter->link_active == FALSE) {
+			if (adapter->link_speed == IXGBE_LINK_SPEED_10GB_FULL){
+/*
+ *  Discard count for both MAC Local Fault and
+ * Remote Fault because those registers are
+ * valid only when the link speed is up and
+ * 10Gbps.
+ */
+IXGBE_READ_REG(hw, IXGBE_MLFC);
+IXGBE_READ_REG(hw, IXGBE_MRFC);
+			}
+
 			if (bootverbose)
 device_printf(dev,"Link is up %d Gbps %s \n",
 ((adapter->link_speed == 128)? 10:1),
@@ -4352,8 +4364,13 @@ ixgbe_update_stats_counters(struct adapt
 		
 	}
 	stats->mpctotal.ev_count += total_missed_rx;
-	stats->mlfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MLFC);
-	stats->mrfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MRFC);
+
+	/* Document says M[LR]FC are valid when link is up and 10Gbps */
+	if ((adapter->link_active == TRUE)
+	&& (adapter->link_speed == IXGBE_LINK_SPEED_10GB_FULL)) {
+		stats->mlfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MLFC);
+		stats->mrfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MRFC);
+	}
 	rlec = IXGBE_READ_REG(hw, IXGBE_RLEC);
 	stats->rlec.ev_count += rlec;
 

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon May 22 06:35:04 UTC 2017

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Indent comment to match code it's describing


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/sys/arch/arm/arm32/pmap.c

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

Modified files:

Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.346 src/sys/arch/arm/arm32/pmap.c:1.347
--- src/sys/arch/arm/arm32/pmap.c:1.346	Sun May 21 07:06:51 2017
+++ src/sys/arch/arm/arm32/pmap.c	Mon May 22 06:35:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.346 2017/05/21 07:06:51 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.347 2017/05/22 06:35:04 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.346 2017/05/21 07:06:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.347 2017/05/22 06:35:04 skrll Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -4833,14 +4833,15 @@ pmap_activate(struct lwp *l)
 	pmap_t rpm = ci->ci_pmap_lastuser;
 #endif
 
-/*
- * XXXSCW: There's a corner case here which can leave turds in the cache as
- * reported in kern/41058. They're probably left over during tear-down and
- * switching away from an exiting process. Until the root cause is identified
- * and fixed, zap the cache when switching pmaps. This will result in a few
- * unnecessary cache flushes, but that's better than silently corrupting data.
- */
 #ifndef ARM_MMU_EXTENDED
+	/*
+	 * XXXSCW: There's a corner case here which can leave turds in the
+	 * cache as reported in kern/41058. They're probably left over during
+	 * tear-down and switching away from an exiting process. Until the root
+	 * cause is identified and fixed, zap the cache when switching pmaps.
+	 * This will result in a few unnecessary cache flushes, but that's
+	 * better than silently corrupting data.
+	 */
 #if 0
 	if (npm != pmap_kernel() && rpm && npm != rpm &&
 	rpm->pm_cstate.cs_cache) {