Module Name: src
Committed By: chuck
Date: Wed Feb 2 17:53:42 UTC 2011
Modified Files:
src/sys/arch/mvme68k/stand/sboot: console.c etherfun.c etherfun.h
sboot.c sboot.h
src/sys/uvm: uvm.h uvm_page.c
Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
based on diff that rmind@ sent me.
no functional change with this commit.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvme68k/stand/sboot/console.c \
src/sys/arch/mvme68k/stand/sboot/sboot.c \
src/sys/arch/mvme68k/stand/sboot/sboot.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvme68k/stand/sboot/etherfun.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvme68k/stand/sboot/etherfun.h
cvs rdiff -u -r1.60 -r1.61 src/sys/uvm/uvm.h
cvs rdiff -u -r1.170 -r1.171 src/sys/uvm/uvm_page.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/stand/sboot/console.c
diff -u src/sys/arch/mvme68k/stand/sboot/console.c:1.6 src/sys/arch/mvme68k/stand/sboot/console.c:1.7
--- src/sys/arch/mvme68k/stand/sboot/console.c:1.6 Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/console.c Wed Feb 2 17:53:41 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: console.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $ */
+/* $NetBSD: console.c,v 1.7 2011/02/02 17:53:41 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
* 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 acknowledgement:
- * This product includes software developed by Charles D. Cranor
- * and Seth Widoff.
- * 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/sboot.c
diff -u src/sys/arch/mvme68k/stand/sboot/sboot.c:1.6 src/sys/arch/mvme68k/stand/sboot/sboot.c:1.7
--- src/sys/arch/mvme68k/stand/sboot/sboot.c:1.6 Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/sboot.c Wed Feb 2 17:53:41 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: sboot.c,v 1.6 2008/01/12 09:54:33 tsutsui Exp $ */
+/* $NetBSD: sboot.c,v 1.7 2011/02/02 17:53:41 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
* 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 acknowledgement:
- * This product includes software developed by Charles D. Cranor
- * and Seth Widoff.
- * 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/sboot.h
diff -u src/sys/arch/mvme68k/stand/sboot/sboot.h:1.6 src/sys/arch/mvme68k/stand/sboot/sboot.h:1.7
--- src/sys/arch/mvme68k/stand/sboot/sboot.h:1.6 Sun Mar 4 06:00:24 2007
+++ src/sys/arch/mvme68k/stand/sboot/sboot.h Wed Feb 2 17:53:41 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: sboot.h,v 1.6 2007/03/04 06:00:24 christos Exp $ */
+/* $NetBSD: sboot.h,v 1.7 2011/02/02 17:53:41 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
* 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 acknowledgement:
- * This product includes software developed by Charles D. Cranor
- * and Seth Widoff.
- * 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/etherfun.c
diff -u src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.9 src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.10
--- src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.9 Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/etherfun.c Wed Feb 2 17:53:41 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: etherfun.c,v 1.9 2008/01/12 09:54:33 tsutsui Exp $ */
+/* $NetBSD: etherfun.c,v 1.10 2011/02/02 17:53:41 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
* 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 acknowledgement:
- * This product includes software developed by Charles D. Cranor
- * and Seth Widoff.
- * 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/etherfun.h
diff -u src/sys/arch/mvme68k/stand/sboot/etherfun.h:1.4 src/sys/arch/mvme68k/stand/sboot/etherfun.h:1.5
--- src/sys/arch/mvme68k/stand/sboot/etherfun.h:1.4 Sat Jan 12 09:54:33 2008
+++ src/sys/arch/mvme68k/stand/sboot/etherfun.h Wed Feb 2 17:53:41 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: etherfun.h,v 1.4 2008/01/12 09:54:33 tsutsui Exp $ */
+/* $NetBSD: etherfun.h,v 1.5 2011/02/02 17:53:41 chuck Exp $ */
/*
- *
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
* 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 acknowledgement:
- * This product includes software developed by Charles D. Cranor
- * and Seth Widoff.
- * 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/uvm/uvm.h
diff -u src/sys/uvm/uvm.h:1.60 src/sys/uvm/uvm.h:1.61
--- src/sys/uvm/uvm.h:1.60 Wed Feb 2 15:13:33 2011
+++ src/sys/uvm/uvm.h Wed Feb 2 17:53:42 2011
@@ -1,30 +1,4 @@
-/* $NetBSD: uvm.h,v 1.60 2011/02/02 15:13:33 chuck Exp $ */
-
-/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/* $NetBSD: uvm.h,v 1.61 2011/02/02 17:53:42 chuck Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.170 src/sys/uvm/uvm_page.c:1.171
--- src/sys/uvm/uvm_page.c:1.170 Wed Feb 2 15:25:27 2011
+++ src/sys/uvm/uvm_page.c Wed Feb 2 17:53:42 2011
@@ -1,30 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $ */
-
-/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/* $NetBSD: uvm_page.c,v 1.171 2011/02/02 17:53:42 chuck Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -92,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.170 2011/02/02 15:25:27 chuck Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.171 2011/02/02 17:53:42 chuck Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
