From owner-svn-src-head@freebsd.org  Mon Nov 27 15:11:54 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 F3564E54005;
 Mon, 27 Nov 2017 15:11:54 +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 89DD475809;
 Mon, 27 Nov 2017 15:11:54 +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 vARFBrcT098929;
 Mon, 27 Nov 2017 15:11:53 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFBl92098865;
 Mon, 27 Nov 2017 15:11:47 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271511.vARFBl92098865@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: Mon, 27 Nov 2017 15:11:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326263 - in head/sys/x86: acpica bios cpufreq include
 iommu isa pci x86 xen
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/x86: acpica bios cpufreq include iommu isa pci
 x86 xen
X-SVN-Commit-Revision: 326263
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:11:55 -0000

Author: pfg
Date: Mon Nov 27 15:11:47 2017
New Revision: 326263
URL: https://svnweb.freebsd.org/changeset/base/326263

Log:
  sys/x86: further adoption of SPDX licensing ID tags.
  
  Mainly focus on files that use BSD 2-Clause license, however the tool I
  was using misidentified many licenses so this was mostly a manual - error
  prone - task.
  
  The Software Package Data Exchange (SPDX) group provides a specification
  to make it easier for automated tools to detect and summarize well known
  opensource licenses. We are gradually adopting the specification, noting
  that the tags are considered only advisory and do not, in any way,
  superceed or replace the license texts.

Modified:
  head/sys/x86/acpica/OsdEnvironment.c
  head/sys/x86/acpica/acpi_apm.c
  head/sys/x86/acpica/acpi_wakeup.c
  head/sys/x86/acpica/madt.c
  head/sys/x86/acpica/srat.c
  head/sys/x86/bios/smbios.c
  head/sys/x86/bios/vpd.c
  head/sys/x86/cpufreq/est.c
  head/sys/x86/cpufreq/hwpstate.c
  head/sys/x86/cpufreq/p4tcc.c
  head/sys/x86/cpufreq/powernow.c
  head/sys/x86/cpufreq/smist.c
  head/sys/x86/include/_inttypes.h
  head/sys/x86/include/_stdint.h
  head/sys/x86/include/acpica_machdep.h
  head/sys/x86/include/apicreg.h
  head/sys/x86/include/apicvar.h
  head/sys/x86/include/bus.h
  head/sys/x86/include/busdma_impl.h
  head/sys/x86/include/elf.h
  head/sys/x86/include/fdt.h
  head/sys/x86/include/init.h
  head/sys/x86/include/legacyvar.h
  head/sys/x86/include/mca.h
  head/sys/x86/include/mptable.h
  head/sys/x86/include/ofw_machdep.h
  head/sys/x86/include/pci_cfgreg.h
  head/sys/x86/include/sigframe.h
  head/sys/x86/include/ucontext.h
  head/sys/x86/include/vdso.h
  head/sys/x86/iommu/busdma_dmar.c
  head/sys/x86/iommu/busdma_dmar.h
  head/sys/x86/iommu/intel_ctx.c
  head/sys/x86/iommu/intel_dmar.h
  head/sys/x86/iommu/intel_drv.c
  head/sys/x86/iommu/intel_fault.c
  head/sys/x86/iommu/intel_gas.c
  head/sys/x86/iommu/intel_idpgtbl.c
  head/sys/x86/iommu/intel_qi.c
  head/sys/x86/iommu/intel_quirks.c
  head/sys/x86/iommu/intel_reg.h
  head/sys/x86/iommu/intel_utils.c
  head/sys/x86/isa/atpic.c
  head/sys/x86/isa/atrtc.c
  head/sys/x86/isa/elcr.c
  head/sys/x86/isa/isa.c
  head/sys/x86/isa/orm.c
  head/sys/x86/pci/pci_bus.c
  head/sys/x86/pci/qpi.c
  head/sys/x86/x86/busdma_bounce.c
  head/sys/x86/x86/busdma_machdep.c
  head/sys/x86/x86/dump_machdep.c
  head/sys/x86/x86/fdt_machdep.c
  head/sys/x86/x86/intr_machdep.c
  head/sys/x86/x86/io_apic.c
  head/sys/x86/x86/local_apic.c
  head/sys/x86/x86/mca.c
  head/sys/x86/x86/mptable.c
  head/sys/x86/x86/mptable_pci.c
  head/sys/x86/x86/tsc.c
  head/sys/x86/xen/hvm.c
  head/sys/x86/xen/pv.c
  head/sys/x86/xen/pvcpu_enum.c

Modified: head/sys/x86/acpica/OsdEnvironment.c
==============================================================================
--- head/sys/x86/acpica/OsdEnvironment.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/acpica/OsdEnvironment.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000,2001 Michael Smith
  * Copyright (c) 2000 BSDi
  * All rights reserved.

Modified: head/sys/x86/acpica/acpi_apm.c
==============================================================================
--- head/sys/x86/acpica/acpi_apm.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/acpica/acpi_apm.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Mitsuru IWASAKI
  * All rights reserved.
  *

Modified: head/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/x86/acpica/acpi_wakeup.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/acpica/acpi_wakeup.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * Copyright (c) 2003 Peter Wemm

Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/acpica/madt.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/acpica/srat.c
==============================================================================
--- head/sys/x86/acpica/srat.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/acpica/srat.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Hudson River Trading LLC
  * Written by: John H. Baldwin <jhb@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/x86/bios/smbios.c
==============================================================================
--- head/sys/x86/bios/smbios.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/bios/smbios.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
  * All rights reserved.
  *

Modified: head/sys/x86/bios/vpd.c
==============================================================================
--- head/sys/x86/bios/vpd.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/bios/vpd.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
  * All rights reserved.
  *

Modified: head/sys/x86/cpufreq/est.c
==============================================================================
--- head/sys/x86/cpufreq/est.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/cpufreq/est.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Colin Percival
  * Copyright (c) 2005 Nate Lawson
  * All rights reserved.

Modified: head/sys/x86/cpufreq/hwpstate.c
==============================================================================
--- head/sys/x86/cpufreq/hwpstate.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/cpufreq/hwpstate.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Nate Lawson
  * Copyright (c) 2004 Colin Percival
  * Copyright (c) 2004-2005 Bruno Durcot

Modified: head/sys/x86/cpufreq/p4tcc.c
==============================================================================
--- head/sys/x86/cpufreq/p4tcc.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/cpufreq/p4tcc.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Nate Lawson
  * All rights reserved.
  *

Modified: head/sys/x86/cpufreq/powernow.c
==============================================================================
--- head/sys/x86/cpufreq/powernow.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/cpufreq/powernow.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004-2005 Bruno Ducrot
  * Copyright (c) 2004 FUKUDA Nobuhiko <nfukuda@spa.is.uec.ac.jp>
  *

Modified: head/sys/x86/cpufreq/smist.c
==============================================================================
--- head/sys/x86/cpufreq/smist.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/cpufreq/smist.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Bruno Ducrot
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/x86/include/_inttypes.h
==============================================================================
--- head/sys/x86/include/_inttypes.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/_inttypes.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

Modified: head/sys/x86/include/_stdint.h
==============================================================================
--- head/sys/x86/include/_stdint.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/_stdint.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.

Modified: head/sys/x86/include/acpica_machdep.h
==============================================================================
--- head/sys/x86/include/acpica_machdep.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/acpica_machdep.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Mitsuru IWASAKI
  * All rights reserved.
  *

Modified: head/sys/x86/include/apicreg.h
==============================================================================
--- head/sys/x86/include/apicreg.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/apicreg.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996, by Peter Wemm and Steve Passe
  * All rights reserved.
  *

Modified: head/sys/x86/include/apicvar.h
==============================================================================
--- head/sys/x86/include/apicvar.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/apicvar.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/include/bus.h
==============================================================================
--- head/sys/x86/include/bus.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/bus.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-NetBSDE
+ *
  * Copyright (c) KATO Takenori, 1999.
  *
  * All rights reserved.  Unpublished rights reserved under the copyright

Modified: head/sys/x86/include/busdma_impl.h
==============================================================================
--- head/sys/x86/include/busdma_impl.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/busdma_impl.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/include/elf.h
==============================================================================
--- head/sys/x86/include/elf.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/elf.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996-1997 John D. Polstra.
  * All rights reserved.
  *

Modified: head/sys/x86/include/fdt.h
==============================================================================
--- head/sys/x86/include/fdt.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/fdt.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Juniper Networks, Inc.
  * All rights reserved.
  *

Modified: head/sys/x86/include/init.h
==============================================================================
--- head/sys/x86/include/init.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/init.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.
  *

Modified: head/sys/x86/include/legacyvar.h
==============================================================================
--- head/sys/x86/include/legacyvar.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/legacyvar.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/include/mca.h
==============================================================================
--- head/sys/x86/include/mca.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/mca.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Hudson River Trading LLC
  * Written by: John H. Baldwin <jhb@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/x86/include/mptable.h
==============================================================================
--- head/sys/x86/include/mptable.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/mptable.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.
  *

Modified: head/sys/x86/include/ofw_machdep.h
==============================================================================
--- head/sys/x86/include/ofw_machdep.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/ofw_machdep.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Juniper Networks, Inc.
  * All rights reserved.
  *

Modified: head/sys/x86/include/pci_cfgreg.h
==============================================================================
--- head/sys/x86/include/pci_cfgreg.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/pci_cfgreg.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/x86/include/sigframe.h
==============================================================================
--- head/sys/x86/include/sigframe.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/sigframe.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/x86/include/ucontext.h
==============================================================================
--- head/sys/x86/include/ucontext.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/ucontext.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2003 Peter Wemm
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.

Modified: head/sys/x86/include/vdso.h
==============================================================================
--- head/sys/x86/include/vdso.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/include/vdso.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
  * Copyright 2016 The FreeBSD Foundation.
  * All rights reserved.

Modified: head/sys/x86/iommu/busdma_dmar.c
==============================================================================
--- head/sys/x86/iommu/busdma_dmar.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/busdma_dmar.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/busdma_dmar.h
==============================================================================
--- head/sys/x86/iommu/busdma_dmar.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/busdma_dmar.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_ctx.c
==============================================================================
--- head/sys/x86/iommu/intel_ctx.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_ctx.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_dmar.h
==============================================================================
--- head/sys/x86/iommu/intel_dmar.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_dmar.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013-2015 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_drv.c
==============================================================================
--- head/sys/x86/iommu/intel_drv.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_drv.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013-2015 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_fault.c
==============================================================================
--- head/sys/x86/iommu/intel_fault.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_fault.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_gas.c
==============================================================================
--- head/sys/x86/iommu/intel_gas.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_gas.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_idpgtbl.c
==============================================================================
--- head/sys/x86/iommu/intel_idpgtbl.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_idpgtbl.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_qi.c
==============================================================================
--- head/sys/x86/iommu/intel_qi.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_qi.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_quirks.c
==============================================================================
--- head/sys/x86/iommu/intel_quirks.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_quirks.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013, 2015 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_reg.h
==============================================================================
--- head/sys/x86/iommu/intel_reg.h	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_reg.h	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013-2015 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/iommu/intel_utils.c
==============================================================================
--- head/sys/x86/iommu/intel_utils.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/iommu/intel_utils.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/x86/isa/atpic.c
==============================================================================
--- head/sys/x86/isa/atpic.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/isa/atpic.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/isa/atrtc.c
==============================================================================
--- head/sys/x86/isa/atrtc.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/isa/atrtc.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Poul-Henning Kamp
  * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/x86/isa/elcr.c
==============================================================================
--- head/sys/x86/isa/elcr.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/isa/elcr.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/isa/isa.c
==============================================================================
--- head/sys/x86/isa/isa.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/isa/isa.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ *
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/x86/isa/orm.c
==============================================================================
--- head/sys/x86/isa/orm.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/isa/orm.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Nikolai Saoukh
  * All rights reserved.
  *

Modified: head/sys/x86/pci/pci_bus.c
==============================================================================
--- head/sys/x86/pci/pci_bus.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/pci/pci_bus.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/x86/pci/qpi.c
==============================================================================
--- head/sys/x86/pci/qpi.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/pci/qpi.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Hudson River Trading LLC
  * Written by: John H. Baldwin <jhb@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/x86/x86/busdma_bounce.c
==============================================================================
--- head/sys/x86/x86/busdma_bounce.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/busdma_bounce.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/x86/x86/busdma_machdep.c
==============================================================================
--- head/sys/x86/x86/busdma_machdep.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/busdma_machdep.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/x86/x86/dump_machdep.c
==============================================================================
--- head/sys/x86/x86/dump_machdep.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/dump_machdep.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/x86/x86/fdt_machdep.c
==============================================================================
--- head/sys/x86/x86/fdt_machdep.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/fdt_machdep.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Juniper Networks, Inc.
  * All rights reserved.
  *

Modified: head/sys/x86/x86/intr_machdep.c
==============================================================================
--- head/sys/x86/x86/intr_machdep.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/intr_machdep.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/x86/io_apic.c
==============================================================================
--- head/sys/x86/x86/io_apic.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/io_apic.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/local_apic.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.

Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/mca.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Hudson River Trading LLC
  * Written by: John H. Baldwin <jhb@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/x86/x86/mptable.c
==============================================================================
--- head/sys/x86/x86/mptable.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/mptable.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.

Modified: head/sys/x86/x86/mptable_pci.c
==============================================================================
--- head/sys/x86/x86/mptable_pci.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/mptable_pci.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/x86/x86/tsc.c
==============================================================================
--- head/sys/x86/x86/tsc.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/x86/tsc.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998-2003 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/x86/xen/hvm.c
==============================================================================
--- head/sys/x86/xen/hvm.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/xen/hvm.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008, 2013 Citrix Systems, Inc.
  * Copyright (c) 2012 Spectra Logic Corporation
  * All rights reserved.

Modified: head/sys/x86/xen/pv.c
==============================================================================
--- head/sys/x86/xen/pv.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/xen/pv.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 2004 Christian Limpach.
  * Copyright (c) 2004-2006,2008 Kip Macy
  * Copyright (c) 2008 The NetBSD Foundation, Inc.

Modified: head/sys/x86/xen/pvcpu_enum.c
==============================================================================
--- head/sys/x86/xen/pvcpu_enum.c	Mon Nov 27 15:10:39 2017	(r326262)
+++ head/sys/x86/xen/pvcpu_enum.c	Mon Nov 27 15:11:47 2017	(r326263)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
  * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.