From owner-svn-src-head@freebsd.org  Mon Nov 27 15:09:02 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 9E597E53CD8;
 Mon, 27 Nov 2017 15:09:02 +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 3B94B751E3;
 Mon, 27 Nov 2017 15:09:02 +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 vARF91Et096723;
 Mon, 27 Nov 2017 15:09:01 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF8qp0096624;
 Mon, 27 Nov 2017 15:08:52 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271508.vARF8qp0096624@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:08:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326260 - in head/sys/i386: acpica bios i386 ibcs2
 include include/pc isa linux pci
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/i386: acpica bios i386 ibcs2 include
 include/pc isa linux pci
X-SVN-Commit-Revision: 326260
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:09:02 -0000

Author: pfg
Date: Mon Nov 27 15:08:52 2017
New Revision: 326260
URL: https://svnweb.freebsd.org/changeset/base/326260

Log:
  sys/i386: 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/i386/acpica/acpi_machdep.c
  head/sys/i386/bios/smapi.c
  head/sys/i386/i386/atomic.c
  head/sys/i386/i386/bios.c
  head/sys/i386/i386/elf_machdep.c
  head/sys/i386/i386/gdb_machdep.c
  head/sys/i386/i386/geode.c
  head/sys/i386/i386/initcpu.c
  head/sys/i386/i386/io.c
  head/sys/i386/i386/k6_mem.c
  head/sys/i386/i386/minidump_machdep.c
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/ptrace_machdep.c
  head/sys/i386/i386/vm86.c
  head/sys/i386/ibcs2/coff.h
  head/sys/i386/ibcs2/ibcs2_dirent.h
  head/sys/i386/ibcs2/ibcs2_errno.c
  head/sys/i386/ibcs2/ibcs2_errno.h
  head/sys/i386/ibcs2/ibcs2_fcntl.c
  head/sys/i386/ibcs2/ibcs2_fcntl.h
  head/sys/i386/ibcs2/ibcs2_ioctl.c
  head/sys/i386/ibcs2/ibcs2_ipc.c
  head/sys/i386/ibcs2/ibcs2_ipc.h
  head/sys/i386/ibcs2/ibcs2_isc.c
  head/sys/i386/ibcs2/ibcs2_mount.h
  head/sys/i386/ibcs2/ibcs2_msg.c
  head/sys/i386/ibcs2/ibcs2_other.c
  head/sys/i386/ibcs2/ibcs2_signal.c
  head/sys/i386/ibcs2/ibcs2_signal.h
  head/sys/i386/ibcs2/ibcs2_socksys.c
  head/sys/i386/ibcs2/ibcs2_socksys.h
  head/sys/i386/ibcs2/ibcs2_stat.c
  head/sys/i386/ibcs2/ibcs2_stat.h
  head/sys/i386/ibcs2/ibcs2_statfs.h
  head/sys/i386/ibcs2/ibcs2_stropts.h
  head/sys/i386/ibcs2/ibcs2_sysi86.c
  head/sys/i386/ibcs2/ibcs2_sysvec.c
  head/sys/i386/ibcs2/ibcs2_termios.h
  head/sys/i386/ibcs2/ibcs2_time.h
  head/sys/i386/ibcs2/ibcs2_types.h
  head/sys/i386/ibcs2/ibcs2_unistd.h
  head/sys/i386/ibcs2/ibcs2_ustat.h
  head/sys/i386/ibcs2/ibcs2_util.c
  head/sys/i386/ibcs2/ibcs2_util.h
  head/sys/i386/ibcs2/ibcs2_utime.h
  head/sys/i386/ibcs2/ibcs2_utsname.h
  head/sys/i386/ibcs2/ibcs2_xenix.c
  head/sys/i386/ibcs2/imgact_coff.c
  head/sys/i386/include/_bus.h
  head/sys/i386/include/atomic.h
  head/sys/i386/include/bootinfo.h
  head/sys/i386/include/bus_dma.h
  head/sys/i386/include/counter.h
  head/sys/i386/include/cputypes.h
  head/sys/i386/include/elan_mmcr.h
  head/sys/i386/include/gdb_machdep.h
  head/sys/i386/include/if_wl_wavelan.h
  head/sys/i386/include/intr_machdep.h
  head/sys/i386/include/ioctl_bt848.h
  head/sys/i386/include/ioctl_meteor.h
  head/sys/i386/include/iodev.h
  head/sys/i386/include/kdb.h
  head/sys/i386/include/memdev.h
  head/sys/i386/include/minidump.h
  head/sys/i386/include/mp_watchdog.h
  head/sys/i386/include/pc/bios.h
  head/sys/i386/include/pcaudioio.h
  head/sys/i386/include/pcb_ext.h
  head/sys/i386/include/pcpu.h
  head/sys/i386/include/pmc_mdep.h
  head/sys/i386/include/ppireg.h
  head/sys/i386/include/runq.h
  head/sys/i386/include/sf_buf.h
  head/sys/i386/include/sigframe.h
  head/sys/i386/include/smapi.h
  head/sys/i386/include/timerreg.h
  head/sys/i386/include/ucontext.h
  head/sys/i386/include/vm.h
  head/sys/i386/include/vm86.h
  head/sys/i386/isa/ccbque.h
  head/sys/i386/isa/elink.c
  head/sys/i386/isa/elink.h
  head/sys/i386/isa/pmtimer.c
  head/sys/i386/isa/prof_machdep.c
  head/sys/i386/linux/imgact_linux.c
  head/sys/i386/linux/linux.h
  head/sys/i386/linux/linux_dummy.c
  head/sys/i386/linux/linux_machdep.c
  head/sys/i386/linux/linux_ptrace.c
  head/sys/i386/linux/linux_sysvec.c
  head/sys/i386/pci/pci_cfgreg.c
  head/sys/i386/pci/pci_pir.c

Modified: head/sys/i386/acpica/acpi_machdep.c
==============================================================================
--- head/sys/i386/acpica/acpi_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/acpica/acpi_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Mitsuru IWASAKI
  * All rights reserved.
  *

Modified: head/sys/i386/bios/smapi.c
==============================================================================
--- head/sys/i386/bios/smapi.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/bios/smapi.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -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/i386/i386/atomic.c
==============================================================================
--- head/sys/i386/i386/atomic.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/atomic.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Peter Jeremy
  * All rights reserved.
  *

Modified: head/sys/i386/i386/bios.c
==============================================================================
--- head/sys/i386/i386/bios.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/bios.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Michael Smith
  * Copyright (c) 1998 Jonathan Lemon
  * All rights reserved.

Modified: head/sys/i386/i386/elf_machdep.c
==============================================================================
--- head/sys/i386/i386/elf_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/elf_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/sys/i386/i386/gdb_machdep.c
==============================================================================
--- head/sys/i386/i386/gdb_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/gdb_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/i386/geode.c
==============================================================================
--- head/sys/i386/i386/geode.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/geode.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2004 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/i386/i386/initcpu.c
==============================================================================
--- head/sys/i386/i386/initcpu.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/initcpu.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) KATO Takenori, 1997, 1998.
  * 
  * All rights reserved.  Unpublished rights reserved under the copyright

Modified: head/sys/i386/i386/io.c
==============================================================================
--- head/sys/i386/i386/io.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/io.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Mark R V Murray
  * All rights reserved.
  *

Modified: head/sys/i386/i386/k6_mem.c
==============================================================================
--- head/sys/i386/i386/k6_mem.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/k6_mem.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Brian Fundakowski Feldman
  * All rights reserved.
  *

Modified: head/sys/i386/i386/minidump_machdep.c
==============================================================================
--- head/sys/i386/i386/minidump_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/minidump_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 Peter Wemm
  * All rights reserved.
  *

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/mp_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.
  *

Modified: head/sys/i386/i386/ptrace_machdep.c
==============================================================================
--- head/sys/i386/i386/ptrace_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/ptrace_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/i386/i386/vm86.c
==============================================================================
--- head/sys/i386/i386/vm86.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/i386/vm86.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Jonathan Lemon
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/coff.h
==============================================================================
--- head/sys/i386/ibcs2/coff.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/coff.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Sean Eric Fagan
  * Copyright (c) 1994 Søren Schmidt
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_dirent.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_dirent.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_dirent.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_errno.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_errno.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_errno.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,5 +1,7 @@
 /*-
  * ibcs2_errno.c
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_errno.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_errno.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_errno.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,5 +1,7 @@
 /*-
  * ibcs2_errno.h
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_fcntl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_fcntl.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_fcntl.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_fcntl.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_fcntl.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_fcntl.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_ioctl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ioctl.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_ioctl.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,6 +1,8 @@
 /*	$NetBSD: ibcs2_ioctl.c,v 1.6 1995/03/14 15:12:28 scottb Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 1994, 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_ipc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ipc.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_ipc.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1995 Scott Bartram
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_ipc.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ipc.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_ipc.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_isc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_isc.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_isc.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Søren Schmidt
  * Copyright (c) 1994 Sean Eric Fagan
  * Copyright (c) 1995 Steven Wallace

Modified: head/sys/i386/ibcs2/ibcs2_mount.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_mount.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_mount.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_msg.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_msg.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_msg.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_other.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_other.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_other.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_signal.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_signal.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_signal.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_signal.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_signal.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_signal.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,6 +1,8 @@
 /*	$NetBSD: ibcs2_signal.h,v 1.7 1995/08/14 02:26:01 mycroft Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994, 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_socksys.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_socksys.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_socksys.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1994, 1995 Scott Bartram
  * Copyright (c) 1994 Arne H Juul
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_socksys.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_socksys.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_socksys.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1994, 1995 Scott Bartram
  * Copyright (c) 1994 Arne H Juul
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_stat.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stat.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_stat.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_stat.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stat.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_stat.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_statfs.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_statfs.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_statfs.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_stropts.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stropts.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_stropts.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,5 +1,7 @@
 /*-
  * ibcs2_stropts.h
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_sysi86.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_sysi86.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_sysi86.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Søren Schmidt
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.

Modified: head/sys/i386/ibcs2/ibcs2_sysvec.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_sysvec.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_sysvec.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Steven Wallace
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_termios.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_termios.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_termios.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_time.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_time.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_time.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_types.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_types.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_types.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_unistd.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_unistd.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_unistd.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_ustat.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ustat.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_ustat.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_util.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_util.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_util.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Christos Zoulas
  * Copyright (c) 1995 Frank van der Linden
  * Copyright (c) 1995 Scott Bartram

Modified: head/sys/i386/ibcs2/ibcs2_util.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_util.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_util.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Christos Zoulas
  * Copyright (c) 1995 Frank van der Linden
  * Copyright (c) 1995 Scott Bartram

Modified: head/sys/i386/ibcs2/ibcs2_utime.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_utime.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_utime.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_utsname.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_utsname.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_utsname.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -2,6 +2,8 @@
 /* $FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Scott Bartram
  * All rights reserved.
  *

Modified: head/sys/i386/ibcs2/ibcs2_xenix.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_xenix.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/ibcs2_xenix.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Sean Eric Fagan
  * Copyright (c) 1994 Søren Schmidt
  * Copyright (c) 1995 Steven Wallace

Modified: head/sys/i386/ibcs2/imgact_coff.c
==============================================================================
--- head/sys/i386/ibcs2/imgact_coff.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/ibcs2/imgact_coff.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Sean Eric Fagan
  * Copyright (c) 1994 Søren Schmidt
  * All rights reserved.

Modified: head/sys/i386/include/_bus.h
==============================================================================
--- head/sys/i386/include/_bus.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/_bus.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 M. Warner Losh.
  * All rights reserved.
  *

Modified: head/sys/i386/include/atomic.h
==============================================================================
--- head/sys/i386/include/atomic.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/atomic.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/i386/include/bootinfo.h
==============================================================================
--- head/sys/i386/include/bootinfo.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/bootinfo.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon  97222
  * All rights reserved.
  *

Modified: head/sys/i386/include/bus_dma.h
==============================================================================
--- head/sys/i386/include/bus_dma.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/bus_dma.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Scott Long
  * All rights reserved.
  *

Modified: head/sys/i386/include/counter.h
==============================================================================
--- head/sys/i386/include/counter.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/counter.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/i386/include/cputypes.h
==============================================================================
--- head/sys/i386/include/cputypes.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/cputypes.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
  *

Modified: head/sys/i386/include/elan_mmcr.h
==============================================================================
--- head/sys/i386/include/elan_mmcr.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/elan_mmcr.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 John Birrell
  * All rights reserved.
  *

Modified: head/sys/i386/include/gdb_machdep.h
==============================================================================
--- head/sys/i386/include/gdb_machdep.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/gdb_machdep.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/include/if_wl_wavelan.h
==============================================================================
--- head/sys/i386/include/if_wl_wavelan.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/if_wl_wavelan.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,5 +1,7 @@
 /* $FreeBSD$ */
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

Modified: head/sys/i386/include/intr_machdep.h
==============================================================================
--- head/sys/i386/include/intr_machdep.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/intr_machdep.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -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/i386/include/ioctl_bt848.h
==============================================================================
--- head/sys/i386/include/ioctl_bt848.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/ioctl_bt848.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 David O'Brien
  * All rights reserved.
  *

Modified: head/sys/i386/include/ioctl_meteor.h
==============================================================================
--- head/sys/i386/include/ioctl_meteor.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/ioctl_meteor.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 David O'Brien
  * All rights reserved.
  *

Modified: head/sys/i386/include/iodev.h
==============================================================================
--- head/sys/i386/include/iodev.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/iodev.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Mark R V Murray
  * All rights reserved.
  *

Modified: head/sys/i386/include/kdb.h
==============================================================================
--- head/sys/i386/include/kdb.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/kdb.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/include/memdev.h
==============================================================================
--- head/sys/i386/include/memdev.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/memdev.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Mark R V Murray
  * All rights reserved.
  *

Modified: head/sys/i386/include/minidump.h
==============================================================================
--- head/sys/i386/include/minidump.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/minidump.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 Peter Wemm
  * All rights reserved.
  *

Modified: head/sys/i386/include/mp_watchdog.h
==============================================================================
--- head/sys/i386/include/mp_watchdog.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/mp_watchdog.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/i386/include/pc/bios.h
==============================================================================
--- head/sys/i386/include/pc/bios.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/pc/bios.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Michael Smith
  * Copyright (c) 1998 Jonathan Lemon
  * All rights reserved.

Modified: head/sys/i386/include/pcaudioio.h
==============================================================================
--- head/sys/i386/include/pcaudioio.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/pcaudioio.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/i386/include/pcb_ext.h
==============================================================================
--- head/sys/i386/include/pcb_ext.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/pcb_ext.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Jonathan Lemon
  * All rights reserved.
  *

Modified: head/sys/i386/include/pcpu.h
==============================================================================
--- head/sys/i386/include/pcpu.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/pcpu.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) Peter Wemm
  * All rights reserved.
  *

Modified: head/sys/i386/include/pmc_mdep.h
==============================================================================
--- head/sys/i386/include/pmc_mdep.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/pmc_mdep.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2005,2008 Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/i386/include/ppireg.h
==============================================================================
--- head/sys/i386/include/ppireg.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/ppireg.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/i386/include/runq.h
==============================================================================
--- head/sys/i386/include/runq.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/runq.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/i386/include/sf_buf.h
==============================================================================
--- head/sys/i386/include/sf_buf.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/sf_buf.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/i386/include/sigframe.h
==============================================================================
--- head/sys/i386/include/sigframe.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/sigframe.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/include/smapi.h
==============================================================================
--- head/sys/i386/include/smapi.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/smapi.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Matthew N. Dodd <winter@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/i386/include/timerreg.h
==============================================================================
--- head/sys/i386/include/timerreg.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/timerreg.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/i386/include/ucontext.h
==============================================================================
--- head/sys/i386/include/ucontext.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/ucontext.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/include/vm.h
==============================================================================
--- head/sys/i386/include/vm.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/vm.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -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/i386/include/vm86.h
==============================================================================
--- head/sys/i386/include/vm86.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/include/vm86.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Jonathan Lemon
  * All rights reserved.
  *

Modified: head/sys/i386/isa/ccbque.h
==============================================================================
--- head/sys/i386/isa/ccbque.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/isa/ccbque.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,5 +1,7 @@
 /*	$NetBSD$	*/
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * [NetBSD for NEC PC98 series]
  *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
  *  All rights reserved.

Modified: head/sys/i386/isa/elink.c
==============================================================================
--- head/sys/i386/isa/elink.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/isa/elink.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/i386/isa/elink.h
==============================================================================
--- head/sys/i386/isa/elink.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/isa/elink.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/i386/isa/pmtimer.c
==============================================================================
--- head/sys/i386/isa/pmtimer.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/isa/pmtimer.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/i386/isa/prof_machdep.c
==============================================================================
--- head/sys/i386/isa/prof_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/isa/prof_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996 Bruce D. Evans.
  * All rights reserved.
  *

Modified: head/sys/i386/linux/imgact_linux.c
==============================================================================
--- head/sys/i386/linux/imgact_linux.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/imgact_linux.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994-1996 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/linux.h	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994-1996 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/linux_dummy.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994-1995 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/i386/linux/linux_machdep.c
==============================================================================
--- head/sys/i386/linux/linux_machdep.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/linux_machdep.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2000 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/i386/linux/linux_ptrace.c
==============================================================================
--- head/sys/i386/linux/linux_ptrace.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/linux_ptrace.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2001 Alexander Kabaev
  * All rights reserved.
  *

Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/linux/linux_sysvec.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994-1996 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/i386/pci/pci_cfgreg.c
==============================================================================
--- head/sys/i386/pci/pci_cfgreg.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/pci/pci_cfgreg.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
  * Copyright (c) 2000, BSDi

Modified: head/sys/i386/pci/pci_pir.c
==============================================================================
--- head/sys/i386/pci/pci_pir.c	Mon Nov 27 15:07:26 2017	(r326259)
+++ head/sys/i386/pci/pci_pir.c	Mon Nov 27 15:08:52 2017	(r326260)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
  * Copyright (c) 2000, BSDi