[src/trunk]: src/sys Move

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Move
From: wiz <wiz%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 14:33:47 +0000
details:   https://anonhg.NetBSD.org/src/rev/d5d5addb1930
branches:  trunk
changeset: 559822:d5d5addb1930
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Mar 24 15:38:41 2004 +0000

description:
Move
        (c) TNF
line from 4-clause UCB to 3-clause UCB license; in other words,
remove UCB's ad clause from the license TNF grants.
There is no point in TNF demanding that UCB's ad clause be followed
when even UCB doesn't demand it any longer.

Ok'd by board@ and agc@.

diffstat:

 sys/arch/m68k/m68k/switch_subr.s |   4 +-
 sys/arch/sh3/include/cpu.h       |  40 +----------------------------------
 sys/arch/sh3/include/frame.h     |   4 +-
 sys/arch/sh3/include/param.h     |  40 +----------------------------------
 sys/arch/sh3/include/proc.h      |  37 +-------------------------------
 sys/arch/sh3/sh3/exception.c     |   6 ++--
 sys/arch/sh3/sh3/mem.c           |   8 +++---
 sys/arch/sh3/sh3/vm_machdep.c    |   6 ++--
 sys/arch/sh5/include/cpu.h       |  40 +----------------------------------
 sys/arch/sh5/include/param.h     |  40 +----------------------------------
 sys/arch/sh5/include/proc.h      |  37 +-------------------------------
 sys/dev/ic/mb89352reg.h          |  44 ++-------------------------------------
 12 files changed, 29 insertions(+), 277 deletions(-)

diffs (truncated from 525 to 300 lines):

diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/m68k/m68k/switch_subr.s
--- a/sys/arch/m68k/m68k/switch_subr.s  Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/m68k/m68k/switch_subr.s  Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: switch_subr.s,v 1.10 2004/03/04 19:53:44 nathanw Exp $ */
+/*     $NetBSD: switch_subr.s,v 1.11 2004/03/24 15:38:41 wiz Exp $     */
 
 /*
+ * Copyright (c) 2001 The NetBSD Foundation.
  * Copyright (c) 1980, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -36,7 +37,6 @@
  */
 
 /*
- * Copyright (c) 2001 The NetBSD Foundation.
  * Copyright (c) 1988 University of Utah.
  *
  * This code is derived from software contributed to Berkeley by
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/include/cpu.h
--- a/sys/arch/sh3/include/cpu.h        Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/include/cpu.h        Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: cpu.h,v 1.33 2004/01/04 11:33:31 jdolecek Exp $        */
+/*     $NetBSD: cpu.h,v 1.34 2004/03/24 15:38:41 wiz Exp $     */
 
 /*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -34,43 +35,6 @@
  *     @(#)cpu.h       5.4 (Berkeley) 5/9/91
  */
 
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *     @(#)cpu.h       5.4 (Berkeley) 5/9/91
- */
-
 /*
  * SH3/SH4 support.
  *
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/include/frame.h
--- a/sys/arch/sh3/include/frame.h      Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/include/frame.h      Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: frame.h,v 1.12 2003/11/23 23:13:11 uwe Exp $   */
+/*     $NetBSD: frame.h,v 1.13 2004/03/24 15:38:41 wiz Exp $   */
 
 /*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -35,7 +36,6 @@
  */
 
 /*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/include/param.h
--- a/sys/arch/sh3/include/param.h      Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/include/param.h      Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: param.h,v 1.12 2003/08/07 16:29:29 agc Exp $   */
+/*     $NetBSD: param.h,v 1.13 2004/03/24 15:38:41 wiz Exp $   */
 
 /*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -34,43 +35,6 @@
  *     @(#)param.h     5.8 (Berkeley) 6/28/91
  */
 
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *     @(#)param.h     5.8 (Berkeley) 6/28/91
- */
-
 /*
  * SuperH dependent constants.
  */
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/include/proc.h
--- a/sys/arch/sh3/include/proc.h       Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/include/proc.h       Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: proc.h,v 1.6 2003/08/07 16:29:29 agc Exp $     */
+/*     $NetBSD: proc.h,v 1.7 2004/03/24 15:38:41 wiz Exp $     */
 
 /*
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
@@ -31,40 +32,6 @@
  *     @(#)proc.h      7.1 (Berkeley) 5/15/91
  */
 
-/*
- * Copyright (c) 2002 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.
- * 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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *     @(#)proc.h      7.1 (Berkeley) 5/15/91
- */
-
 #ifndef _SH3_PROC_H_
 #define        _SH3_PROC_H_
 
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/sh3/exception.c
--- a/sys/arch/sh3/sh3/exception.c      Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/sh3/exception.c      Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: exception.c,v 1.18 2004/03/14 01:08:48 cl Exp $        */
+/*     $NetBSD: exception.c,v 1.19 2004/03/24 15:38:41 wiz Exp $       */
 
 /*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -35,7 +36,6 @@
  */
 
 /*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.18 2004/03/14 01:08:48 cl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.19 2004/03/24 15:38:41 wiz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/sh3/mem.c
--- a/sys/arch/sh3/sh3/mem.c    Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/sh3/mem.c    Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,8 @@
-/*     $NetBSD: mem.c,v 1.17 2003/08/07 16:29:29 agc Exp $     */
+/*     $NetBSD: mem.c,v 1.18 2004/03/24 15:38:42 wiz Exp $     */
 
 /*
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
  * Copyright (c) 1982, 1986, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -36,8 +38,6 @@
  */
 
 /*
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
  * Copyright (c) 1988 University of Utah.
  *
  * This code is derived from software contributed to Berkeley by
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.17 2003/08/07 16:29:29 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.18 2004/03/24 15:38:42 wiz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh3/sh3/vm_machdep.c
--- a/sys/arch/sh3/sh3/vm_machdep.c     Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh3/sh3/vm_machdep.c     Wed Mar 24 15:38:41 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: vm_machdep.c,v 1.42 2004/01/18 18:54:17 uwe Exp $      */
+/*     $NetBSD: vm_machdep.c,v 1.43 2004/03/24 15:38:42 wiz Exp $      */
 
 /*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
  *
@@ -36,7 +37,6 @@
  */
 
 /*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1989, 1990 William Jolitz
  * All rights reserved.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.42 2004/01/18 18:54:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.43 2004/03/24 15:38:42 wiz Exp $");
 
 #include "opt_kstack_debug.h"
 
diff -r 217a9c3b56ed -r d5d5addb1930 sys/arch/sh5/include/cpu.h
--- a/sys/arch/sh5/include/cpu.h        Wed Mar 24 15:36:27 2004 +0000
+++ b/sys/arch/sh5/include/cpu.h        Wed Mar 24 15:38:41 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.12 2004/01/04 11:33:31 jdolecek Exp $        */
+/*     $NetBSD: cpu.h,v 1.13 2004/03/24 15:38:42 wiz Exp $     */
Prev by Date: [src/trunk]: src/sys/arch Remove my name from the old UCB copyright notice, t...
Next by Date: [src/trunk]: src/sys/lib/libsa I was told I'm just an "author", not a "regent"
Previous by Thread: [src/trunk]: src/sys/arch Remove my name from the old UCB copyright notice, t...
Next by Thread: [src/trunk]: src/sys/lib/libsa I was told I'm just an "author", not a "regent"
Indexes:
Home | Main Index | Thread Index | Old Index