From 796df753f404f4772ae0fd7da0e1d2b948268448 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 30 Nov 2017 15:48:35 +0000 Subject: [PATCH] SPDX: Consider code from Carnegie-Mellon University. Interesting cases, most likely from CMU Mach sources. --- sys/arm64/include/profile.h | 2 ++ sys/ddb/db_access.c | 2 ++ sys/ddb/db_access.h | 2 ++ sys/ddb/db_break.c | 2 ++ sys/ddb/db_break.h | 2 ++ sys/ddb/db_capture.c | 2 ++ sys/ddb/db_command.c | 2 ++ sys/ddb/db_command.h | 2 ++ sys/ddb/db_examine.c | 2 ++ sys/ddb/db_expr.c | 2 ++ sys/ddb/db_input.c | 2 ++ sys/ddb/db_lex.c | 2 ++ sys/ddb/db_lex.h | 2 ++ sys/ddb/db_main.c | 2 ++ sys/ddb/db_output.c | 2 ++ sys/ddb/db_output.h | 2 ++ sys/ddb/db_print.c | 2 ++ sys/ddb/db_run.c | 2 ++ sys/ddb/db_sym.c | 2 ++ sys/ddb/db_sym.h | 2 ++ sys/ddb/db_variables.c | 2 ++ sys/ddb/db_variables.h | 2 ++ sys/ddb/db_watch.c | 2 ++ sys/ddb/db_watch.h | 2 ++ sys/ddb/db_write_cmd.c | 2 ++ sys/dev/fb/gfb.h | 2 ++ sys/dev/mc146818/mc146818reg.h | 2 ++ sys/mips/include/cdefs.h | 4 +++- sys/mips/include/setjmp.h | 2 ++ sys/powerpc/include/profile.h | 2 ++ sys/powerpc/powerpc/vm_machdep.c | 2 +- sys/riscv/include/profile.h | 2 ++ sys/sparc64/include/profile.h | 2 ++ sys/vm/vm.h | 2 +- sys/vm/vm_domain.c | 2 ++ sys/vm/vm_domain.h | 2 ++ sys/vm/vm_fault.c | 2 +- sys/vm/vm_glue.c | 2 +- sys/vm/vm_init.c | 2 +- sys/vm/vm_kern.c | 2 +- sys/vm/vm_kern.h | 2 +- sys/vm/vm_map.c | 2 +- sys/vm/vm_map.h | 2 +- sys/vm/vm_object.c | 2 +- sys/vm/vm_object.h | 2 +- sys/vm/vm_page.c | 2 +- sys/vm/vm_page.h | 2 +- sys/vm/vm_pageout.c | 2 +- sys/vm/vm_pageout.h | 2 +- sys/vm/vm_pager.c | 2 +- sys/vm/vm_param.h | 2 +- sys/vm/vm_swapout.c | 2 ++ sys/vm/vm_swapout_dummy.c | 2 ++ 53 files changed, 90 insertions(+), 18 deletions(-) diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index c2ec9b743252..087af0504c75 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index ec2107352f1d..4f8284525dde 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h index 2b8ac71bac1e..ac11e92bf811 100644 --- a/sys/ddb/db_access.h +++ b/sys/ddb/db_access.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index c882584957c0..6275f819a2b5 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index b35d74377813..2d3283cc1529 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_capture.c b/sys/ddb/db_capture.c index 056edef437cd..678c0cd2f21e 100644 --- a/sys/ddb/db_capture.c +++ b/sys/ddb/db_capture.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2007 Robert N. M. Watson diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index effb5f0dfa28..a43305b6bbc0 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h index 2103a02ae99c..6178f6e274ba 100644 --- a/sys/ddb/db_command.h +++ b/sys/ddb/db_command.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index a1e5a2858ab7..fd100bd29add 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index 0b473735e3c9..b3198611a04c 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 04c0d592b8ff..41396e0a041f 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 4fdfa317c6e4..8e25cc898fc1 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h index e20907db8420..e9ed3a660393 100644 --- a/sys/ddb/db_lex.h +++ b/sys/ddb/db_lex.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c index da6a5130b4ef..174f930fc7c4 100644 --- a/sys/ddb/db_main.c +++ b/sys/ddb/db_main.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index c0dc58bc599b..147a4c597787 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 795719fce6e9..e64608bd66ad 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index e4efe0a560d7..3ff0b781532d 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index 4ffba48583b8..a55fcea9e632 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 8b257b191148..a28013981355 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index 51744c50f4e8..1ad35e2b0c85 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index d69c9804ff56..2c3840339e4c 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h index 1cbc481a1a7d..bc7201e577bd 100644 --- a/sys/ddb/db_variables.h +++ b/sys/ddb/db_variables.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index 23612fe5eb58..2a3ccbf8b00e 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h index d4fdfc855bd4..4757635d3da3 100644 --- a/sys/ddb/db_watch.h +++ b/sys/ddb/db_watch.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index 2e0cf03c650a..3b0102da5fc5 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h index ee70640b8a5f..891d3172a55f 100644 --- a/sys/dev/fb/gfb.h +++ b/sys/dev/fb/gfb.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1995, 1996 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/dev/mc146818/mc146818reg.h b/sys/dev/mc146818/mc146818reg.h index 811187e4b7d1..10071699882a 100644 --- a/sys/dev/mc146818/mc146818reg.h +++ b/sys/dev/mc146818/mc146818reg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/mips/include/cdefs.h b/sys/mips/include/cdefs.h index 181d6ee618c7..a7f118ea6a8a 100644 --- a/sys/mips/include/cdefs.h +++ b/sys/mips/include/cdefs.h @@ -1,6 +1,8 @@ /* $NetBSD: cdefs.h,v 1.12 2006/08/27 19:04:30 matt Exp $ */ -/* +/*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/mips/include/setjmp.h b/sys/mips/include/setjmp.h index 920c942b0e56..8b6ca0478fda 100644 --- a/sys/mips/include/setjmp.h +++ b/sys/mips/include/setjmp.h @@ -1,6 +1,8 @@ /* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h index b1481a7a2328..5f933551279e 100644 --- a/sys/powerpc/include/profile.h +++ b/sys/powerpc/include/profile.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index cc9eea85a378..a34c657d9c04 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: (BSD-4-Clause AND MIT-CMU) * * Copyright (c) 1982, 1986 The Regents of the University of California. * Copyright (c) 1989, 1990 William Jolitz diff --git a/sys/riscv/include/profile.h b/sys/riscv/include/profile.h index c2ec9b743252..087af0504c75 100644 --- a/sys/riscv/include/profile.h +++ b/sys/riscv/include/profile.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/sparc64/include/profile.h b/sys/sparc64/include/profile.h index 6c7d1b297ac9..59cdec6b67c5 100644 --- a/sys/sparc64/include/profile.h +++ b/sys/sparc64/include/profile.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 5b1616c0eeef..f674fc5626b4 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_domain.c b/sys/vm/vm_domain.c index a560d6fe8031..9fe44168cfad 100644 --- a/sys/vm/vm_domain.c +++ b/sys/vm/vm_domain.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2015 Adrian Chadd . * All rights reserved. * diff --git a/sys/vm/vm_domain.h b/sys/vm/vm_domain.h index 1b8a38619639..3b99c43c9101 100644 --- a/sys/vm/vm_domain.h +++ b/sys/vm/vm_domain.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2015 Adrian Chadd . * All rights reserved. * diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 1b03af4314d0..ece496407c2c 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: (BSD-4-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 05a120dd6109..a00272c2348f 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index d46c6060aa30..3d0b166bc48d 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 2931f8085ca5..333e38e2791b 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index b49aa524b32a..20e847f5e5af 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 905ac1b93138..00dbc2d1bd05 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index e4f93e4c8fd4..0da693277b95 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index d1ba8b989256..f821150316f5 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 4aa7ede14659..1edf2d59868d 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 4f6dfbcdf0d8..4711af9d16de 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991 Regents of the University of California. * All rights reserved. diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index a4fec169e194..70aa20c056d2 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 4ecae5ad5fd3..81cab0e8cfba 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: (BSD-4-Clause AND MIT-CMU) * * Copyright (c) 1991 Regents of the University of California. * All rights reserved. diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index 75e3a1475186..2cdb1492fabc 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index a9e1ffbc6abc..3864c9dfc1c4 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 4ed7635de3a1..308259cbc96e 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND MIT-CMU) * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index 726c2e2f91a0..e3e8b8966d76 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (BSD-4-Clause AND MIT-CMU) + * * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson diff --git a/sys/vm/vm_swapout_dummy.c b/sys/vm/vm_swapout_dummy.c index 9cdfcb8ac954..4557a52c9ec0 100644 --- a/sys/vm/vm_swapout_dummy.c +++ b/sys/vm/vm_swapout_dummy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (BSD-4-Clause AND MIT-CMU) + * * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson