Module Name: src
Committed By: chuck
Date: Tue Feb 1 20:19:32 UTC 2011
Modified Files:
src/sys/arch/mvme68k/dev: pcc.c pccreg.h
src/sys/arch/mvme68k/include: autoconf.h
src/sys/arch/mvme68k/stand/sboot: start.s
src/sys/arch/sparc/dev: if_ie_obio.c
src/sys/arch/sun2/dev: if_ie_mbmem.c if_ie_obio.c
src/sys/arch/sun3/dev: xd.c xdreg.h xdvar.h xio.h xy.c xyreg.h xyvar.h
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c
Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
remove no-longer-valid wustl email address for me.
based on diff that rmind@ sent me.
no functional change with this commit.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvme68k/dev/pcc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/dev/pccreg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mvme68k/include/autoconf.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mvme68k/stand/sboot/start.s
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sparc/dev/if_ie_obio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sun2/dev/if_ie_mbmem.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sun2/dev/if_ie_obio.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sun3/dev/xdreg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sun3/dev/xdvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun3/dev/xio.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sun3/dev/xyreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sun3/dev/xyvar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x86/x86/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/mvme68k/dev/pcc.c
diff -u src/sys/arch/mvme68k/dev/pcc.c:1.30 src/sys/arch/mvme68k/dev/pcc.c:1.31
--- src/sys/arch/mvme68k/dev/pcc.c:1.30 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvme68k/dev/pcc.c Tue Feb 1 20:19:31 2011
@@ -1,6 +1,6 @@
-/* $NetBSD: pcc.c,v 1.30 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: pcc.c,v 1.31 2011/02/01 20:19:31 chuck Exp $ */
-/*-
+/*
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -41,11 +41,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 Charles D. Cranor.
- * 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
@@ -64,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.30 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.31 2011/02/01 20:19:31 chuck Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/arch/mvme68k/dev/pccreg.h
diff -u src/sys/arch/mvme68k/dev/pccreg.h:1.10 src/sys/arch/mvme68k/dev/pccreg.h:1.11
--- src/sys/arch/mvme68k/dev/pccreg.h:1.10 Mon Jan 7 14:39:28 2008
+++ src/sys/arch/mvme68k/dev/pccreg.h Tue Feb 1 20:19:31 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: pccreg.h,v 1.10 2008/01/07 14:39:28 tsutsui Exp $ */
+/* $NetBSD: pccreg.h,v 1.11 2011/02/01 20:19:31 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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/mvme68k/include/autoconf.h
diff -u src/sys/arch/mvme68k/include/autoconf.h:1.7 src/sys/arch/mvme68k/include/autoconf.h:1.8
--- src/sys/arch/mvme68k/include/autoconf.h:1.7 Sun Dec 11 12:18:17 2005
+++ src/sys/arch/mvme68k/include/autoconf.h Tue Feb 1 20:19:31 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: autoconf.h,v 1.7 2005/12/11 12:18:17 christos Exp $ */
+/* $NetBSD: autoconf.h,v 1.8 2011/02/01 20:19:31 chuck Exp $ */
/*
- *
* Copyright (c) 1996 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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/mvme68k/stand/sboot/start.s
diff -u src/sys/arch/mvme68k/stand/sboot/start.s:1.7 src/sys/arch/mvme68k/stand/sboot/start.s:1.8
--- src/sys/arch/mvme68k/stand/sboot/start.s:1.7 Mon Dec 4 20:31:16 2000
+++ src/sys/arch/mvme68k/stand/sboot/start.s Tue Feb 1 20:19:31 2011
@@ -1,5 +1,5 @@
/*
- * $NetBSD: start.s,v 1.7 2000/12/04 20:31:16 scw Exp $
+ * $NetBSD: start.s,v 1.8 2011/02/01 20:19:31 chuck Exp $
*
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
@@ -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 by Charles D. Cranor.
- * 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/sparc/dev/if_ie_obio.c
diff -u src/sys/arch/sparc/dev/if_ie_obio.c:1.37 src/sys/arch/sparc/dev/if_ie_obio.c:1.38
--- src/sys/arch/sparc/dev/if_ie_obio.c:1.37 Sun Sep 20 16:18:21 2009
+++ src/sys/arch/sparc/dev/if_ie_obio.c Tue Feb 1 20:19:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $ */
+/* $NetBSD: if_ie_obio.c,v 1.38 2011/02/01 20:19:31 chuck Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*-
+/*
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -41,11 +41,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 Charles D. Cranor.
- * 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
@@ -78,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.38 2011/02/01 20:19:31 chuck Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/sun2/dev/if_ie_mbmem.c
diff -u src/sys/arch/sun2/dev/if_ie_mbmem.c:1.9 src/sys/arch/sun2/dev/if_ie_mbmem.c:1.10
--- src/sys/arch/sun2/dev/if_ie_mbmem.c:1.9 Sun Dec 11 12:19:16 2005
+++ src/sys/arch/sun2/dev/if_ie_mbmem.c Tue Feb 1 20:19:31 2011
@@ -1,6 +1,6 @@
-/* $NetBSD: if_ie_mbmem.c,v 1.9 2005/12/11 12:19:16 christos Exp $ */
+/* $NetBSD: if_ie_mbmem.c,v 1.10 2011/02/01 20:19:31 chuck Exp $ */
-/*-
+/*
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -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 by Charles D. Cranor.
- * 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
@@ -145,7 +140,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_mbmem.c,v 1.9 2005/12/11 12:19:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mbmem.c,v 1.10 2011/02/01 20:19:31 chuck Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/sun2/dev/if_ie_obio.c
diff -u src/sys/arch/sun2/dev/if_ie_obio.c:1.13 src/sys/arch/sun2/dev/if_ie_obio.c:1.14
--- src/sys/arch/sun2/dev/if_ie_obio.c:1.13 Mon Apr 28 20:23:37 2008
+++ src/sys/arch/sun2/dev/if_ie_obio.c Tue Feb 1 20:19:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_obio.c,v 1.13 2008/04/28 20:23:37 martin Exp $ */
+/* $NetBSD: if_ie_obio.c,v 1.14 2011/02/01 20:19:31 chuck Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,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 Charles D. Cranor.
- * 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
@@ -78,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.13 2008/04/28 20:23:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.14 2011/02/01 20:19:31 chuck Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/sun3/dev/xd.c
diff -u src/sys/arch/sun3/dev/xd.c:1.67 src/sys/arch/sun3/dev/xd.c:1.68
--- src/sys/arch/sun3/dev/xd.c:1.67 Tue Jan 13 13:35:52 2009
+++ src/sys/arch/sun3/dev/xd.c Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xd.c,v 1.67 2009/01/13 13:35:52 yamt Exp $ */
+/* $NetBSD: xd.c,v 1.68 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -35,7 +29,7 @@
*
* x d . c x y l o g i c s 7 5 3 / 7 0 5 3 v m e / s m d d r i v e r
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
* id: &Id: xd.c,v 1.9 1995/09/25 20:12:44 chuck Exp &
* started: 27-Feb-95
* references: [1] Xylogics Model 753 User's Manual
@@ -52,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.67 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.68 2011/02/01 20:19:32 chuck Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
Index: src/sys/arch/sun3/dev/xdreg.h
diff -u src/sys/arch/sun3/dev/xdreg.h:1.6 src/sys/arch/sun3/dev/xdreg.h:1.7
--- src/sys/arch/sun3/dev/xdreg.h:1.6 Sun Dec 11 12:19:20 2005
+++ src/sys/arch/sun3/dev/xdreg.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xdreg.h,v 1.6 2005/12/11 12:19:20 christos Exp $ */
+/* $NetBSD: xdreg.h,v 1.7 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -37,7 +31,7 @@
* this file contains the description of the Xylogics 753/7053's hardware
* data structures.
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
*/
#define XDC_MAXDEV 4 /* max devices per controller */
Index: src/sys/arch/sun3/dev/xdvar.h
diff -u src/sys/arch/sun3/dev/xdvar.h:1.11 src/sys/arch/sun3/dev/xdvar.h:1.12
--- src/sys/arch/sun3/dev/xdvar.h:1.11 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/dev/xdvar.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xdvar.h,v 1.11 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: xdvar.h,v 1.12 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -37,7 +31,7 @@
* this file defines the software structure we use to control the
* 753/7053.
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
*/
#include <sys/callout.h>
Index: src/sys/arch/sun3/dev/xio.h
diff -u src/sys/arch/sun3/dev/xio.h:1.2 src/sys/arch/sun3/dev/xio.h:1.3
--- src/sys/arch/sun3/dev/xio.h:1.2 Sun Mar 4 06:00:54 2007
+++ src/sys/arch/sun3/dev/xio.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xio.h,v 1.2 2007/03/04 06:00:54 christos Exp $ */
+/* $NetBSD: xio.h,v 1.3 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -38,7 +32,7 @@
* 753/7053. this interface isn't set in stone and may (or may not)
* need adjustment.
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
*/
/*
Index: src/sys/arch/sun3/dev/xy.c
diff -u src/sys/arch/sun3/dev/xy.c:1.71 src/sys/arch/sun3/dev/xy.c:1.72
--- src/sys/arch/sun3/dev/xy.c:1.71 Tue Jan 13 13:35:52 2009
+++ src/sys/arch/sun3/dev/xy.c Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xy.c,v 1.71 2009/01/13 13:35:52 yamt Exp $ */
+/* $NetBSD: xy.c,v 1.72 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -35,7 +29,7 @@
*
* x y . c x y l o g i c s 4 5 0 / 4 5 1 s m d d r i v e r
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
* id: &Id: xy.c,v 1.1 1995/09/25 20:35:14 chuck Exp &
* started: 14-Sep-95
* references: [1] Xylogics Model 753 User's Manual
@@ -52,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.71 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.72 2011/02/01 20:19:32 chuck Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
Index: src/sys/arch/sun3/dev/xyreg.h
diff -u src/sys/arch/sun3/dev/xyreg.h:1.4 src/sys/arch/sun3/dev/xyreg.h:1.5
--- src/sys/arch/sun3/dev/xyreg.h:1.4 Sun Dec 11 12:19:21 2005
+++ src/sys/arch/sun3/dev/xyreg.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xyreg.h,v 1.4 2005/12/11 12:19:21 christos Exp $ */
+/* $NetBSD: xyreg.h,v 1.5 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -37,7 +31,7 @@
* this file contains the description of the Xylogics 450/451's hardware
* data structures.
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
*/
#define XYC_MAXDEV 2 /* max devices per controller */
Index: src/sys/arch/sun3/dev/xyvar.h
diff -u src/sys/arch/sun3/dev/xyvar.h:1.10 src/sys/arch/sun3/dev/xyvar.h:1.11
--- src/sys/arch/sun3/dev/xyvar.h:1.10 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/dev/xyvar.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xyvar.h,v 1.10 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: xyvar.h,v 1.11 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor
* All rights reserved.
*
@@ -13,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 by Charles D. Cranor.
- * 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
@@ -37,7 +31,7 @@
* this file defines the software structure we use to control the
* 450/451.
*
- * author: Chuck Cranor <ch...@ccrc.wustl.edu>
+ * author: Chuck Cranor <chuck@netbsd>
*/
#include <sys/callout.h>
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.33 src/sys/arch/x86/include/pmap.h:1.34
--- src/sys/arch/x86/include/pmap.h:1.33 Sat Jul 24 00:45:56 2010
+++ src/sys/arch/x86/include/pmap.h Tue Feb 1 20:19:32 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: pmap.h,v 1.33 2010/07/24 00:45:56 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.34 2011/02/01 20:19:32 chuck Exp $ */
/*
- *
* Copyright (c) 1997 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -13,12 +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 acknowledgment:
- * This product includes software developed by Charles D. Cranor and
- * Washington University.
- * 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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.113 src/sys/arch/x86/x86/pmap.c:1.114
--- src/sys/arch/x86/x86/pmap.c:1.113 Sat Jul 24 00:45:56 2010
+++ src/sys/arch/x86/x86/pmap.c Tue Feb 1 20:19:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.113 2010/07/24 00:45:56 jym Exp $ */
+/* $NetBSD: pmap.c,v 1.114 2011/02/01 20:19:32 chuck Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -42,7 +42,6 @@
*/
/*
- *
* Copyright (c) 1997 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -54,12 +53,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 Charles D. Cranor and
- * Washington University.
- * 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
@@ -149,7 +142,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2010/07/24 00:45:56 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2011/02/01 20:19:32 chuck Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
