Module Name: src
Committed By: chuck
Date: Wed Feb 2 20:07:25 UTC 2011
Modified Files:
src/sys/uvm: uvm_mmap.c uvm_pager.h uvm_unix.c uvm_vnode.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/uvm/uvm_mmap.c
cvs rdiff -u -r1.40 -r1.41 src/sys/uvm/uvm_pager.h
cvs rdiff -u -r1.43 -r1.44 src/sys/uvm/uvm_unix.c
cvs rdiff -u -r1.93 -r1.94 src/sys/uvm/uvm_vnode.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_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.133 src/sys/uvm/uvm_mmap.c:1.134
--- src/sys/uvm/uvm_mmap.c:1.133 Thu Jun 24 13:03:20 2010
+++ src/sys/uvm/uvm_mmap.c Wed Feb 2 20:07:25 2011
@@ -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"
Index: src/sys/uvm/uvm_pager.h
diff -u src/sys/uvm/uvm_pager.h:1.40 src/sys/uvm/uvm_pager.h:1.41
--- src/sys/uvm/uvm_pager.h:1.40 Wed Feb 2 15:13:34 2011
+++ src/sys/uvm/uvm_pager.h Wed Feb 2 20:07:25 2011
@@ -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.
*
Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.43 src/sys/uvm/uvm_unix.c:1.44
--- src/sys/uvm/uvm_unix.c:1.43 Tue Dec 15 06:15:11 2009
+++ src/sys/uvm/uvm_unix.c Wed Feb 2 20:07:25 2011
@@ -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"
Index: src/sys/uvm/uvm_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.93 src/sys/uvm/uvm_vnode.c:1.94
--- src/sys/uvm/uvm_vnode.c:1.93 Fri Jan 8 11:35:12 2010
+++ src/sys/uvm/uvm_vnode.c Wed Feb 2 20:07:25 2011
@@ -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"
