Module Name: src
Committed By: chuck
Date: Wed Feb 2 15:25:28 UTC 2011
Modified Files:
src/sys/uvm: uvm_coredump.c uvm_glue.c uvm_km.c uvm_map.c uvm_map.h
uvm_meter.c uvm_page.c uvm_page.h uvm_pdaemon.c uvm_pdaemon.h
uvm_pdpolicy_clock.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/uvm_coredump.c
cvs rdiff -u -r1.146 -r1.147 src/sys/uvm/uvm_glue.c
cvs rdiff -u -r1.107 -r1.108 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.294 -r1.295 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.65 -r1.66 src/sys/uvm/uvm_map.h
cvs rdiff -u -r1.55 -r1.56 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.169 -r1.170 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.70 -r1.71 src/sys/uvm/uvm_page.h
cvs rdiff -u -r1.101 -r1.102 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.16 -r1.17 src/sys/uvm/uvm_pdaemon.h
cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/uvm_pdpolicy_clock.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/uvm/uvm_coredump.c
diff -u src/sys/uvm/uvm_coredump.c:1.1 src/sys/uvm/uvm_coredump.c:1.2
--- src/sys/uvm/uvm_coredump.c:1.1 Wed Nov 19 18:36:10 2008
+++ src/sys/uvm/uvm_coredump.c Wed Feb 2 15:25:27 2011
@@ -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
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.146 src/sys/uvm/uvm_glue.c:1.147
--- src/sys/uvm/uvm_glue.c:1.146 Fri Jan 14 02:06:34 2011
+++ src/sys/uvm/uvm_glue.c Wed Feb 2 15:25:27 2011
@@ -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"
Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.107 src/sys/uvm/uvm_km.c:1.108
--- src/sys/uvm/uvm_km.c:1.107 Tue Jan 4 08:26:33 2011
+++ src/sys/uvm/uvm_km.c Wed Feb 2 15:25:27 2011
@@ -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"
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.294 src/sys/uvm/uvm_map.c:1.295
--- src/sys/uvm/uvm_map.c:1.294 Tue Jan 4 08:21:18 2011
+++ src/sys/uvm/uvm_map.c Wed Feb 2 15:25:27 2011
@@ -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"
Index: src/sys/uvm/uvm_map.h
diff -u src/sys/uvm/uvm_map.h:1.65 src/sys/uvm/uvm_map.h:1.66
--- src/sys/uvm/uvm_map.h:1.65 Sat Sep 25 01:42:40 2010
+++ src/sys/uvm/uvm_map.h Wed Feb 2 15:25:27 2011
@@ -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.
*
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.55 src/sys/uvm/uvm_meter.c:1.56
--- src/sys/uvm/uvm_meter.c:1.55 Mon Dec 20 00:25:48 2010
+++ src/sys/uvm/uvm_meter.c Wed Feb 2 15:25:27 2011
@@ -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>
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.169 src/sys/uvm/uvm_page.c:1.170
--- src/sys/uvm/uvm_page.c:1.169 Tue Jan 4 08:26:33 2011
+++ src/sys/uvm/uvm_page.c Wed Feb 2 15:25:27 2011
@@ -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"
Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.70 src/sys/uvm/uvm_page.h:1.71
--- src/sys/uvm/uvm_page.h:1.70 Tue Jan 18 21:43:29 2011
+++ src/sys/uvm/uvm_page.h Wed Feb 2 15:25:27 2011
@@ -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.
*
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.101 src/sys/uvm/uvm_pdaemon.c:1.102
--- src/sys/uvm/uvm_pdaemon.c:1.101 Wed Jun 2 15:48:49 2010
+++ src/sys/uvm/uvm_pdaemon.c Wed Feb 2 15:25:27 2011
@@ -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"
Index: src/sys/uvm/uvm_pdaemon.h
diff -u src/sys/uvm/uvm_pdaemon.h:1.16 src/sys/uvm/uvm_pdaemon.h:1.17
--- src/sys/uvm/uvm_pdaemon.h:1.16 Tue Sep 7 04:45:22 2010
+++ src/sys/uvm/uvm_pdaemon.h Wed Feb 2 15:25:27 2011
@@ -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.
*
Index: src/sys/uvm/uvm_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.12 src/sys/uvm/uvm_pdpolicy_clock.c:1.13
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.12 Wed Jun 4 12:41:40 2008
+++ src/sys/uvm/uvm_pdpolicy_clock.c Wed Feb 2 15:25:27 2011
@@ -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 $ */
/*
@@ -18,12 +18,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.
*
@@ -74,7 +69,7 @@
#else /* defined(PDSIM) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.12 2008/06/04 12:41:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.13 2011/02/02 15:25:27 chuck Exp $");
#include <sys/param.h>
#include <sys/proc.h>
