summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2019-12-15 16:48:25 +0000
committertsutsui <tsutsui@NetBSD.org>2019-12-15 16:48:25 +0000
commit5fbbc8cbb08d005bc9ec3ebd4f145ee5a6538531 (patch)
treebf4d984372b19532b3e0c07b865104d72707bdf6 /sys/arch
parent48976b5c4140e55f1773aa203115ae52a2da8cb4 (diff)
Remove clause 3 and 4 leftovers from TNF licenses in more sources.
Confirmed by martin@ in PR/54760.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amigappc/include/intr.h9
-rw-r--r--sys/arch/arm/at91/at91dbgu.c13
-rw-r--r--sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm9
-rw-r--r--sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm9
-rw-r--r--sys/arch/hpcarm/include/kloader.h9
-rw-r--r--sys/arch/ia64/ia64/bus_space.c11
-rw-r--r--sys/arch/ia64/include/bus.h9
-rw-r--r--sys/arch/mips/cavium/octeon_dma.c11
-rw-r--r--sys/arch/x68k/dev/intiovar.h8
-rw-r--r--sys/arch/x68k/dev/mfp.c10
-rw-r--r--sys/arch/zaurus/include/kloader.h9
11 files changed, 16 insertions, 91 deletions
diff --git a/sys/arch/amigappc/include/intr.h b/sys/arch/amigappc/include/intr.h
index 6aaa1183bf3..89303130605 100644
--- a/sys/arch/amigappc/include/intr.h
+++ b/sys/arch/amigappc/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.26 2011/06/19 08:00:56 matt Exp $ */
+/* $NetBSD: intr.h,v 1.27 2019/12/15 16:48:25 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -15,13 +15,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/arm/at91/at91dbgu.c b/sys/arch/arm/at91/at91dbgu.c
index 4ec8ed09ef2..4c36b6daf3b 100644
--- a/sys/arch/arm/at91/at91dbgu.c
+++ b/sys/arch/arm/at91/at91dbgu.c
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $ */
+/* $Id: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $ */
/*
*
@@ -26,13 +26,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -83,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.16 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.17 2019/12/15 16:48:25 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
diff --git a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
index 0e5e4851334..46f62fa8951 100644
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
@@ -1,4 +1,4 @@
-; $NetBSD: arm_pxa2x0_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_pxa2x0_asm.asm,v 1.2 2019/12/15 16:48:25 tsutsui Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,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 the NetBSD
-; Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
index ba07a61b0f5..1aa9e8ab593 100644
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
@@ -1,4 +1,4 @@
-; $NetBSD: arm_sa1100_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_sa1100_asm.asm,v 1.2 2019/12/15 16:48:25 tsutsui Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,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 the NetBSD
-; Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/hpcarm/include/kloader.h b/sys/arch/hpcarm/include/kloader.h
index eca5053609f..0d5c4df6049 100644
--- a/sys/arch/hpcarm/include/kloader.h
+++ b/sys/arch/hpcarm/include/kloader.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.2 2015/06/11 08:14:38 matt Exp $ */
+/* $NetBSD: kloader.h,v 1.3 2019/12/15 16:48:25 tsutsui Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/ia64/ia64/bus_space.c b/sys/arch/ia64/ia64/bus_space.c
index 86eea09e250..2402609d3dd 100644
--- a/sys/arch/ia64/ia64/bus_space.c
+++ b/sys/arch/ia64/ia64/bus_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $ */
+/* $NetBSD: bus_space.c,v 1.2 2019/12/15 16:48:26 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2 2019/12/15 16:48:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/ia64/include/bus.h b/sys/arch/ia64/include/bus.h
index 44e763f8d81..716af8d0560 100644
--- a/sys/arch/ia64/include/bus.h
+++ b/sys/arch/ia64/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.3 2019/09/23 16:17:56 skrll Exp $ */
+/* $NetBSD: bus.h,v 1.4 2019/12/15 16:48:26 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -16,13 +16,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/mips/cavium/octeon_dma.c b/sys/arch/mips/cavium/octeon_dma.c
index 186fd9e3865..d954bfd7783 100644
--- a/sys/arch/mips/cavium/octeon_dma.c
+++ b/sys/arch/mips/cavium/octeon_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: octeon_dma.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -15,13 +15,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/x68k/dev/intiovar.h b/sys/arch/x68k/dev/intiovar.h
index 403882679c3..f4844da3966 100644
--- a/sys/arch/x68k/dev/intiovar.h
+++ b/sys/arch/x68k/dev/intiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intiovar.h,v 1.14 2013/01/22 11:58:39 isaki Exp $ */
+/* $NetBSD: intiovar.h,v 1.15 2019/12/15 16:48:26 tsutsui Exp $ */
/*
*
@@ -13,12 +13,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/arch/x68k/dev/mfp.c b/sys/arch/x68k/dev/mfp.c
index f1485f1cddf..f208dd5454f 100644
--- a/sys/arch/x68k/dev/mfp.c
+++ b/sys/arch/x68k/dev/mfp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $ */
+/* $NetBSD: mfp.c,v 1.27 2019/12/15 16:48:26 tsutsui Exp $ */
/*-
* Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -12,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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.27 2019/12/15 16:48:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/zaurus/include/kloader.h b/sys/arch/zaurus/include/kloader.h
index 3874a50034c..5be77281d92 100644
--- a/sys/arch/zaurus/include/kloader.h
+++ b/sys/arch/zaurus/include/kloader.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.2 2015/06/11 15:11:14 matt Exp $ */
+/* $NetBSD: kloader.h,v 1.3 2019/12/15 16:48:26 tsutsui Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED