From owner-svn-src-all@freebsd.org  Thu Nov 30 15:48:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8C9CE5F189;
 Thu, 30 Nov 2017 15:48:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CC0A69832;
 Thu, 30 Nov 2017 15:48:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAUFmf6U072168;
 Thu, 30 Nov 2017 15:48:41 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAUFmaGu072114;
 Thu, 30 Nov 2017 15:48:36 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711301548.vAUFmaGu072114@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 30 Nov 2017 15:48:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326403 - in head/sys: arm64/include ddb dev/fb
 dev/mc146818 mips/include powerpc/include powerpc/powerpc riscv/include
 sparc64/include vm
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys: arm64/include ddb dev/fb dev/mc146818
 mips/include powerpc/include powerpc/powerpc riscv/include sparc64/include vm
X-SVN-Commit-Revision: 326403
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 15:48:42 -0000

Author: pfg
Date: Thu Nov 30 15:48:35 2017
New Revision: 326403
URL: https://svnweb.freebsd.org/changeset/base/326403

Log:
  SPDX: Consider code from Carnegie-Mellon University.
  
  Interesting cases, most likely from CMU Mach sources.

Modified:
  head/sys/arm64/include/profile.h
  head/sys/ddb/db_access.c
  head/sys/ddb/db_access.h
  head/sys/ddb/db_break.c
  head/sys/ddb/db_break.h
  head/sys/ddb/db_capture.c
  head/sys/ddb/db_command.c
  head/sys/ddb/db_command.h
  head/sys/ddb/db_examine.c
  head/sys/ddb/db_expr.c
  head/sys/ddb/db_input.c
  head/sys/ddb/db_lex.c
  head/sys/ddb/db_lex.h
  head/sys/ddb/db_main.c
  head/sys/ddb/db_output.c
  head/sys/ddb/db_output.h
  head/sys/ddb/db_print.c
  head/sys/ddb/db_run.c
  head/sys/ddb/db_sym.c
  head/sys/ddb/db_sym.h
  head/sys/ddb/db_variables.c
  head/sys/ddb/db_variables.h
  head/sys/ddb/db_watch.c
  head/sys/ddb/db_watch.h
  head/sys/ddb/db_write_cmd.c
  head/sys/dev/fb/gfb.h
  head/sys/dev/mc146818/mc146818reg.h
  head/sys/mips/include/cdefs.h
  head/sys/mips/include/setjmp.h
  head/sys/powerpc/include/profile.h
  head/sys/powerpc/powerpc/vm_machdep.c
  head/sys/riscv/include/profile.h
  head/sys/sparc64/include/profile.h
  head/sys/vm/vm.h
  head/sys/vm/vm_domain.c
  head/sys/vm/vm_domain.h
  head/sys/vm/vm_fault.c
  head/sys/vm/vm_glue.c
  head/sys/vm/vm_init.c
  head/sys/vm/vm_kern.c
  head/sys/vm/vm_kern.h
  head/sys/vm/vm_map.c
  head/sys/vm/vm_map.h
  head/sys/vm/vm_object.c
  head/sys/vm/vm_object.h
  head/sys/vm/vm_page.c
  head/sys/vm/vm_page.h
  head/sys/vm/vm_pageout.c
  head/sys/vm/vm_pageout.h
  head/sys/vm/vm_pager.c
  head/sys/vm/vm_param.h
  head/sys/vm/vm_swapout.c
  head/sys/vm/vm_swapout_dummy.c

Modified: head/sys/arm64/include/profile.h
==============================================================================
--- head/sys/arm64/include/profile.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/arm64/include/profile.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/ddb/db_access.c
==============================================================================
--- head/sys/ddb/db_access.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_access.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_access.h
==============================================================================
--- head/sys/ddb/db_access.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_access.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_break.c
==============================================================================
--- head/sys/ddb/db_break.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_break.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_break.h
==============================================================================
--- head/sys/ddb/db_break.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_break.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_capture.c
==============================================================================
--- head/sys/ddb/db_capture.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_capture.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2007 Robert N. M. Watson

Modified: head/sys/ddb/db_command.c
==============================================================================
--- head/sys/ddb/db_command.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_command.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_command.h
==============================================================================
--- head/sys/ddb/db_command.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_command.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_examine.c
==============================================================================
--- head/sys/ddb/db_examine.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_examine.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_expr.c
==============================================================================
--- head/sys/ddb/db_expr.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_expr.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_input.c
==============================================================================
--- head/sys/ddb/db_input.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_input.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_lex.c
==============================================================================
--- head/sys/ddb/db_lex.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_lex.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_lex.h
==============================================================================
--- head/sys/ddb/db_lex.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_lex.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_main.c
==============================================================================
--- head/sys/ddb/db_main.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_main.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_output.c
==============================================================================
--- head/sys/ddb/db_output.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_output.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_output.h
==============================================================================
--- head/sys/ddb/db_output.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_output.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_print.c
==============================================================================
--- head/sys/ddb/db_print.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_print.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_run.c
==============================================================================
--- head/sys/ddb/db_run.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_run.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_sym.c
==============================================================================
--- head/sys/ddb/db_sym.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_sym.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_sym.h
==============================================================================
--- head/sys/ddb/db_sym.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_sym.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_variables.c
==============================================================================
--- head/sys/ddb/db_variables.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_variables.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_variables.h
==============================================================================
--- head/sys/ddb/db_variables.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_variables.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_watch.c
==============================================================================
--- head/sys/ddb/db_watch.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_watch.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_watch.h
==============================================================================
--- head/sys/ddb/db_watch.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_watch.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/ddb/db_write_cmd.c
==============================================================================
--- head/sys/ddb/db_write_cmd.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/ddb/db_write_cmd.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

Modified: head/sys/dev/fb/gfb.h
==============================================================================
--- head/sys/dev/fb/gfb.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/dev/fb/gfb.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/dev/mc146818/mc146818reg.h
==============================================================================
--- head/sys/dev/mc146818/mc146818reg.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/dev/mc146818/mc146818reg.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/mips/include/cdefs.h
==============================================================================
--- head/sys/mips/include/cdefs.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/mips/include/cdefs.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.
  *

Modified: head/sys/mips/include/setjmp.h
==============================================================================
--- head/sys/mips/include/setjmp.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/mips/include/setjmp.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.
  *

Modified: head/sys/powerpc/include/profile.h
==============================================================================
--- head/sys/powerpc/include/profile.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/powerpc/include/profile.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/powerpc/powerpc/vm_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/vm_machdep.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/powerpc/powerpc/vm_machdep.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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

Modified: head/sys/riscv/include/profile.h
==============================================================================
--- head/sys/riscv/include/profile.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/riscv/include/profile.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/sparc64/include/profile.h
==============================================================================
--- head/sys/sparc64/include/profile.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/sparc64/include/profile.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: MIT-CMU
+ *
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *

Modified: head/sys/vm/vm.h
==============================================================================
--- head/sys/vm/vm.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_domain.c
==============================================================================
--- head/sys/vm/vm_domain.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_domain.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/sys/vm/vm_domain.h
==============================================================================
--- head/sys/vm/vm_domain.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_domain.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Adrian Chadd <adrian@FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_fault.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_glue.c
==============================================================================
--- head/sys/vm/vm_glue.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_glue.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_init.c
==============================================================================
--- head/sys/vm/vm_init.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_init.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_kern.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_kern.h
==============================================================================
--- head/sys/vm/vm_kern.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_kern.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_map.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_map.h
==============================================================================
--- head/sys/vm/vm_map.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_map.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_object.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_object.h
==============================================================================
--- head/sys/vm/vm_object.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_object.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_page.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_page.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_pageout.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_pageout.h
==============================================================================
--- head/sys/vm/vm_pageout.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_pageout.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_pager.c
==============================================================================
--- head/sys/vm/vm_pager.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_pager.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_param.h
==============================================================================
--- head/sys/vm/vm_param.h	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_param.h	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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.

Modified: head/sys/vm/vm_swapout.c
==============================================================================
--- head/sys/vm/vm_swapout.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_swapout.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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

Modified: head/sys/vm/vm_swapout_dummy.c
==============================================================================
--- head/sys/vm/vm_swapout_dummy.c	Thu Nov 30 15:45:42 2017	(r326402)
+++ head/sys/vm/vm_swapout_dummy.c	Thu Nov 30 15:48:35 2017	(r326403)
@@ -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