aboutsummaryrefslogtreecommitdiff
path: root/sys/vm
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2017-11-30 15:48:35 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2017-11-30 15:48:35 +0000
commit796df753f404f4772ae0fd7da0e1d2b948268448 (patch)
treeffa1824d10342f161f9112de178916d9387e992b /sys/vm
parentcf3329887e7001b368ff8cdea080ad1812b9b109 (diff)
downloadsrc-796df753f404f4772ae0fd7da0e1d2b948268448.tar.gz
src-796df753f404f4772ae0fd7da0e1d2b948268448.zip
SPDX: Consider code from Carnegie-Mellon University.
Interesting cases, most likely from CMU Mach sources.
Notes
Notes: svn path=/head/; revision=326403
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm.h2
-rw-r--r--sys/vm/vm_domain.c2
-rw-r--r--sys/vm/vm_domain.h2
-rw-r--r--sys/vm/vm_fault.c2
-rw-r--r--sys/vm/vm_glue.c2
-rw-r--r--sys/vm/vm_init.c2
-rw-r--r--sys/vm/vm_kern.c2
-rw-r--r--sys/vm/vm_kern.h2
-rw-r--r--sys/vm/vm_map.c2
-rw-r--r--sys/vm/vm_map.h2
-rw-r--r--sys/vm/vm_object.c2
-rw-r--r--sys/vm/vm_object.h2
-rw-r--r--sys/vm/vm_page.c2
-rw-r--r--sys/vm/vm_page.h2
-rw-r--r--sys/vm/vm_pageout.c2
-rw-r--r--sys/vm/vm_pageout.h2
-rw-r--r--sys/vm/vm_pager.c2
-rw-r--r--sys/vm/vm_param.h2
-rw-r--r--sys/vm/vm_swapout.c2
-rw-r--r--sys/vm/vm_swapout_dummy.c2
20 files changed, 24 insertions, 16 deletions
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 <adrian@FreeBSD.org>.
* 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 <adrian@FreeBSD.org>.
* 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