aboutsummaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-05-10 15:40:58 +0000
committerWarner Losh <imp@FreeBSD.org>2023-05-12 16:44:03 +0000
commit4d846d260e2b9a3d4d0a701462568268cbfe7a5b (patch)
treee06136ddd235d1b7d34c2926249174a5840ad842 /sys/kern
parent2b519b170709b9c2bb9f66641737d1d80a5d2538 (diff)
downloadsrc-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.tar.gz
src-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.zip
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/genoffset.c2
-rw-r--r--sys/kern/genoffset.sh2
-rw-r--r--sys/kern/imgact_aout.c2
-rw-r--r--sys/kern/imgact_elf32.c2
-rw-r--r--sys/kern/imgact_elf64.c2
-rw-r--r--sys/kern/imgact_shell.c2
-rw-r--r--sys/kern/kern_alq.c2
-rw-r--r--sys/kern/kern_boottrace.c2
-rw-r--r--sys/kern/kern_clocksource.c2
-rw-r--r--sys/kern/kern_condvar.c2
-rw-r--r--sys/kern/kern_conf.c2
-rw-r--r--sys/kern/kern_context.c2
-rw-r--r--sys/kern/kern_cpu.c2
-rw-r--r--sys/kern/kern_cpuset.c2
-rw-r--r--sys/kern/kern_ctf.c2
-rw-r--r--sys/kern/kern_dtrace.c2
-rw-r--r--sys/kern/kern_environment.c2
-rw-r--r--sys/kern/kern_et.c2
-rw-r--r--sys/kern/kern_event.c2
-rw-r--r--sys/kern/kern_exec.c2
-rw-r--r--sys/kern/kern_fail.c2
-rw-r--r--sys/kern/kern_ffclock.c2
-rw-r--r--sys/kern/kern_hhook.c2
-rw-r--r--sys/kern/kern_idle.c2
-rw-r--r--sys/kern/kern_intr.c2
-rw-r--r--sys/kern/kern_jail.c2
-rw-r--r--sys/kern/kern_kcov.c2
-rw-r--r--sys/kern/kern_khelp.c2
-rw-r--r--sys/kern/kern_kthread.c2
-rw-r--r--sys/kern/kern_ktr.c2
-rw-r--r--sys/kern/kern_linker.c2
-rw-r--r--sys/kern/kern_lock.c2
-rw-r--r--sys/kern/kern_lockstat.c2
-rw-r--r--sys/kern/kern_loginclass.c2
-rw-r--r--sys/kern/kern_mbuf.c2
-rw-r--r--sys/kern/kern_module.c2
-rw-r--r--sys/kern/kern_mtxpool.c2
-rw-r--r--sys/kern/kern_osd.c2
-rw-r--r--sys/kern/kern_pmc.c2
-rw-r--r--sys/kern/kern_poll.c2
-rw-r--r--sys/kern/kern_priv.c2
-rw-r--r--sys/kern/kern_racct.c2
-rw-r--r--sys/kern/kern_rangelock.c2
-rw-r--r--sys/kern/kern_rctl.c2
-rw-r--r--sys/kern/kern_rwlock.c2
-rw-r--r--sys/kern/kern_sdt.c2
-rw-r--r--sys/kern/kern_sema.c2
-rw-r--r--sys/kern/kern_sharedpage.c2
-rw-r--r--sys/kern/kern_switch.c2
-rw-r--r--sys/kern/kern_sx.c2
-rw-r--r--sys/kern/kern_syscalls.c2
-rw-r--r--sys/kern/kern_thr.c2
-rw-r--r--sys/kern/kern_thread.c2
-rw-r--r--sys/kern/kern_umtx.c2
-rw-r--r--sys/kern/kern_uuid.c2
-rw-r--r--sys/kern/link_elf.c2
-rw-r--r--sys/kern/link_elf_obj.c2
-rw-r--r--sys/kern/sched_ule.c2
-rw-r--r--sys/kern/subr_acl_nfs4.c2
-rw-r--r--sys/kern/subr_acl_posix1e.c2
-rw-r--r--sys/kern/subr_atomic64.c2
-rw-r--r--sys/kern/subr_boot.c2
-rw-r--r--sys/kern/subr_bufring.c2
-rw-r--r--sys/kern/subr_bus.c2
-rw-r--r--sys/kern/subr_bus_dma.c2
-rw-r--r--sys/kern/subr_busdma_bounce.c2
-rw-r--r--sys/kern/subr_busdma_bufalloc.c2
-rw-r--r--sys/kern/subr_capability.c2
-rw-r--r--sys/kern/subr_compressor.c2
-rw-r--r--sys/kern/subr_counter.c2
-rw-r--r--sys/kern/subr_coverage.c2
-rw-r--r--sys/kern/subr_dummy_vdso_tc.c2
-rw-r--r--sys/kern/subr_epoch.c2
-rw-r--r--sys/kern/subr_eventhandler.c2
-rw-r--r--sys/kern/subr_fattime.c2
-rw-r--r--sys/kern/subr_firmware.c2
-rw-r--r--sys/kern/subr_hints.c2
-rw-r--r--sys/kern/subr_kdb.c2
-rw-r--r--sys/kern/subr_kobj.c2
-rw-r--r--sys/kern/subr_lock.c2
-rw-r--r--sys/kern/subr_module.c2
-rw-r--r--sys/kern/subr_msgbuf.c2
-rw-r--r--sys/kern/subr_pctrie.c2
-rw-r--r--sys/kern/subr_physmem.c2
-rw-r--r--sys/kern/subr_pidctrl.c2
-rw-r--r--sys/kern/subr_power.c2
-rw-r--r--sys/kern/subr_prng.c2
-rw-r--r--sys/kern/subr_rangeset.c2
-rw-r--r--sys/kern/subr_sbuf.c2
-rw-r--r--sys/kern/subr_sleepqueue.c2
-rw-r--r--sys/kern/subr_smp.c2
-rw-r--r--sys/kern/subr_smr.c2
-rw-r--r--sys/kern/subr_stack.c2
-rw-r--r--sys/kern/subr_taskqueue.c2
-rw-r--r--sys/kern/subr_terminal.c2
-rw-r--r--sys/kern/subr_unit.c2
-rw-r--r--sys/kern/subr_vmem.c2
-rw-r--r--sys/kern/sys_capability.c2
-rw-r--r--sys/kern/sys_eventfd.c2
-rw-r--r--sys/kern/sys_getrandom.c2
-rw-r--r--sys/kern/sys_procdesc.c2
-rw-r--r--sys/kern/sysv_msg.c2
-rw-r--r--sys/kern/sysv_sem.c2
-rw-r--r--sys/kern/sysv_shm.c2
-rw-r--r--sys/kern/tty.c2
-rw-r--r--sys/kern/tty_inq.c2
-rw-r--r--sys/kern/tty_outq.c2
-rw-r--r--sys/kern/tty_pts.c2
-rw-r--r--sys/kern/tty_tty.c2
-rw-r--r--sys/kern/tty_ttydisc.c2
-rw-r--r--sys/kern/uipc_accf.c2
-rw-r--r--sys/kern/uipc_debug.c2
-rw-r--r--sys/kern/uipc_mqueue.c2
-rw-r--r--sys/kern/uipc_sem.c2
-rw-r--r--sys/kern/uipc_shm.c2
-rw-r--r--sys/kern/vfs_acl.c2
-rw-r--r--sys/kern/vfs_aio.c2
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/kern/vfs_extattr.c2
-rw-r--r--sys/kern/vfs_hash.c2
120 files changed, 120 insertions, 120 deletions
diff --git a/sys/kern/genoffset.c b/sys/kern/genoffset.c
index 11ba6372ae8f..e3d42c8c6b79 100644
--- a/sys/kern/genoffset.c
+++ b/sys/kern/genoffset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/kern/genoffset.sh b/sys/kern/genoffset.sh
index aedccfd84c6e..0caeabf0ca59 100644
--- a/sys/kern/genoffset.sh
+++ b/sys/kern/genoffset.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2000, Bruce Evans <bde@freebsd.org>
# Copyright (c) 2018, Jeff Roberson <jeff@freebsd.org>
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index ceb305e33756..275fc4e8f3e1 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c
index a25022e6f66d..9ddbbe20f8f3 100644
--- a/sys/kern/imgact_elf32.c
+++ b/sys/kern/imgact_elf32.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c
index 3c1181ff9a5c..142116ba11fd 100644
--- a/sys/kern/imgact_elf64.c
+++ b/sys/kern/imgact_elf64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index d5287a4e95d1..831475d37ffe 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index 9d279628d95c..7e7fb824b219 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c
index 0a25512c4b12..cb013d4e8be1 100644
--- a/sys/kern/kern_boottrace.c
+++ b/sys/kern/kern_boottrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2022 NetApp, Inc.
*
diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c
index c7de78367b0b..0ec2d0e781ab 100644
--- a/sys/kern/kern_clocksource.c
+++ b/sys/kern/kern_clocksource.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index ffceee44a5c0..66738daa30c0 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 374aafc91005..574e519766db 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c
index 8612c95ae641..c7790d800a5d 100644
--- a/sys/kern/kern_context.c
+++ b/sys/kern/kern_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c
index 37c0aa8aab6a..8a0b2d434fd8 100644
--- a/sys/kern/kern_cpu.c
+++ b/sys/kern/kern_cpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2007 Nate Lawson (SDG)
* All rights reserved.
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index 894d29ea1ac8..d8cb95814805 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c
index e0e348b83168..4eacabf74c7d 100644
--- a/sys/kern/kern_ctf.c
+++ b/sys/kern/kern_ctf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 John Birrell <jb@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_dtrace.c b/sys/kern/kern_dtrace.c
index a57ca9d93568..1149d1de0cfc 100644
--- a/sys/kern/kern_dtrace.c
+++ b/sys/kern/kern_dtrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 John Birrell <jb@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index c39b9cb682a0..cf2e65fc2cd2 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith
* All rights reserved.
diff --git a/sys/kern/kern_et.c b/sys/kern/kern_et.c
index 6b0052c07b45..1c1985c60a52 100644
--- a/sys/kern/kern_et.c
+++ b/sys/kern/kern_et.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 5cafa0c803fd..add480ac5dff 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* Copyright 2004 John-Mark Gurney <jmg@FreeBSD.org>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 68dab42c25cc..6d273dab3af6 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c
index d10450ce1280..d4abc80c2c9e 100644
--- a/sys/kern/kern_fail.c
+++ b/sys/kern/kern_fail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Isilon Inc http://www.isilon.com/
*
diff --git a/sys/kern/kern_ffclock.c b/sys/kern/kern_ffclock.c
index 0ab8e35fbe02..14baae430e31 100644
--- a/sys/kern/kern_ffclock.c
+++ b/sys/kern/kern_ffclock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
diff --git a/sys/kern/kern_hhook.c b/sys/kern/kern_hhook.c
index fa30802664ac..43f0d46af8aa 100644
--- a/sys/kern/kern_hhook.c
+++ b/sys/kern/kern_hhook.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c
index 100900d1ae9e..496231ef91c5 100644
--- a/sys/kern/kern_idle.c
+++ b/sys/kern/kern_idle.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2000-2004 The FreeBSD Project. All rights reserved.
*
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 2d44e657b7f0..223203b0053f 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 0558c7d9b7fe..07924f3dc7c9 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2008 Bjoern A. Zeeb.
diff --git a/sys/kern/kern_kcov.c b/sys/kern/kern_kcov.c
index 287071e8ac3a..8046340d2400 100644
--- a/sys/kern/kern_kcov.c
+++ b/sys/kern/kern_kcov.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner
diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c
index 4f8a4248ec25..d18b77133941 100644
--- a/sys/kern/kern_khelp.c
+++ b/sys/kern/kern_khelp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 782370b1ba77..ad05bc532c57 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index fe25122ecb9e..07d306429760 100644
--- a/sys/kern/kern_ktr.c
+++ b/sys/kern/kern_ktr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 9756bc571dca..f5e3195714e0 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index ee34e03188a5..801365508ac9 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_lockstat.c b/sys/kern/kern_lockstat.c
index c5ab1c0c5fd1..a2982b4b3e3b 100644
--- a/sys/kern/kern_lockstat.c
+++ b/sys/kern/kern_lockstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008-2009 Stacey Son <sson@FreeBSD.org>
*
diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c
index cb84d22e2932..97443cd40e56 100644
--- a/sys/kern/kern_loginclass.c
+++ b/sys/kern/kern_loginclass.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 2e1419aaa2ef..b0a3dafbf032 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005,
* Bosko Milekic <bmilekic@FreeBSD.org>. All rights reserved.
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 1798a834dcec..40e47868481c 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index 92cfeb5bd131..1bfa11938b50 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Matthew Dillon. All Rights Reserved.
*
diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c
index 9e318b27c250..23178731b899 100644
--- a/sys/kern/kern_osd.c
+++ b/sys/kern/kern_osd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index 88e87f25cd2c..7c2022824dd0 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index 0f6650b50a5c..c5f867959bec 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Luigi Rizzo
*
diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c
index c1bd373bcb9e..1226ec80f81c 100644
--- a/sys/kern/kern_priv.c
+++ b/sys/kern/kern_priv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 nCircle Network Security, Inc.
* Copyright (c) 2009 Robert N. M. Watson
diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c
index 9fbb2b4cb57f..4991d48f3eb7 100644
--- a/sys/kern/kern_racct.c
+++ b/sys/kern/kern_racct.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c
index 2983abbbdb5a..b6a20a72ca7d 100644
--- a/sys/kern/kern_rangelock.c
+++ b/sys/kern/kern_rangelock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c
index f4356f802f0c..0feb4b52dc7c 100644
--- a/sys/kern/kern_rctl.c
+++ b/sys/kern/kern_rctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index f1c18f952f24..628a850e0a6c 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c
index a46d21c1c548..954c2284bd03 100644
--- a/sys/kern/kern_sdt.c
+++ b/sys/kern/kern_sdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
*
diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c
index 62678f4faf64..be5973e6e117 100644
--- a/sys/kern/kern_sema.c
+++ b/sys/kern/kern_sema.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
*
diff --git a/sys/kern/kern_sharedpage.c b/sys/kern/kern_sharedpage.c
index f90e90b0feaf..569264784c46 100644
--- a/sys/kern/kern_sharedpage.c
+++ b/sys/kern/kern_sharedpage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2015 The FreeBSD Foundation
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index aee0c9cbd1ae..9ec6204e9b15 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index 2b826fa91a26..a8434a9457bf 100644
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 4b191eabbe04..a6e515fc0ce8 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 4c0cfe06f1b4..326b5758b5a8 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 0e432d6978e6..283606bf4a8b 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Julian Elischer <julian@freebsd.org>.
* All rights reserved.
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 92c7de6f2a2c..2c182eb76bdb 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015, 2016 The FreeBSD Foundation
* Copyright (c) 2004, David Xu <davidxu@freebsd.org>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 4dbadc732de9..043d2ac2f020 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 8e1495acee2b..b410469b6270 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 076994b44dfd..c1af41fc4139 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 881413ca5e73..3cd45fc5277d 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_acl_nfs4.c b/sys/kern/subr_acl_nfs4.c
index 933dd3fdb35c..3fc9bb3df61d 100644
--- a/sys/kern/subr_acl_nfs4.c
+++ b/sys/kern/subr_acl_nfs4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index 775957f9ef6f..38239d8c6e65 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2006 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/subr_atomic64.c b/sys/kern/subr_atomic64.c
index 66d2d4924d35..a16c78c22820 100644
--- a/sys/kern/subr_atomic64.c
+++ b/sys/kern/subr_atomic64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Justin Hibbits
*
diff --git a/sys/kern/subr_boot.c b/sys/kern/subr_boot.c
index d920140ae4b9..057ffb5b7e08 100644
--- a/sys/kern/subr_boot.c
+++ b/sys/kern/subr_boot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
* All Rights Reserved.
diff --git a/sys/kern/subr_bufring.c b/sys/kern/subr_bufring.c
index 490c7cfa2fb8..d0c6c0489c64 100644
--- a/sys/kern/subr_bufring.c
+++ b/sys/kern/subr_bufring.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index b9615b033007..b64d99961510 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c
index 7ed012ba1a4f..65a08aeba17c 100644
--- a/sys/kern/subr_bus_dma.c
+++ b/sys/kern/subr_bus_dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
diff --git a/sys/kern/subr_busdma_bounce.c b/sys/kern/subr_busdma_bounce.c
index d6c50d83bbe7..f5f27dae9b05 100644
--- a/sys/kern/subr_busdma_bounce.c
+++ b/sys/kern/subr_busdma_bounce.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/kern/subr_busdma_bufalloc.c b/sys/kern/subr_busdma_bufalloc.c
index ebf83d61ca18..63a07ae98824 100644
--- a/sys/kern/subr_busdma_bufalloc.c
+++ b/sys/kern/subr_busdma_bufalloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c
index 47a6f256fe7e..a159e7592866 100644
--- a/sys/kern/subr_capability.c
+++ b/sys/kern/subr_capability.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 FreeBSD Foundation
*
diff --git a/sys/kern/subr_compressor.c b/sys/kern/subr_compressor.c
index d36e59aaa180..92a3ab05c9aa 100644
--- a/sys/kern/subr_compressor.c
+++ b/sys/kern/subr_compressor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, 2017 Mark Johnston <markj@FreeBSD.org>
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
diff --git a/sys/kern/subr_counter.c b/sys/kern/subr_counter.c
index c79cc49dfd0d..05ce4780041c 100644
--- a/sys/kern/subr_counter.c
+++ b/sys/kern/subr_counter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/subr_coverage.c b/sys/kern/subr_coverage.c
index 28467af6a8d0..7bfd13031ea5 100644
--- a/sys/kern/subr_coverage.c
+++ b/sys/kern/subr_coverage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner
diff --git a/sys/kern/subr_dummy_vdso_tc.c b/sys/kern/subr_dummy_vdso_tc.c
index d1ce053e0429..a9c64aa6457a 100644
--- a/sys/kern/subr_dummy_vdso_tc.c
+++ b/sys/kern/subr_dummy_vdso_tc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c
index 2a0144412399..409e5f76350f 100644
--- a/sys/kern/subr_epoch.c
+++ b/sys/kern/subr_epoch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index bd0f7ff30a18..a250a49adeae 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_fattime.c b/sys/kern/subr_fattime.c
index bc8bef4b089c..c5a18d40eee4 100644
--- a/sys/kern/subr_fattime.c
+++ b/sys/kern/subr_fattime.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c
index aafb2a2ba265..f15cd2c3f521 100644
--- a/sys/kern/subr_firmware.c
+++ b/sys/kern/subr_firmware.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008, Sam Leffler <sam@errno.com>
* All rights reserved.
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
index b16761d7d6fc..10f300b5cf12 100644
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 8aae19b728c8..79b61f67b1e0 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 The FreeBSD Project
* All rights reserved.
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index 1596cb3ae212..263cd7b5da0d 100644
--- a/sys/kern/subr_kobj.c
+++ b/sys/kern/subr_kobj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
index 05ce8b73b086..160fb6b683eb 100644
--- a/sys/kern/subr_lock.c
+++ b/sys/kern/subr_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 1ada33c669dc..e68c10223d5d 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith
* All rights reserved.
diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c
index 4664e742c5fb..9d8bcfa982d7 100644
--- a/sys/kern/subr_msgbuf.c
+++ b/sys/kern/subr_msgbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ian Dowse. All rights reserved.
*
diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c
index e38dc45fa022..9db7dd2b68c6 100644
--- a/sys/kern/subr_pctrie.c
+++ b/sys/kern/subr_pctrie.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c
index b76d25ed1ae2..bd6b4d8538c9 100644
--- a/sys/kern/subr_physmem.c
+++ b/sys/kern/subr_physmem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_pidctrl.c b/sys/kern/subr_pidctrl.c
index 9d83c2d6b77d..bf33ce4babdb 100644
--- a/sys/kern/subr_pidctrl.c
+++ b/sys/kern/subr_pidctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index c6ab5ee39bd8..024892c62276 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/kern/subr_prng.c b/sys/kern/subr_prng.c
index 124a56e0e4ea..1f2bdaf58e2b 100644
--- a/sys/kern/subr_prng.c
+++ b/sys/kern/subr_prng.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c
index 3798b30e2240..c8af58c6f84f 100644
--- a/sys/kern/subr_rangeset.c
+++ b/sys/kern/subr_rangeset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 6c533f36c82e..eddb291684df 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2008 Poul-Henning Kamp
* Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 164e58b2a571..a157dee22c9f 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 5a1013dad65f..00e2396d5774 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, John Baldwin <jhb@FreeBSD.org>.
*
diff --git a/sys/kern/subr_smr.c b/sys/kern/subr_smr.c
index df2520005673..70bafa2faada 100644
--- a/sys/kern/subr_smr.c
+++ b/sys/kern/subr_smr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019,2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/sys/kern/subr_stack.c b/sys/kern/subr_stack.c
index cc10584f03a1..a30f858d38f1 100644
--- a/sys/kern/subr_stack.c
+++ b/sys/kern/subr_stack.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 7ad7c210ceff..16fe9ba9d41c 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c
index 6a7163b63d15..9d6549692ee2 100644
--- a/sys/kern/subr_terminal.c
+++ b/sys/kern/subr_terminal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 7931012360ba..7bc0bf0ede4a 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c
index 74684ff1b2d5..bb349a15385d 100644
--- a/sys/kern/subr_vmem.c
+++ b/sys/kern/subr_vmem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
* Copyright (c) 2013 EMC Corp.
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c
index 2543a06e941d..55b5f8bdbcf5 100644
--- a/sys/kern/sys_capability.c
+++ b/sys/kern/sys_capability.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2011 Robert N. M. Watson
* Copyright (c) 2010-2011 Jonathan Anderson
diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c
index 10566b486f30..e8dcdae40727 100644
--- a/sys/kern/sys_eventfd.c
+++ b/sys/kern/sys_eventfd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/kern/sys_getrandom.c b/sys/kern/sys_getrandom.c
index f58d0fe2af57..929a3ebe21af 100644
--- a/sys/kern/sys_getrandom.c
+++ b/sys/kern/sys_getrandom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c
index ff1a1502aa71..247af5c83e6e 100644
--- a/sys/kern/sys_procdesc.c
+++ b/sys/kern/sys_procdesc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index afb0e34a5a44..bf288bf42c99 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -17,7 +17,7 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 551651be7c1a..c8bfd1eb3848 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -6,7 +6,7 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 658b48e2e2e1..69f2ec8375a3 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 5fa7b3dc7525..7de5911cfae8 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c
index 069da33ab26a..2153d2cbd71e 100644
--- a/sys/kern/tty_inq.c
+++ b/sys/kern/tty_inq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_outq.c b/sys/kern/tty_outq.c
index 580a3656aca1..6b37ee1ca437 100644
--- a/sys/kern/tty_outq.c
+++ b/sys/kern/tty_outq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index 009baec5c9a5..afd883f2b009 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 8490a4421f5f..03debbf95bcb 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp. All rights reserved.
*
diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c
index 546b610010a3..420615b89335 100644
--- a/sys/kern/tty_ttydisc.c
+++ b/sys/kern/tty_ttydisc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 792c53c7baff..555ee7a7044a 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Paycounter, Inc.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c
index 62c8138c3bb3..0306b797e1c3 100644
--- a/sys/kern/uipc_debug.c
+++ b/sys/kern/uipc_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 29c7bcdd4289..43f81ec313de 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index 22930834f330..87d51bdb6930 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* Copyright (c) 2003-2005 SPARTA, Inc.
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index 355e76cd41fa..fb210248f9ac 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2011, 2016-2017 Robert N. M. Watson
* Copyright 2020 The FreeBSD Foundation
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index e5470bd11438..927005e6d452 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2006, 2016-2017 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index d32e6fea15ca..e5d2a843524c 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 6ba7054d3866..177b201e4819 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 1994,1997 John S. Dyson
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index d190ec60205a..4b2cd920f32b 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c
index 2e446e69a314..02be4ba890ea 100644
--- a/sys/kern/vfs_hash.c
+++ b/sys/kern/vfs_hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.