diff options
| author | Warner Losh <imp@FreeBSD.org> | 2023-05-10 15:40:58 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-07-25 15:13:49 +0000 |
| commit | caa41f641755c935b036e17440a3b49329c904ed (patch) | |
| tree | c434c1982a6fc944dd51fc660efbd6d84eea7ca5 /sys/x86 | |
| parent | 8557b8ba15b9d332000a17a73b752b6ec35d0903 (diff) | |
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD
The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.
Discussed with: pfg
MFC After: 3 days
Sponsored by: Netflix
(cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b)
Diffstat (limited to 'sys/x86')
65 files changed, 65 insertions, 65 deletions
diff --git a/sys/x86/acpica/OsdEnvironment.c b/sys/x86/acpica/OsdEnvironment.c index c9b22f25a28a..d5fdbad9e84f 100644 --- a/sys/x86/acpica/OsdEnvironment.c +++ b/sys/x86/acpica/OsdEnvironment.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000,2001 Michael Smith * Copyright (c) 2000 BSDi diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index 3435b85974e6..0487962f0b37 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.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/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 8e343a6619f3..12fac01ecd97 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/acpica/srat.c b/sys/x86/acpica/srat.c index eecf3315a910..c31eb40fb0b5 100644 --- a/sys/x86/acpica/srat.c +++ b/sys/x86/acpica/srat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Hudson River Trading LLC * Written by: John H. Baldwin <jhb@FreeBSD.org> diff --git a/sys/x86/bios/vpd.c b/sys/x86/bios/vpd.c index 195c6a57f094..e363f670ee99 100644 --- a/sys/x86/bios/vpd.c +++ b/sys/x86/bios/vpd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net> * All rights reserved. diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c index cdca2fdfec5f..fbfef5230dba 100644 --- a/sys/x86/cpufreq/est.c +++ b/sys/x86/cpufreq/est.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Colin Percival * Copyright (c) 2005 Nate Lawson diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 3760b40ad397..b70797f5c532 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Nate Lawson * Copyright (c) 2004 Colin Percival diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index ae63cc6a6efe..e30dc90a670c 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Intel Corporation * diff --git a/sys/x86/cpufreq/hwpstate_intel_internal.h b/sys/x86/cpufreq/hwpstate_intel_internal.h index ec038704edab..d3cbac9b6a64 100644 --- a/sys/x86/cpufreq/hwpstate_intel_internal.h +++ b/sys/x86/cpufreq/hwpstate_intel_internal.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Intel Corporation * diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c index 4370da81cf06..b8dc70a14433 100644 --- a/sys/x86/cpufreq/p4tcc.c +++ b/sys/x86/cpufreq/p4tcc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Nate Lawson * All rights reserved. diff --git a/sys/x86/cpufreq/powernow.c b/sys/x86/cpufreq/powernow.c index 977798ab2f77..db5aff804967 100644 --- a/sys/x86/cpufreq/powernow.c +++ b/sys/x86/cpufreq/powernow.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004-2005 Bruno Ducrot * Copyright (c) 2004 FUKUDA Nobuhiko <nfukuda@spa.is.uec.ac.jp> diff --git a/sys/x86/cpufreq/smist.c b/sys/x86/cpufreq/smist.c index 129ec2d4884b..0291fe299574 100644 --- a/sys/x86/cpufreq/smist.c +++ b/sys/x86/cpufreq/smist.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Bruno Ducrot * diff --git a/sys/x86/include/acpica_machdep.h b/sys/x86/include/acpica_machdep.h index d6694be9c373..8a75c9789787 100644 --- a/sys/x86/include/acpica_machdep.h +++ b/sys/x86/include/acpica_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 Mitsuru IWASAKI * All rights reserved. diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index fb8b3b92e658..0d91ed76c890 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, by Peter Wemm and Steve Passe * All rights reserved. diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index fbc2d58cae04..f3008d540b4b 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h index c48d98ddfe71..85009ac264c9 100644 --- a/sys/x86/include/busdma_impl.h +++ b/sys/x86/include/busdma_impl.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h index 7b2825579e65..98e07d19269e 100644 --- a/sys/x86/include/elf.h +++ b/sys/x86/include/elf.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996-1997 John D. Polstra. * All rights reserved. diff --git a/sys/x86/include/fdt.h b/sys/x86/include/fdt.h index 6db967d17d73..fdd86fa41f58 100644 --- a/sys/x86/include/fdt.h +++ b/sys/x86/include/fdt.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Juniper Networks, Inc. * All rights reserved. diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h index 880cabaa9496..f1fe4e9e740e 100644 --- a/sys/x86/include/init.h +++ b/sys/x86/include/init.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com> * All rights reserved. diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h index 346a33a40b79..933552c7dd7e 100644 --- a/sys/x86/include/intr_machdep.h +++ b/sys/x86/include/intr_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/include/kvm.h b/sys/x86/include/kvm.h index beec6447d7d6..724c4eabab55 100644 --- a/sys/x86/include/kvm.h +++ b/sys/x86/include/kvm.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2014 Bryan Venteicher <bryanv@FreeBSD.org> * Copyright (c) 2021 Mathieu Chouquet-Stringer diff --git a/sys/x86/include/legacyvar.h b/sys/x86/include/legacyvar.h index f6e5814a3f97..17d1144c580e 100644 --- a/sys/x86/include/legacyvar.h +++ b/sys/x86/include/legacyvar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org> * All rights reserved. diff --git a/sys/x86/include/mca.h b/sys/x86/include/mca.h index 9e582d413885..d2cde8e6e393 100644 --- a/sys/x86/include/mca.h +++ b/sys/x86/include/mca.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 Hudson River Trading LLC * Written by: John H. Baldwin <jhb@FreeBSD.org> diff --git a/sys/x86/include/mptable.h b/sys/x86/include/mptable.h index 93b87181b15a..7d5c38f4a9f3 100644 --- a/sys/x86/include/mptable.h +++ b/sys/x86/include/mptable.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, by Steve Passe * All rights reserved. diff --git a/sys/x86/include/ofw_machdep.h b/sys/x86/include/ofw_machdep.h index 69e1b98e1de7..eadf363d5e16 100644 --- a/sys/x86/include/ofw_machdep.h +++ b/sys/x86/include/ofw_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Juniper Networks, Inc. * All rights reserved. diff --git a/sys/x86/include/pci_cfgreg.h b/sys/x86/include/pci_cfgreg.h index 85d6485c47ed..b32ccb95370b 100644 --- a/sys/x86/include/pci_cfgreg.h +++ b/sys/x86/include/pci_cfgreg.h @@ -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/x86/include/procctl.h b/sys/x86/include/procctl.h index eb9a1e2c6ad1..1d1809c0af97 100644 --- a/sys/x86/include/procctl.h +++ b/sys/x86/include/procctl.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019,2020 The FreeBSD Foundation * diff --git a/sys/x86/include/tls.h b/sys/x86/include/tls.h index d4b631de10d0..4b6b58b4a5e3 100644 --- a/sys/x86/include/tls.h +++ b/sys/x86/include/tls.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2003 David Xu <davidxu@freebsd.org> * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org> diff --git a/sys/x86/include/ucode.h b/sys/x86/include/ucode.h index 5c8868108930..9be308021aa5 100644 --- a/sys/x86/include/ucode.h +++ b/sys/x86/include/ucode.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 The FreeBSD Foundation * diff --git a/sys/x86/include/vdso.h b/sys/x86/include/vdso.h index ace63cbe9f62..546a92a47301 100644 --- a/sys/x86/include/vdso.h +++ b/sys/x86/include/vdso.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>. * Copyright 2016 The FreeBSD Foundation. diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index a51f799ccbd8..6f17f2fc646a 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 9fc6ac436677..165fcbf46d89 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013-2015 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 61da86c098fc..7387a53cbbbc 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013-2015 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c index af8474f41692..0e709de609c8 100644 --- a/sys/x86/iommu/intel_fault.c +++ b/sys/x86/iommu/intel_fault.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index be421fee7aa9..25ce7a2e8c2b 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c index baaf5b472a2c..53f417702c72 100644 --- a/sys/x86/iommu/intel_qi.c +++ b/sys/x86/iommu/intel_qi.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c index f75857911416..bf5f4ce3773a 100644 --- a/sys/x86/iommu/intel_quirks.c +++ b/sys/x86/iommu/intel_quirks.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013, 2015 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_reg.h b/sys/x86/iommu/intel_reg.h index d8e1bbc82db3..d6b13fd62f4c 100644 --- a/sys/x86/iommu/intel_reg.h +++ b/sys/x86/iommu/intel_reg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013-2015 The FreeBSD Foundation * diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c index 315ffc8d4160..718c37b5f28b 100644 --- a/sys/x86/iommu/intel_utils.c +++ b/sys/x86/iommu/intel_utils.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The FreeBSD Foundation * diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index a98fb8b9d716..84cdb6da8d65 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c index 167e7cfbf8fd..24c437593717 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Poul-Henning Kamp * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org> diff --git a/sys/x86/isa/elcr.c b/sys/x86/isa/elcr.c index 7f2b90986d13..1db64c2dd7d0 100644 --- a/sys/x86/isa/elcr.c +++ b/sys/x86/isa/elcr.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/x86/isa/isa.c b/sys/x86/isa/isa.c index 49402b44ffba..ac2225348ce4 100644 --- a/sys/x86/isa/isa.c +++ b/sys/x86/isa/isa.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) + * SPDX-License-Identifier: (BSD-2-Clause AND ISC) * * Copyright (c) 1998 Doug Rabson * All rights reserved. diff --git a/sys/x86/isa/orm.c b/sys/x86/isa/orm.c index 6c16a8f63b27..a67803e4c55b 100644 --- a/sys/x86/isa/orm.c +++ b/sys/x86/isa/orm.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Nikolai Saoukh * All rights reserved. diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c index 92905600742e..3440049c54b9 100644 --- a/sys/x86/linux/linux_dummy_x86.c +++ b/sys/x86/linux/linux_dummy_x86.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Dmitry Chagin <dchagin@FreeBSD.org> * diff --git a/sys/x86/linux/linux_vdso_getcpu_x86.inc b/sys/x86/linux/linux_vdso_getcpu_x86.inc index 6cd0e5e78919..e26be602cb48 100644 --- a/sys/x86/linux/linux_vdso_getcpu_x86.inc +++ b/sys/x86/linux/linux_vdso_getcpu_x86.inc @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 The FreeBSD Foundation * Copyright (c) 2022 Dmitry Chagin <dchagin@FreeBSD.org> diff --git a/sys/x86/linux/linux_vdso_gettc_x86.inc b/sys/x86/linux/linux_vdso_gettc_x86.inc index 11c2a531e97e..573ccad5024c 100644 --- a/sys/x86/linux/linux_vdso_gettc_x86.inc +++ b/sys/x86/linux/linux_vdso_gettc_x86.inc @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> * Copyright (c) 2016, 2017, 2019 The FreeBSD Foundation diff --git a/sys/x86/linux/linux_x86.c b/sys/x86/linux/linux_x86.c index 2f4658106621..34ae66ec4954 100644 --- a/sys/x86/linux/linux_x86.c +++ b/sys/x86/linux/linux_x86.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1994-1996 Søren Schmidt * All rights reserved. diff --git a/sys/x86/linux/linux_x86.h b/sys/x86/linux/linux_x86.h index ce083bb1c3f5..2763b60f1649 100644 --- a/sys/x86/linux/linux_x86.h +++ b/sys/x86/linux/linux_x86.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org> * diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c index 0487c8475f43..500f14aefdbe 100644 --- a/sys/x86/pci/pci_bus.c +++ b/sys/x86/pci/pci_bus.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/x86/pci/pci_early_quirks.c b/sys/x86/pci/pci_early_quirks.c index 29788cdd19d4..8b3a9594ee6f 100644 --- a/sys/x86/pci/pci_early_quirks.c +++ b/sys/x86/pci/pci_early_quirks.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Johannes Lundberg * diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c index f567d680ad96..4910dd524276 100644 --- a/sys/x86/pci/qpi.c +++ b/sys/x86/pci/qpi.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Hudson River Trading LLC * Written by: John H. Baldwin <jhb@FreeBSD.org> diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index cfe4dc862d19..030360b1f1c2 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/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/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index ae62f83ea300..c75e2c997159 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.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. * Copyright (c) 2013 The FreeBSD Foundation diff --git a/sys/x86/x86/dump_machdep.c b/sys/x86/x86/dump_machdep.c index 006b59898bdc..6798b23146ae 100644 --- a/sys/x86/x86/dump_machdep.c +++ b/sys/x86/x86/dump_machdep.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/x86/x86/fdt_machdep.c b/sys/x86/x86/fdt_machdep.c index c120a90710a9..cfc7cf7b474e 100644 --- a/sys/x86/x86/fdt_machdep.c +++ b/sys/x86/x86/fdt_machdep.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Juniper Networks, Inc. * All rights reserved. diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 8f47450b17c3..6413d8aadd73 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 444bcb87064e..680904c97afb 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 7aff3874ad1b..c343460d3e32 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 Hudson River Trading LLC * Written by: John H. Baldwin <jhb@FreeBSD.org> diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index ec746b756b4f..29d6ec41c7e4 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, by Steve Passe * All rights reserved. diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c index b1cd1feb1160..c2ef66f997fe 100644 --- a/sys/x86/x86/mptable_pci.c +++ b/sys/x86/x86/mptable_pci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org> * diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 0dcee1967889..94305dfdc82f 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998-2003 Poul-Henning Kamp * All rights reserved. diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index d8beeed68215..1f62c7f60f04 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 The FreeBSD Foundation * diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 49051c702df7..135ad994da54 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008, 2013 Citrix Systems, Inc. * Copyright (c) 2012 Spectra Logic Corporation diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c index 5d5c265fcc5f..5ed03cd81673 100644 --- a/sys/x86/xen/pvcpu_enum.c +++ b/sys/x86/xen/pvcpu_enum.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com> * All rights reserved. |