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

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

details:   https://anonhg.NetBSD.org/src/rev/424a5330f27f
branches:  trunk
changeset: 761615:424a5330f27f
user:      chuck <chuck%NetBSD.org@localhost>
date:      Wed Feb 02 15:25:27 2011 +0000

description:
udpate license clauses on my code to match the new-style BSD licenses.
based on second diff that rmind@ sent me.

no functional change with this commit.

diffstat:

 sys/uvm/uvm_coredump.c       |  11 +++--------
 sys/uvm/uvm_glue.c           |  11 +++--------
 sys/uvm/uvm_km.c             |  11 +++--------
 sys/uvm/uvm_map.c            |  11 +++--------
 sys/uvm/uvm_map.h            |   9 ++-------
 sys/uvm/uvm_meter.c          |  11 +++--------
 sys/uvm/uvm_page.c           |  11 +++--------
 sys/uvm/uvm_page.h           |   9 ++-------
 sys/uvm/uvm_pdaemon.c        |  11 +++--------
 sys/uvm/uvm_pdaemon.h        |   9 ++-------
 sys/uvm/uvm_pdpolicy_clock.c |  11 +++--------
 11 files changed, 30 insertions(+), 85 deletions(-)

diffs (truncated from 325 to 300 lines):

diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_coredump.c
--- a/sys/uvm/uvm_coredump.c    Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_coredump.c    Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_coredump.c,v 1.1 2008/11/19 18:36:10 ad Exp $      */
+/*     $NetBSD: uvm_coredump.c,v 1.2 2011/02/02 15:25:27 chuck Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
@@ -67,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_coredump.c,v 1.1 2008/11/19 18:36:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_coredump.c,v 1.2 2011/02/02 15:25:27 chuck Exp $");
 
 /*
  * uvm_coredump.c: glue functions for coredump
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_glue.c
--- a/sys/uvm/uvm_glue.c        Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_glue.c        Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_glue.c,v 1.146 2011/01/14 02:06:34 rmind Exp $     */
+/*     $NetBSD: uvm_glue.c,v 1.147 2011/02/02 15:25:27 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
@@ -67,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.146 2011/01/14 02:06:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.147 2011/02/02 15:25:27 chuck Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_kstack.h"
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_km.c
--- a/sys/uvm/uvm_km.c  Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_km.c  Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_km.c,v 1.107 2011/01/04 08:26:33 matt Exp $        */
+/*     $NetBSD: uvm_km.c,v 1.108 2011/02/02 15:25:27 chuck Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
@@ -127,7 +122,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.107 2011/01/04 08:26:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.108 2011/02/02 15:25:27 chuck Exp $");
 
 #include "opt_uvmhist.h"
 
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_map.c Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.294 2011/01/04 08:21:18 matt Exp $       */
+/*     $NetBSD: uvm_map.c,v 1.295 2011/02/02 15:25:27 chuck Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
@@ -71,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.294 2011/01/04 08:21:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.295 2011/02/02 15:25:27 chuck Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_map.h
--- a/sys/uvm/uvm_map.h Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_map.h Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.h,v 1.65 2010/09/25 01:42:40 matt Exp $        */
+/*     $NetBSD: uvm_map.h,v 1.66 2011/02/02 15:25:27 chuck Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_meter.c
--- a/sys/uvm/uvm_meter.c       Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_meter.c       Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_meter.c,v 1.55 2010/12/20 00:25:48 matt Exp $      */
+/*     $NetBSD: uvm_meter.c,v 1.56 2011/02/02 15:25:27 chuck Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -15,12 +15,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, and 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.
  *
@@ -41,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.55 2010/12/20 00:25:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.56 2011/02/02 15:25:27 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_page.c
--- a/sys/uvm/uvm_page.c        Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_page.c        Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_page.c,v 1.169 2011/01/04 08:26:33 matt Exp $      */
+/*     $NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $     */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,12 +43,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.
  *
@@ -97,7 +92,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.169 2011/01/04 08:26:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_page.h
--- a/sys/uvm/uvm_page.h        Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_page.h        Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_page.h,v 1.70 2011/01/18 21:43:29 matt Exp $       */
+/*     $NetBSD: uvm_page.h,v 1.71 2011/02/02 15:25:27 chuck Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_pdaemon.c
--- a/sys/uvm/uvm_pdaemon.c     Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_pdaemon.c     Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pdaemon.c,v 1.101 2010/06/02 15:48:49 pooka Exp $  */
+/*     $NetBSD: uvm_pdaemon.c,v 1.102 2011/02/02 15:25:27 chuck Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
@@ -71,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.101 2010/06/02 15:48:49 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.102 2011/02/02 15:25:27 chuck Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_pdaemon.h
--- a/sys/uvm/uvm_pdaemon.h     Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_pdaemon.h     Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pdaemon.h,v 1.16 2010/09/07 04:45:22 pooka Exp $   */
+/*     $NetBSD: uvm_pdaemon.h,v 1.17 2011/02/02 15:25:27 chuck Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -17,12 +17,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.
  *
diff -r 36f8b6565667 -r 424a5330f27f sys/uvm/uvm_pdpolicy_clock.c
--- a/sys/uvm/uvm_pdpolicy_clock.c      Wed Feb 02 15:21:34 2011 +0000
+++ b/sys/uvm/uvm_pdpolicy_clock.c      Wed Feb 02 15:25:27 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pdpolicy_clock.c,v 1.12 2008/06/04 12:41:40 ad Exp $       */
+/*     $NetBSD: uvm_pdpolicy_clock.c,v 1.13 2011/02/02 15:25:27 chuck Exp $    */
 /*     NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $     */