[src/trunk]: src/sys udpate license clauses on my code to match the new-style...

[chuck <chuck%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2df3ee05206
branches:  trunk
changeset: 761621:d2df3ee05206
user:      chuck <chuck%NetBSD.org@localhost>
date:      Wed Feb 02 20:07:25 2011 +0000

description:
udpate license clauses on my code to match the new-style BSD licenses.
verified with Mike Hibler it is ok to remove clause 3 on utah copyright,
as per UCB.
based on diff that rmind@ sent me.

no functional change with this commit.

diffstat:

 sys/compat/netbsd32/netbsd32_core.c |  11 +++--------
 sys/kern/core_netbsd.c              |  11 +++--------
 sys/uvm/uvm_mmap.c                  |  11 +++--------
 sys/uvm/uvm_pager.h                 |   8 ++------
 sys/uvm/uvm_unix.c                  |  11 +++--------
 sys/uvm/uvm_vnode.c                 |  11 +++--------
 6 files changed, 17 insertions(+), 46 deletions(-)

diffs (182 lines):

diff -r 16205d1445bb -r d2df3ee05206 sys/compat/netbsd32/netbsd32_core.c
--- a/sys/compat/netbsd32/netbsd32_core.c       Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/compat/netbsd32/netbsd32_core.c       Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_core.c,v 1.13 2005/12/11 12:20:22 christos Exp $      */
+/*     $NetBSD: netbsd32_core.c,v 1.14 2011/02/02 20:10:09 chuck Exp $ */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,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 by Charles D. Cranor,
- *     Washington University, the University of California, Berkeley and
- *     its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -50,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.13 2005/12/11 12:20:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.14 2011/02/02 20:10:09 chuck Exp $");
 
 #define        CORENAME(x)     __CONCAT(x,32)
 #define        COREINC         <compat/netbsd32/netbsd32.h>
diff -r 16205d1445bb -r d2df3ee05206 sys/kern/core_netbsd.c
--- a/sys/kern/core_netbsd.c    Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/kern/core_netbsd.c    Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: core_netbsd.c,v 1.17 2011/01/14 02:06:34 rmind Exp $   */
+/*     $NetBSD: core_netbsd.c,v 1.18 2011/02/02 20:10:09 chuck Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,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 by Charles D. Cranor,
- *     Washington University, the University of California, Berkeley and
- *     its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -50,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_netbsd.c,v 1.17 2011/01/14 02:06:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_netbsd.c,v 1.18 2011/02/02 20:10:09 chuck Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_coredump.h"
diff -r 16205d1445bb -r d2df3ee05206 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/uvm/uvm_mmap.c        Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.133 2010/06/24 13:03:20 hannken Exp $   */
+/*     $NetBSD: uvm_mmap.c,v 1.134 2011/02/02 20:07:25 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,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 by the Charles D. Cranor,
- *     Washington University, University of California, Berkeley and
- *     its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -51,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.133 2010/06/24 13:03:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.134 2011/02/02 20:07:25 chuck Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
diff -r 16205d1445bb -r d2df3ee05206 sys/uvm/uvm_pager.h
--- a/sys/uvm/uvm_pager.h       Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/uvm/uvm_pager.h       Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.h,v 1.40 2011/02/02 15:13:34 chuck Exp $     */
+/*     $NetBSD: uvm_pager.h,v 1.41 2011/02/02 20:07:25 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -77,11 +77,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 by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
diff -r 16205d1445bb -r d2df3ee05206 sys/uvm/uvm_unix.c
--- a/sys/uvm/uvm_unix.c        Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/uvm/uvm_unix.c        Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $       */
+/*     $NetBSD: uvm_unix.c,v 1.44 2011/02/02 20:07:25 chuck Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -19,12 +19,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 by Charles D. Cranor,
- *     Washington University, the University of California, Berkeley and
- *     its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -50,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.44 2011/02/02 20:07:25 chuck Exp $");
 
 #include "opt_pax.h"
 
diff -r 16205d1445bb -r d2df3ee05206 sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c       Wed Feb 02 17:53:41 2011 +0000
+++ b/sys/uvm/uvm_vnode.c       Wed Feb 02 20:07:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.c,v 1.93 2010/01/08 11:35:12 pooka Exp $     */
+/*     $NetBSD: uvm_vnode.c,v 1.94 2011/02/02 20:07:25 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -20,12 +20,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 by Charles D. Cranor,
- *     Washington University, the University of California, Berkeley and
- *     its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -50,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.93 2010/01/08 11:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.94 2011/02/02 20:07:25 chuck Exp $");
 
 #include "opt_uvmhist.h"