aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/cat.c2
-rw-r--r--bin/chflags/chflags.c2
-rw-r--r--bin/chmod/chmod.c2
-rw-r--r--bin/cp/cp.c2
-rw-r--r--bin/cp/extern.h2
-rw-r--r--bin/cp/utils.c2
-rw-r--r--bin/date/date.c2
-rw-r--r--bin/date/extern.h2
-rw-r--r--bin/date/netdate.c2
-rw-r--r--bin/dd/args.c2
-rw-r--r--bin/dd/conv.c2
-rw-r--r--bin/dd/conv_tab.c2
-rw-r--r--bin/dd/dd.c2
-rw-r--r--bin/dd/dd.h2
-rw-r--r--bin/dd/extern.h2
-rw-r--r--bin/dd/misc.c2
-rw-r--r--bin/dd/position.c2
-rw-r--r--bin/df/df.c2
-rw-r--r--bin/domainname/domainname.c2
-rw-r--r--bin/echo/echo.c2
-rw-r--r--bin/ed/cbc.c2
-rw-r--r--bin/hostname/hostname.c2
-rw-r--r--bin/kill/kill.c2
-rw-r--r--bin/ln/ln.c2
-rw-r--r--bin/ls/cmp.c2
-rw-r--r--bin/ls/extern.h2
-rw-r--r--bin/ls/ls.c2
-rw-r--r--bin/ls/ls.h2
-rw-r--r--bin/ls/print.c2
-rw-r--r--bin/ls/util.c2
-rw-r--r--bin/mkdir/mkdir.c2
-rw-r--r--bin/mv/mv.c2
-rw-r--r--bin/pax/ar_io.c2
-rw-r--r--bin/pax/ar_subs.c2
-rw-r--r--bin/pax/buf_subs.c2
-rw-r--r--bin/pax/cache.c2
-rw-r--r--bin/pax/cache.h2
-rw-r--r--bin/pax/cpio.c2
-rw-r--r--bin/pax/cpio.h2
-rw-r--r--bin/pax/extern.h2
-rw-r--r--bin/pax/file_subs.c2
-rw-r--r--bin/pax/ftree.c2
-rw-r--r--bin/pax/ftree.h2
-rw-r--r--bin/pax/gen_subs.c2
-rw-r--r--bin/pax/options.c2
-rw-r--r--bin/pax/options.h2
-rw-r--r--bin/pax/pat_rep.c2
-rw-r--r--bin/pax/pat_rep.h2
-rw-r--r--bin/pax/pax.c2
-rw-r--r--bin/pax/pax.h2
-rw-r--r--bin/pax/sel_subs.c2
-rw-r--r--bin/pax/sel_subs.h2
-rw-r--r--bin/pax/tables.c2
-rw-r--r--bin/pax/tables.h2
-rw-r--r--bin/pax/tar.c2
-rw-r--r--bin/pax/tar.h2
-rw-r--r--bin/pax/tty_subs.c2
-rw-r--r--bin/ps/extern.h2
-rw-r--r--bin/ps/fmt.c2
-rw-r--r--bin/ps/keyword.c2
-rw-r--r--bin/ps/nlist.c2
-rw-r--r--bin/ps/print.c2
-rw-r--r--bin/ps/ps.c2
-rw-r--r--bin/ps/ps.h2
-rw-r--r--bin/pwd/pwd.c2
-rw-r--r--bin/realpath/realpath.c2
-rw-r--r--bin/rm/rm.c2
-rw-r--r--bin/rmdir/rmdir.c2
-rw-r--r--bin/sh/bltin/bltin.h2
-rw-r--r--bin/sh/bltin/echo.c2
-rw-r--r--bin/sh/mail.h2
-rw-r--r--bin/sh/main.c2
-rw-r--r--bin/sh/main.h2
-rw-r--r--bin/sh/memalloc.c2
-rw-r--r--bin/sh/memalloc.h2
-rw-r--r--bin/sh/miscbltin.c2
-rw-r--r--bin/sh/mknodes.c2
-rw-r--r--bin/sh/mksyntax.c2
-rw-r--r--bin/sh/myhistedit.h2
-rw-r--r--bin/sh/mystring.c2
-rw-r--r--bin/sh/mystring.h2
-rw-r--r--bin/sh/options.c2
-rw-r--r--bin/sh/options.h2
-rw-r--r--bin/sh/output.c2
-rw-r--r--bin/sh/output.h2
-rw-r--r--bin/sh/parser.c2
-rw-r--r--bin/sh/parser.h2
-rw-r--r--bin/sh/redir.c2
-rw-r--r--bin/sh/redir.h2
-rw-r--r--bin/sh/shell.h2
-rw-r--r--bin/sh/show.c2
-rw-r--r--bin/sh/show.h2
-rw-r--r--bin/sh/trap.c2
-rw-r--r--bin/sh/trap.h2
-rw-r--r--bin/sh/var.c2
-rw-r--r--bin/sh/var.h2
-rw-r--r--include/_ctype.h4
-rw-r--r--include/a.out.h2
-rw-r--r--include/ar.h2
-rw-r--r--include/arpa/ftp.h4
-rw-r--r--include/arpa/inet.h4
-rw-r--r--include/arpa/nameser.h4
-rw-r--r--include/arpa/nameser_compat.h5
-rw-r--r--include/arpa/telnet.h4
-rw-r--r--include/arpa/tftp.h4
-rw-r--r--include/assert.h2
-rw-r--r--include/bitstring.h2
-rw-r--r--include/complex.h2
-rw-r--r--include/cpio.h2
-rw-r--r--include/ctype.h4
-rw-r--r--include/db.h2
-rw-r--r--include/dirent.h2
-rw-r--r--include/dlfcn.h2
-rw-r--r--include/elf-hints.h2
-rw-r--r--include/elf.h2
-rw-r--r--include/err.h2
-rw-r--r--include/fmtmsg.h2
-rw-r--r--include/fnmatch.h2
-rw-r--r--include/fstab.h4
-rw-r--r--include/fts.h4
-rw-r--r--include/getopt.h2
-rw-r--r--include/glob.h4
-rw-r--r--include/grp.h2
-rw-r--r--include/hesiod.h2
-rw-r--r--include/iconv.h2
-rw-r--r--include/inttypes.h2
-rw-r--r--include/iso646.h2
-rw-r--r--include/kenv.h2
-rw-r--r--include/langinfo.h2
-rw-r--r--include/libgen.h4
-rw-r--r--include/limits.h2
-rw-r--r--include/link.h4
-rw-r--r--include/locale.h4
-rw-r--r--include/malloc_np.h2
-rw-r--r--include/memory.h4
-rwxr-xr-xinclude/mk-osreldate.sh2
-rw-r--r--include/monetary.h2
-rw-r--r--include/mpool.h2
-rw-r--r--include/mqueue.h2
-rw-r--r--include/ndbm.h2
-rw-r--r--include/netdb.h2
-rw-r--r--include/nl_types.h2
-rw-r--r--include/nlist.h2
-rw-r--r--include/nss.h2
-rw-r--r--include/nsswitch.h2
-rw-r--r--include/paths.h4
-rw-r--r--include/printf.h2
-rw-r--r--include/proc_service.h4
-rw-r--r--include/protocols/dumprestore.h4
-rw-r--r--include/protocols/routed.h2
-rw-r--r--include/protocols/rwhod.h4
-rw-r--r--include/protocols/talkd.h4
-rw-r--r--include/protocols/timed.h4
-rw-r--r--include/pthread.h4
-rw-r--r--include/pthread_np.h4
-rw-r--r--include/pwd.h2
-rw-r--r--include/ranlib.h2
-rw-r--r--include/regex.h2
-rw-r--r--include/resolv.h4
-rw-r--r--include/rpc/auth.h2
-rw-r--r--include/rpc/auth_des.h2
-rw-r--r--include/rpc/auth_kerb.h2
-rw-r--r--include/rpc/auth_unix.h2
-rw-r--r--include/rpc/clnt.h2
-rw-r--r--include/rpc/clnt_soc.h2
-rw-r--r--include/rpc/des.h2
-rw-r--r--include/rpc/des_crypt.h2
-rw-r--r--include/rpc/nettype.h2
-rw-r--r--include/rpc/pmap_clnt.h2
-rw-r--r--include/rpc/pmap_prot.h2
-rw-r--r--include/rpc/pmap_rmt.h2
-rw-r--r--include/rpc/raw.h2
-rw-r--r--include/rpc/rpc.h2
-rw-r--r--include/rpc/rpc_com.h2
-rw-r--r--include/rpc/rpc_msg.h2
-rw-r--r--include/rpc/rpcb_clnt.h2
-rw-r--r--include/rpc/rpcent.h2
-rw-r--r--include/rpc/rpcsec_gss.h2
-rw-r--r--include/rpc/svc.h2
-rw-r--r--include/rpc/svc_auth.h2
-rw-r--r--include/rpc/svc_dg.h2
-rw-r--r--include/rpc/svc_soc.h2
-rw-r--r--include/rpc/xdr.h2
-rw-r--r--include/rpcsvc/nis_tags.h2
-rw-r--r--include/rpcsvc/yp_prot.h4
-rw-r--r--include/rpcsvc/ypclnt.h4
-rw-r--r--include/runetype.h2
-rw-r--r--include/semaphore.h4
-rw-r--r--include/setjmp.h2
-rw-r--r--include/signal.h2
-rw-r--r--include/spawn.h2
-rw-r--r--include/stab.h2
-rw-r--r--include/stdalign.h2
-rw-r--r--include/stdbool.h2
-rw-r--r--include/stddef.h2
-rw-r--r--include/stdio.h2
-rw-r--r--include/stdlib.h2
-rw-r--r--include/stdnoreturn.h2
-rw-r--r--include/string.h2
-rw-r--r--include/stringlist.h4
-rw-r--r--include/strings.h2
-rw-r--r--include/sysexits.h4
-rw-r--r--include/tar.h2
-rw-r--r--include/termios.h2
-rw-r--r--include/tgmath.h2
-rw-r--r--include/time.h4
-rw-r--r--include/timeconv.h4
-rw-r--r--include/timers.h2
-rw-r--r--include/ttyent.h4
-rw-r--r--include/uchar.h2
-rw-r--r--include/ulimit.h2
-rw-r--r--include/unistd.h2
-rw-r--r--include/utime.h2
-rw-r--r--include/utmpx.h2
-rw-r--r--include/uuid.h2
-rw-r--r--include/varargs.h2
-rw-r--r--include/wchar.h2
-rw-r--r--include/wctype.h2
-rw-r--r--include/wordexp.h2
-rw-r--r--include/xlocale.h2
-rw-r--r--include/xlocale/_ctype.h2
-rw-r--r--include/xlocale/_inttypes.h2
-rw-r--r--include/xlocale/_langinfo.h2
-rw-r--r--include/xlocale/_locale.h2
-rw-r--r--include/xlocale/_monetary.h2
-rw-r--r--include/xlocale/_stdio.h2
-rw-r--r--include/xlocale/_stdlib.h2
-rw-r--r--include/xlocale/_string.h2
-rw-r--r--include/xlocale/_time.h2
-rw-r--r--include/xlocale/_uchar.h2
-rw-r--r--include/xlocale/_wchar.h2
-rw-r--r--lib/csu/amd64/crt1.c2
-rw-r--r--lib/csu/arm/crt1.c2
-rw-r--r--lib/csu/common/crtbrand.c2
-rw-r--r--lib/csu/common/ignore_init.c2
-rw-r--r--lib/csu/common/notes.h2
-rw-r--r--lib/csu/mips/crt1.c2
-rw-r--r--lib/csu/powerpc/crt1.c2
-rw-r--r--lib/csu/powerpc64/crt1.c2
-rw-r--r--lib/csu/sparc64/crt1.c2
-rw-r--r--lib/libarchive/config_freebsd.h2
-rw-r--r--lib/libbluetooth/bluetooth.c2
-rw-r--r--lib/libbluetooth/bluetooth.h2
-rw-r--r--lib/libbluetooth/dev.c2
-rw-r--r--lib/libbluetooth/hci.c2
-rw-r--r--lib/libbsdstat/bsdstat.c2
-rw-r--r--lib/libbsdstat/bsdstat.h2
-rw-r--r--lib/libc/amd64/SYS.h2
-rw-r--r--lib/libc/amd64/_fpmath.h2
-rw-r--r--lib/libc/amd64/gen/_set_tp.c2
-rw-r--r--lib/libc/amd64/gen/getcontextx.c4
-rw-r--r--lib/libc/amd64/gen/makecontext.c4
-rw-r--r--lib/libc/amd64/gen/signalcontext.c4
-rw-r--r--lib/libc/amd64/string/strcpy.c4
-rw-r--r--lib/libc/amd64/sys/amd64_get_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_get_gsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_gsbase.c2
-rw-r--r--lib/libc/arm/SYS.h2
-rw-r--r--lib/libc/arm/_fpmath.h2
-rw-r--r--lib/libc/arm/aeabi/aeabi_atexit.c4
-rw-r--r--lib/libc/arm/aeabi/aeabi_double.c4
-rw-r--r--lib/libc/arm/aeabi/aeabi_float.c4
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_cpp.c4
-rw-r--r--lib/libc/arm/gen/_set_tp.c2
-rw-r--r--lib/libc/arm/gen/arm_initfini.c2
-rw-r--r--lib/libc/arm/gen/fabs.c4
-rw-r--r--lib/libc/arm/gen/flt_rounds.c2
-rw-r--r--lib/libc/arm/gen/getcontextx.c4
-rw-r--r--lib/libc/arm/gen/makecontext.c2
-rw-r--r--lib/libc/arm/gen/signalcontext.c2
-rw-r--r--lib/libc/arm/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/compat-43/creat.c4
-rw-r--r--lib/libc/compat-43/gethostid.c4
-rw-r--r--lib/libc/compat-43/getwd.c2
-rw-r--r--lib/libc/compat-43/killpg.c4
-rw-r--r--lib/libc/compat-43/sethostid.c4
-rw-r--r--lib/libc/compat-43/setpgrp.c2
-rw-r--r--lib/libc/compat-43/setrgid.c4
-rw-r--r--lib/libc/compat-43/setruid.c4
-rw-r--r--lib/libc/compat-43/sigcompat.c4
-rw-r--r--lib/libc/db/btree/bt_close.c2
-rw-r--r--lib/libc/db/btree/bt_conv.c2
-rw-r--r--lib/libc/db/btree/bt_debug.c2
-rw-r--r--lib/libc/db/btree/bt_delete.c2
-rw-r--r--lib/libc/db/btree/bt_get.c2
-rw-r--r--lib/libc/db/btree/bt_open.c2
-rw-r--r--lib/libc/db/btree/bt_overflow.c2
-rw-r--r--lib/libc/db/btree/bt_page.c2
-rw-r--r--lib/libc/db/btree/bt_put.c2
-rw-r--r--lib/libc/db/btree/bt_search.c2
-rw-r--r--lib/libc/db/btree/bt_seq.c2
-rw-r--r--lib/libc/db/btree/bt_split.c2
-rw-r--r--lib/libc/db/btree/bt_utils.c2
-rw-r--r--lib/libc/db/btree/btree.h2
-rw-r--r--lib/libc/db/btree/extern.h2
-rw-r--r--lib/libc/db/db/db.c2
-rw-r--r--lib/libc/db/hash/extern.h2
-rw-r--r--lib/libc/db/hash/hash.c2
-rw-r--r--lib/libc/db/hash/hash.h2
-rw-r--r--lib/libc/db/hash/hash_bigkey.c2
-rw-r--r--lib/libc/db/hash/hash_buf.c2
-rw-r--r--lib/libc/db/hash/hash_func.c2
-rw-r--r--lib/libc/db/hash/hash_log2.c2
-rw-r--r--lib/libc/db/hash/hash_page.c2
-rw-r--r--lib/libc/db/hash/ndbm.c2
-rw-r--r--lib/libc/db/hash/page.h2
-rw-r--r--lib/libc/db/mpool/mpool-compat.c2
-rw-r--r--lib/libc/db/mpool/mpool.c2
-rw-r--r--lib/libc/db/recno/extern.h2
-rw-r--r--lib/libc/db/recno/rec_close.c2
-rw-r--r--lib/libc/db/recno/rec_delete.c2
-rw-r--r--lib/libc/db/recno/rec_get.c2
-rw-r--r--lib/libc/db/recno/rec_open.c2
-rw-r--r--lib/libc/db/recno/rec_put.c2
-rw-r--r--lib/libc/db/recno/rec_search.c2
-rw-r--r--lib/libc/db/recno/rec_seq.c2
-rw-r--r--lib/libc/db/recno/rec_utils.c2
-rw-r--r--lib/libc/db/recno/recno.h2
-rw-r--r--lib/libc/db/test/btree.tests/main.c2
-rw-r--r--lib/libc/db/test/dbtest.c2
-rw-r--r--lib/libc/db/test/hash.tests/driver2.c2
-rw-r--r--lib/libc/db/test/hash.tests/tcreat3.c2
-rw-r--r--lib/libc/db/test/hash.tests/tdel.c2
-rw-r--r--lib/libc/db/test/hash.tests/thash4.c2
-rw-r--r--lib/libc/db/test/hash.tests/tread2.c2
-rw-r--r--lib/libc/db/test/hash.tests/tseq.c2
-rw-r--r--lib/libc/db/test/hash.tests/tverify.c2
-rw-r--r--lib/libc/gdtoa/_hdtoa.c2
-rw-r--r--lib/libc/gdtoa/_hldtoa.c2
-rw-r--r--lib/libc/gdtoa/_ldtoa.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisQ.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisd.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisx.c2
-rw-r--r--lib/libc/gen/__getosreldate.c2
-rw-r--r--lib/libc/gen/__xuname.c2
-rw-r--r--lib/libc/gen/_once_stub.c2
-rw-r--r--lib/libc/gen/_pthread_stubs.c4
-rw-r--r--lib/libc/gen/_spinlock_stub.c4
-rw-r--r--lib/libc/gen/_thread_init.c4
-rw-r--r--lib/libc/gen/alarm.c4
-rw-r--r--lib/libc/gen/assert.c2
-rw-r--r--lib/libc/gen/auxv.c2
-rw-r--r--lib/libc/gen/cap_sandboxed.c2
-rw-r--r--lib/libc/gen/clock.c4
-rw-r--r--lib/libc/gen/clock_getcpuclockid.c4
-rw-r--r--lib/libc/gen/closedir.c4
-rw-r--r--lib/libc/gen/confstr.c2
-rw-r--r--lib/libc/gen/crypt.c4
-rw-r--r--lib/libc/gen/ctermid.c2
-rw-r--r--lib/libc/gen/daemon.c2
-rw-r--r--lib/libc/gen/devname.c4
-rw-r--r--lib/libc/gen/dirfd.c2
-rw-r--r--lib/libc/gen/disklabel.c4
-rw-r--r--lib/libc/gen/dlfcn.c2
-rw-r--r--lib/libc/gen/dup3.c2
-rw-r--r--lib/libc/gen/elf_utils.c4
-rw-r--r--lib/libc/gen/err.c2
-rw-r--r--lib/libc/gen/errlst.c4
-rw-r--r--lib/libc/gen/errno.c2
-rw-r--r--lib/libc/gen/exec.c2
-rw-r--r--lib/libc/gen/fdevname.c2
-rw-r--r--lib/libc/gen/feature_present.c2
-rw-r--r--lib/libc/gen/fmtcheck.c2
-rw-r--r--lib/libc/gen/fmtmsg.c2
-rw-r--r--lib/libc/gen/fnmatch.c4
-rw-r--r--lib/libc/gen/fpclassify.c2
-rw-r--r--lib/libc/gen/frexp.c2
-rw-r--r--lib/libc/gen/fstab.c4
-rw-r--r--lib/libc/gen/ftok.c4
-rw-r--r--lib/libc/gen/fts-compat.c2
-rw-r--r--lib/libc/gen/fts-compat.h4
-rw-r--r--lib/libc/gen/fts.c2
-rw-r--r--lib/libc/gen/gen-private.h2
-rw-r--r--lib/libc/gen/getbootfile.c4
-rw-r--r--lib/libc/gen/getbsize.c2
-rw-r--r--lib/libc/gen/getcap.c2
-rw-r--r--lib/libc/gen/getcwd.c4
-rw-r--r--lib/libc/gen/getdomainname.c4
-rw-r--r--lib/libc/gen/getgrent.c2
-rw-r--r--lib/libc/gen/getgrouplist.c2
-rw-r--r--lib/libc/gen/gethostname.c4
-rw-r--r--lib/libc/gen/getloadavg.c2
-rw-r--r--lib/libc/gen/getlogin.c4
-rw-r--r--lib/libc/gen/getmntinfo.c4
-rw-r--r--lib/libc/gen/getnetgrent.c4
-rw-r--r--lib/libc/gen/getosreldate.c4
-rw-r--r--lib/libc/gen/getpagesize.c4
-rw-r--r--lib/libc/gen/getpagesizes.c2
-rw-r--r--lib/libc/gen/getpeereid.c4
-rw-r--r--lib/libc/gen/getpwent.c2
-rw-r--r--lib/libc/gen/getttyent.c4
-rw-r--r--lib/libc/gen/getusershell.c4
-rw-r--r--lib/libc/gen/getutxent.c2
-rw-r--r--lib/libc/gen/getvfsbyname.c4
-rw-r--r--lib/libc/gen/glob.c4
-rw-r--r--lib/libc/gen/initgroups.c4
-rw-r--r--lib/libc/gen/isatty.c4
-rw-r--r--lib/libc/gen/isinf.c2
-rw-r--r--lib/libc/gen/isnan.c2
-rw-r--r--lib/libc/gen/libc_dlopen.c2
-rw-r--r--lib/libc/gen/lockf.c2
-rw-r--r--lib/libc/gen/nice.c4
-rw-r--r--lib/libc/gen/nlist.c4
-rw-r--r--lib/libc/gen/opendir.c2
-rw-r--r--lib/libc/gen/pause.c4
-rw-r--r--lib/libc/gen/popen.c4
-rw-r--r--lib/libc/gen/posix_spawn.c2
-rw-r--r--lib/libc/gen/psignal.c4
-rw-r--r--lib/libc/gen/pututxline.c2
-rw-r--r--lib/libc/gen/pw_scan.c2
-rw-r--r--lib/libc/gen/pw_scan.h2
-rw-r--r--lib/libc/gen/raise.c2
-rw-r--r--lib/libc/gen/readdir.c4
-rw-r--r--lib/libc/gen/rewinddir.c2
-rw-r--r--lib/libc/gen/scandir.c4
-rw-r--r--lib/libc/gen/seekdir.c4
-rw-r--r--lib/libc/gen/sem.c4
-rw-r--r--lib/libc/gen/sem_new.c4
-rw-r--r--lib/libc/gen/semctl.c2
-rw-r--r--lib/libc/gen/setdomainname.c4
-rw-r--r--lib/libc/gen/sethostname.c4
-rw-r--r--lib/libc/gen/setjmperr.c4
-rw-r--r--lib/libc/gen/setmode.c4
-rw-r--r--lib/libc/gen/siginterrupt.c4
-rw-r--r--lib/libc/gen/siglist.c4
-rw-r--r--lib/libc/gen/signal.c4
-rw-r--r--lib/libc/gen/sigsetops.c2
-rw-r--r--lib/libc/gen/sleep.c4
-rw-r--r--lib/libc/gen/stringlist.c4
-rw-r--r--lib/libc/gen/strtofflags.c2
-rw-r--r--lib/libc/gen/sysconf.c2
-rw-r--r--lib/libc/gen/sysctl.c2
-rw-r--r--lib/libc/gen/sysctlnametomib.c4
-rw-r--r--lib/libc/gen/syslog.c4
-rw-r--r--lib/libc/gen/telldir.c4
-rw-r--r--lib/libc/gen/telldir.h4
-rw-r--r--lib/libc/gen/termios.c2
-rw-r--r--lib/libc/gen/time.c4
-rw-r--r--lib/libc/gen/times.c2
-rw-r--r--lib/libc/gen/timezone.c4
-rw-r--r--lib/libc/gen/tls.c2
-rw-r--r--lib/libc/gen/ttyname.c4
-rw-r--r--lib/libc/gen/ttyslot.c4
-rw-r--r--lib/libc/gen/ualarm.c4
-rw-r--r--lib/libc/gen/ulimit.c2
-rw-r--r--lib/libc/gen/uname.c2
-rw-r--r--lib/libc/gen/unvis-compat.c2
-rw-r--r--lib/libc/gen/usleep.c4
-rw-r--r--lib/libc/gen/utime.c2
-rw-r--r--lib/libc/gen/utxdb.c2
-rw-r--r--lib/libc/gen/utxdb.h2
-rw-r--r--lib/libc/gen/valloc.c4
-rw-r--r--lib/libc/gen/wait.c4
-rw-r--r--lib/libc/gen/wait3.c4
-rw-r--r--lib/libc/gen/waitid.c2
-rw-r--r--lib/libc/gen/waitpid.c4
-rw-r--r--lib/libc/gen/wordexp.c2
-rw-r--r--lib/libc/gmon/gmon.c2
-rw-r--r--lib/libc/gmon/mcount.c2
-rw-r--r--lib/libc/i386/SYS.h2
-rw-r--r--lib/libc/i386/_fpmath.h2
-rw-r--r--lib/libc/i386/gen/_set_tp.c2
-rw-r--r--lib/libc/i386/gen/getcontextx.c4
-rw-r--r--lib/libc/i386/gen/makecontext.c4
-rw-r--r--lib/libc/i386/gen/signalcontext.c2
-rw-r--r--lib/libc/i386/sys/i386_clr_watch.c4
-rw-r--r--lib/libc/i386/sys/i386_get_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_get_ldt.c4
-rw-r--r--lib/libc/i386/sys/i386_set_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_set_ldt.c4
-rw-r--r--lib/libc/i386/sys/i386_set_watch.c4
-rw-r--r--lib/libc/i386/sys/i386_vm86.c2
-rw-r--r--lib/libc/iconv/__iconv.c2
-rw-r--r--lib/libc/iconv/__iconv_free_list.c2
-rw-r--r--lib/libc/iconv/__iconv_get_list.c2
-rw-r--r--lib/libc/iconv/_strtol.h2
-rw-r--r--lib/libc/iconv/_strtoul.h2
-rw-r--r--lib/libc/iconv/bsd_iconv.c2
-rw-r--r--lib/libc/iconv/citrus_aliasname_local.h2
-rw-r--r--lib/libc/iconv/citrus_bcs.c2
-rw-r--r--lib/libc/iconv/citrus_bcs.h2
-rw-r--r--lib/libc/iconv/citrus_bcs_strtol.c2
-rw-r--r--lib/libc/iconv/citrus_bcs_strtoul.c2
-rw-r--r--lib/libc/iconv/citrus_csmapper.c2
-rw-r--r--lib/libc/iconv/citrus_csmapper.h2
-rw-r--r--lib/libc/iconv/citrus_db.c2
-rw-r--r--lib/libc/iconv/citrus_db.h2
-rw-r--r--lib/libc/iconv/citrus_db_factory.c2
-rw-r--r--lib/libc/iconv/citrus_db_factory.h2
-rw-r--r--lib/libc/iconv/citrus_db_file.h2
-rw-r--r--lib/libc/iconv/citrus_db_hash.c2
-rw-r--r--lib/libc/iconv/citrus_db_hash.h2
-rw-r--r--lib/libc/iconv/citrus_esdb.c2
-rw-r--r--lib/libc/iconv/citrus_esdb.h2
-rw-r--r--lib/libc/iconv/citrus_esdb_file.h2
-rw-r--r--lib/libc/iconv/citrus_fix_grouping.h2
-rw-r--r--lib/libc/iconv/citrus_hash.c2
-rw-r--r--lib/libc/iconv/citrus_hash.h2
-rw-r--r--lib/libc/iconv/citrus_iconv.c2
-rw-r--r--lib/libc/iconv/citrus_iconv.h2
-rw-r--r--lib/libc/iconv/citrus_iconv_local.h2
-rw-r--r--lib/libc/iconv/citrus_lock.h2
-rw-r--r--lib/libc/iconv/citrus_lookup.c2
-rw-r--r--lib/libc/iconv/citrus_lookup.h2
-rw-r--r--lib/libc/iconv/citrus_lookup_factory.c2
-rw-r--r--lib/libc/iconv/citrus_lookup_factory.h2
-rw-r--r--lib/libc/iconv/citrus_lookup_file.h2
-rw-r--r--lib/libc/iconv/citrus_mapper.c2
-rw-r--r--lib/libc/iconv/citrus_mapper.h2
-rw-r--r--lib/libc/iconv/citrus_mapper_local.h2
-rw-r--r--lib/libc/iconv/citrus_memstream.c2
-rw-r--r--lib/libc/iconv/citrus_memstream.h2
-rw-r--r--lib/libc/iconv/citrus_mmap.c2
-rw-r--r--lib/libc/iconv/citrus_mmap.h2
-rw-r--r--lib/libc/iconv/citrus_module.c2
-rw-r--r--lib/libc/iconv/citrus_module.h2
-rw-r--r--lib/libc/iconv/citrus_namespace.h2
-rw-r--r--lib/libc/iconv/citrus_none.c2
-rw-r--r--lib/libc/iconv/citrus_none.h2
-rw-r--r--lib/libc/iconv/citrus_pivot_factory.c2
-rw-r--r--lib/libc/iconv/citrus_pivot_factory.h2
-rw-r--r--lib/libc/iconv/citrus_pivot_file.h2
-rw-r--r--lib/libc/iconv/citrus_prop.c2
-rw-r--r--lib/libc/iconv/citrus_prop.h2
-rw-r--r--lib/libc/iconv/citrus_region.h2
-rw-r--r--lib/libc/iconv/citrus_stdenc.c2
-rw-r--r--lib/libc/iconv/citrus_stdenc.h2
-rw-r--r--lib/libc/iconv/citrus_stdenc_local.h2
-rw-r--r--lib/libc/iconv/citrus_stdenc_template.h2
-rw-r--r--lib/libc/iconv/citrus_types.h2
-rw-r--r--lib/libc/iconv/iconv-internal.h2
-rw-r--r--lib/libc/iconv/iconv.c2
-rw-r--r--lib/libc/iconv/iconv_canonicalize.c2
-rw-r--r--lib/libc/iconv/iconv_close.c2
-rw-r--r--lib/libc/iconv/iconv_compat.c2
-rw-r--r--lib/libc/iconv/iconv_open.c2
-rw-r--r--lib/libc/iconv/iconv_open_into.c2
-rw-r--r--lib/libc/iconv/iconv_set_relocation_prefix.c2
-rw-r--r--lib/libc/iconv/iconvctl.c2
-rw-r--r--lib/libc/iconv/iconvlist.c2
-rw-r--r--lib/libc/include/compat.h2
-rw-r--r--lib/libc/include/errlst.h2
-rw-r--r--lib/libc/include/fpmath.h2
-rw-r--r--lib/libc/include/libc_private.h4
-rw-r--r--lib/libc/include/namespace.h4
-rw-r--r--lib/libc/include/nscache.h2
-rw-r--r--lib/libc/include/nscachedcli.h2
-rw-r--r--lib/libc/include/nss_tls.h2
-rw-r--r--lib/libc/include/reentrant.h2
-rw-r--r--lib/libc/include/spinlock.h4
-rw-r--r--lib/libc/include/un-namespace.h4
-rw-r--r--lib/libc/inet/inet_addr.c4
-rw-r--r--lib/libc/inet/inet_lnaof.c4
-rw-r--r--lib/libc/inet/inet_makeaddr.c4
-rw-r--r--lib/libc/inet/inet_netof.c4
-rw-r--r--lib/libc/inet/inet_network.c4
-rw-r--r--lib/libc/inet/inet_ntoa.c2
-rw-r--r--lib/libc/locale/ascii.c2
-rw-r--r--lib/libc/locale/btowc.c2
-rw-r--r--lib/libc/locale/c16rtomb.c2
-rw-r--r--lib/libc/locale/c32rtomb.c2
-rw-r--r--lib/libc/locale/cXXrtomb_iconv.h2
-rw-r--r--lib/libc/locale/collate.c2
-rw-r--r--lib/libc/locale/collate.h2
-rw-r--r--lib/libc/locale/collcmp.c4
-rw-r--r--lib/libc/locale/ctype.c2
-rw-r--r--lib/libc/locale/euc.c2
-rw-r--r--lib/libc/locale/fix_grouping.c4
-rw-r--r--lib/libc/locale/gb18030.c2
-rw-r--r--lib/libc/locale/gb2312.c2
-rw-r--r--lib/libc/locale/gbk.c2
-rw-r--r--lib/libc/locale/isctype.c4
-rw-r--r--lib/libc/locale/iswctype.c4
-rw-r--r--lib/libc/locale/ldpart.c4
-rw-r--r--lib/libc/locale/ldpart.h2
-rw-r--r--lib/libc/locale/lmessages.c4
-rw-r--r--lib/libc/locale/lmessages.h2
-rw-r--r--lib/libc/locale/lmonetary.c4
-rw-r--r--lib/libc/locale/lmonetary.h2
-rw-r--r--lib/libc/locale/lnumeric.c4
-rw-r--r--lib/libc/locale/lnumeric.h2
-rw-r--r--lib/libc/locale/localeconv.c4
-rw-r--r--lib/libc/locale/mblen.c2
-rw-r--r--lib/libc/locale/mblocal.h2
-rw-r--r--lib/libc/locale/mbrlen.c2
-rw-r--r--lib/libc/locale/mbrtoc16.c2
-rw-r--r--lib/libc/locale/mbrtoc32.c2
-rw-r--r--lib/libc/locale/mbrtocXX_iconv.h2
-rw-r--r--lib/libc/locale/mbrtowc.c2
-rw-r--r--lib/libc/locale/mbsinit.c2
-rw-r--r--lib/libc/locale/mbsnrtowcs.c2
-rw-r--r--lib/libc/locale/mbsrtowcs.c2
-rw-r--r--lib/libc/locale/mbstowcs.c2
-rw-r--r--lib/libc/locale/mbtowc.c2
-rw-r--r--lib/libc/locale/mskanji.c4
-rw-r--r--lib/libc/locale/nextwctype.c2
-rw-r--r--lib/libc/locale/nl_langinfo.c2
-rw-r--r--lib/libc/locale/none.c2
-rw-r--r--lib/libc/locale/rpmatch.c2
-rw-r--r--lib/libc/locale/rune.c2
-rw-r--r--lib/libc/locale/runefile.h2
-rw-r--r--lib/libc/locale/runetype.c2
-rw-r--r--lib/libc/locale/setlocale.c4
-rw-r--r--lib/libc/locale/setlocale.h2
-rw-r--r--lib/libc/locale/setrunelocale.c2
-rw-r--r--lib/libc/locale/table.c2
-rw-r--r--lib/libc/locale/tolower.c2
-rw-r--r--lib/libc/locale/toupper.c2
-rw-r--r--lib/libc/locale/utf8.c2
-rw-r--r--lib/libc/locale/wcrtomb.c2
-rw-r--r--lib/libc/locale/wcsftime.c2
-rw-r--r--lib/libc/locale/wcsnrtombs.c2
-rw-r--r--lib/libc/locale/wcsrtombs.c2
-rw-r--r--lib/libc/locale/wcstod.c2
-rw-r--r--lib/libc/locale/wcstof.c2
-rw-r--r--lib/libc/locale/wcstoimax.c2
-rw-r--r--lib/libc/locale/wcstol.c2
-rw-r--r--lib/libc/locale/wcstold.c2
-rw-r--r--lib/libc/locale/wcstoll.c2
-rw-r--r--lib/libc/locale/wcstombs.c2
-rw-r--r--lib/libc/locale/wcstoul.c4
-rw-r--r--lib/libc/locale/wcstoull.c2
-rw-r--r--lib/libc/locale/wcstoumax.c2
-rw-r--r--lib/libc/locale/wctob.c2
-rw-r--r--lib/libc/locale/wctomb.c2
-rw-r--r--lib/libc/locale/wctrans.c2
-rw-r--r--lib/libc/locale/wctype.c2
-rw-r--r--lib/libc/locale/wcwidth.c4
-rw-r--r--lib/libc/locale/xlocale.c2
-rw-r--r--lib/libc/locale/xlocale_private.h2
-rw-r--r--lib/libc/mips/SYS.h2
-rw-r--r--lib/libc/mips/_fpmath.h2
-rw-r--r--lib/libc/mips/gen/_set_tp.c2
-rw-r--r--lib/libc/mips/gen/fabs.c4
-rw-r--r--lib/libc/mips/gen/longjmp.c2
-rw-r--r--lib/libc/mips/gen/makecontext.c2
-rw-r--r--lib/libc/mips/gen/signalcontext.c2
-rw-r--r--lib/libc/net/ether_addr.c4
-rw-r--r--lib/libc/net/gai_strerror.c4
-rw-r--r--lib/libc/net/getaddrinfo.c4
-rw-r--r--lib/libc/net/gethostbydns.c4
-rw-r--r--lib/libc/net/gethostbyht.c2
-rw-r--r--lib/libc/net/gethostbynis.c2
-rw-r--r--lib/libc/net/gethostnamadr.c2
-rw-r--r--lib/libc/net/getifmaddrs.c4
-rw-r--r--lib/libc/net/getnameinfo.c4
-rw-r--r--lib/libc/net/getnetbydns.c2
-rw-r--r--lib/libc/net/getnetbyht.c4
-rw-r--r--lib/libc/net/getnetbynis.c2
-rw-r--r--lib/libc/net/getnetnamadr.c2
-rw-r--r--lib/libc/net/getproto.c4
-rw-r--r--lib/libc/net/getprotoent.c4
-rw-r--r--lib/libc/net/getprotoname.c4
-rw-r--r--lib/libc/net/getservent.c4
-rw-r--r--lib/libc/net/ip6opt.c4
-rw-r--r--lib/libc/net/linkaddr.c2
-rw-r--r--lib/libc/net/map_v4v6.c4
-rw-r--r--lib/libc/net/name6.c4
-rw-r--r--lib/libc/net/netdb_private.h2
-rw-r--r--lib/libc/net/nscache.c2
-rw-r--r--lib/libc/net/nscachedcli.c2
-rw-r--r--lib/libc/net/nsdispatch.c2
-rw-r--r--lib/libc/net/nslexer.l2
-rw-r--r--lib/libc/net/nsparser.y2
-rw-r--r--lib/libc/net/nss_backends.h2
-rw-r--r--lib/libc/net/nss_compat.c2
-rw-r--r--lib/libc/net/ntoh.c2
-rw-r--r--lib/libc/net/rcmd.c4
-rw-r--r--lib/libc/net/rcmdsh.c4
-rw-r--r--lib/libc/net/recv.c4
-rw-r--r--lib/libc/net/rthdr.c4
-rw-r--r--lib/libc/net/sctp_sys_calls.c2
-rw-r--r--lib/libc/net/send.c4
-rw-r--r--lib/libc/net/sockatmark.c4
-rw-r--r--lib/libc/net/sourcefilter.c2
-rw-r--r--lib/libc/net/vars.c4
-rw-r--r--lib/libc/posix1e/acl_branding.c2
-rw-r--r--lib/libc/posix1e/acl_calc_mask.c4
-rw-r--r--lib/libc/posix1e/acl_compat.c2
-rw-r--r--lib/libc/posix1e/acl_copy.c4
-rw-r--r--lib/libc/posix1e/acl_delete.c2
-rw-r--r--lib/libc/posix1e/acl_delete_entry.c4
-rw-r--r--lib/libc/posix1e/acl_entry.c4
-rw-r--r--lib/libc/posix1e/acl_flag.c2
-rw-r--r--lib/libc/posix1e/acl_free.c2
-rw-r--r--lib/libc/posix1e/acl_from_text.c2
-rw-r--r--lib/libc/posix1e/acl_from_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_get.c2
-rw-r--r--lib/libc/posix1e/acl_id_to_name.c2
-rw-r--r--lib/libc/posix1e/acl_init.c2
-rw-r--r--lib/libc/posix1e/acl_perm.c4
-rw-r--r--lib/libc/posix1e/acl_set.c2
-rw-r--r--lib/libc/posix1e/acl_strip.c2
-rw-r--r--lib/libc/posix1e/acl_support.c2
-rw-r--r--lib/libc/posix1e/acl_support.h2
-rw-r--r--lib/libc/posix1e/acl_support_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_to_text.c2
-rw-r--r--lib/libc/posix1e/acl_to_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_valid.c2
-rw-r--r--lib/libc/posix1e/extattr.c2
-rw-r--r--lib/libc/posix1e/mac.c4
-rw-r--r--lib/libc/posix1e/mac_exec.c4
-rw-r--r--lib/libc/posix1e/mac_get.c4
-rw-r--r--lib/libc/posix1e/mac_set.c4
-rw-r--r--lib/libc/powerpc/SYS.h2
-rw-r--r--lib/libc/powerpc/_fpmath.h2
-rw-r--r--lib/libc/powerpc/gen/_set_tp.c2
-rw-r--r--lib/libc/powerpc/gen/flt_rounds.c4
-rw-r--r--lib/libc/powerpc/gen/fpgetmask.c4
-rw-r--r--lib/libc/powerpc/gen/fpgetround.c4
-rw-r--r--lib/libc/powerpc/gen/fpgetsticky.c4
-rw-r--r--lib/libc/powerpc/gen/fpsetmask.c4
-rw-r--r--lib/libc/powerpc/gen/fpsetround.c4
-rw-r--r--lib/libc/powerpc/gen/makecontext.c4
-rw-r--r--lib/libc/powerpc/gen/signalcontext.c4
-rw-r--r--lib/libc/powerpc/gen/syncicache.c2
-rw-r--r--lib/libc/powerpc64/SYS.h2
-rw-r--r--lib/libc/powerpc64/_fpmath.h2
-rw-r--r--lib/libc/powerpc64/gen/_set_tp.c2
-rw-r--r--lib/libc/powerpc64/gen/flt_rounds.c4
-rw-r--r--lib/libc/powerpc64/gen/fpgetmask.c4
-rw-r--r--lib/libc/powerpc64/gen/fpgetround.c4
-rw-r--r--lib/libc/powerpc64/gen/fpgetsticky.c4
-rw-r--r--lib/libc/powerpc64/gen/fpsetmask.c4
-rw-r--r--lib/libc/powerpc64/gen/fpsetround.c4
-rw-r--r--lib/libc/powerpc64/gen/makecontext.c4
-rw-r--r--lib/libc/powerpc64/gen/signalcontext.c4
-rw-r--r--lib/libc/powerpc64/gen/syncicache.c2
-rw-r--r--lib/libc/quad/TESTS/divrem.c2
-rw-r--r--lib/libc/quad/TESTS/mul.c2
-rw-r--r--lib/libc/quad/adddi3.c2
-rw-r--r--lib/libc/quad/anddi3.c2
-rw-r--r--lib/libc/quad/ashldi3.c2
-rw-r--r--lib/libc/quad/ashrdi3.c2
-rw-r--r--lib/libc/quad/cmpdi2.c2
-rw-r--r--lib/libc/quad/divdi3.c2
-rw-r--r--lib/libc/quad/fixdfdi.c2
-rw-r--r--lib/libc/quad/fixsfdi.c2
-rw-r--r--lib/libc/quad/fixunsdfdi.c2
-rw-r--r--lib/libc/quad/fixunssfdi.c2
-rw-r--r--lib/libc/quad/floatdidf.c2
-rw-r--r--lib/libc/quad/floatdisf.c2
-rw-r--r--lib/libc/quad/floatunsdidf.c2
-rw-r--r--lib/libc/quad/iordi3.c2
-rw-r--r--lib/libc/quad/lshldi3.c2
-rw-r--r--lib/libc/quad/lshrdi3.c2
-rw-r--r--lib/libc/quad/moddi3.c2
-rw-r--r--lib/libc/quad/muldi3.c2
-rw-r--r--lib/libc/quad/negdi2.c2
-rw-r--r--lib/libc/quad/notdi2.c2
-rw-r--r--lib/libc/quad/qdivrem.c2
-rw-r--r--lib/libc/quad/quad.h2
-rw-r--r--lib/libc/quad/subdi3.c2
-rw-r--r--lib/libc/quad/ucmpdi2.c2
-rw-r--r--lib/libc/quad/udivdi3.c2
-rw-r--r--lib/libc/quad/umoddi3.c2
-rw-r--r--lib/libc/quad/xordi3.c2
-rw-r--r--lib/libc/regex/cname.h2
-rw-r--r--lib/libc/regex/engine.c2
-rw-r--r--lib/libc/regex/regcomp.c2
-rw-r--r--lib/libc/regex/regerror.c2
-rw-r--r--lib/libc/regex/regex2.h2
-rw-r--r--lib/libc/regex/regexec.c2
-rw-r--r--lib/libc/regex/regfree.c2
-rw-r--r--lib/libc/regex/utils.h2
-rw-r--r--lib/libc/resolv/h_errno.c2
-rw-r--r--lib/libc/resolv/herror.c4
-rw-r--r--lib/libc/resolv/res_comp.c4
-rw-r--r--lib/libc/resolv/res_debug.c4
-rw-r--r--lib/libc/resolv/res_init.c4
-rw-r--r--lib/libc/resolv/res_mkquery.c4
-rw-r--r--lib/libc/resolv/res_query.c4
-rw-r--r--lib/libc/resolv/res_send.c4
-rw-r--r--lib/libc/resolv/res_state.c2
-rw-r--r--lib/libc/rpc/auth_des.c2
-rw-r--r--lib/libc/rpc/auth_none.c2
-rw-r--r--lib/libc/rpc/auth_unix.c2
-rw-r--r--lib/libc/rpc/authdes_prot.c2
-rw-r--r--lib/libc/rpc/authunix_prot.c2
-rw-r--r--lib/libc/rpc/bindresvport.c2
-rw-r--r--lib/libc/rpc/clnt_bcast.c2
-rw-r--r--lib/libc/rpc/clnt_dg.c2
-rw-r--r--lib/libc/rpc/clnt_generic.c2
-rw-r--r--lib/libc/rpc/clnt_perror.c2
-rw-r--r--lib/libc/rpc/clnt_raw.c2
-rw-r--r--lib/libc/rpc/clnt_simple.c2
-rw-r--r--lib/libc/rpc/clnt_vc.c2
-rw-r--r--lib/libc/rpc/crypt_client.c4
-rw-r--r--lib/libc/rpc/des_crypt.c2
-rw-r--r--lib/libc/rpc/des_soft.c2
-rw-r--r--lib/libc/rpc/getnetconfig.c2
-rw-r--r--lib/libc/rpc/getnetpath.c2
-rw-r--r--lib/libc/rpc/getpublickey.c2
-rw-r--r--lib/libc/rpc/getrpcent.c2
-rw-r--r--lib/libc/rpc/getrpcport.c2
-rw-r--r--lib/libc/rpc/key_call.c2
-rw-r--r--lib/libc/rpc/key_prot_xdr.c2
-rw-r--r--lib/libc/rpc/mt_misc.h4
-rw-r--r--lib/libc/rpc/netname.c2
-rw-r--r--lib/libc/rpc/netnamer.c2
-rw-r--r--lib/libc/rpc/pmap_clnt.c2
-rw-r--r--lib/libc/rpc/pmap_getmaps.c2
-rw-r--r--lib/libc/rpc/pmap_getport.c2
-rw-r--r--lib/libc/rpc/pmap_prot.c2
-rw-r--r--lib/libc/rpc/pmap_prot2.c2
-rw-r--r--lib/libc/rpc/pmap_rmt.c2
-rw-r--r--lib/libc/rpc/rpc_callmsg.c2
-rw-r--r--lib/libc/rpc/rpc_com.h2
-rw-r--r--lib/libc/rpc/rpc_commondata.c2
-rw-r--r--lib/libc/rpc/rpc_dtablesize.c2
-rw-r--r--lib/libc/rpc/rpc_generic.c2
-rw-r--r--lib/libc/rpc/rpc_prot.c2
-rw-r--r--lib/libc/rpc/rpc_soc.c2
-rw-r--r--lib/libc/rpc/rpcb_clnt.c2
-rw-r--r--lib/libc/rpc/rpcb_prot.c2
-rw-r--r--lib/libc/rpc/rpcb_st_xdr.c2
-rw-r--r--lib/libc/rpc/rpcdname.c2
-rw-r--r--lib/libc/rpc/rpcsec_gss_stub.c2
-rw-r--r--lib/libc/rpc/rtime.c2
-rw-r--r--lib/libc/rpc/svc.c2
-rw-r--r--lib/libc/rpc/svc_auth.c2
-rw-r--r--lib/libc/rpc/svc_auth_des.c2
-rw-r--r--lib/libc/rpc/svc_auth_unix.c2
-rw-r--r--lib/libc/rpc/svc_dg.c2
-rw-r--r--lib/libc/rpc/svc_generic.c2
-rw-r--r--lib/libc/rpc/svc_raw.c2
-rw-r--r--lib/libc/rpc/svc_run.c2
-rw-r--r--lib/libc/rpc/svc_simple.c2
-rw-r--r--lib/libc/rpc/svc_vc.c2
-rw-r--r--lib/libc/softfloat/fpgetmask.c2
-rw-r--r--lib/libc/softfloat/fpgetround.c2
-rw-r--r--lib/libc/softfloat/fpgetsticky.c2
-rw-r--r--lib/libc/softfloat/fpsetmask.c2
-rw-r--r--lib/libc/softfloat/fpsetround.c2
-rw-r--r--lib/libc/softfloat/fpsetsticky.c2
-rw-r--r--lib/libc/sparc64/SYS.h2
-rw-r--r--lib/libc/sparc64/_fpmath.h2
-rw-r--r--lib/libc/sparc64/fpu/fpu.c4
-rw-r--r--lib/libc/sparc64/fpu/fpu_add.c4
-rw-r--r--lib/libc/sparc64/fpu/fpu_arith.h4
-rw-r--r--lib/libc/sparc64/fpu/fpu_compare.c4
-rw-r--r--lib/libc/sparc64/fpu/fpu_emu.h4
-rw-r--r--lib/libc/sparc64/fpu/fpu_extern.h2
-rw-r--r--lib/libc/sparc64/fpu/fpu_qp.c2
-rw-r--r--lib/libc/sparc64/fpu/fpu_reg.h2
-rw-r--r--lib/libc/sparc64/gen/_set_tp.c2
-rw-r--r--lib/libc/sparc64/gen/makecontext.c2
-rw-r--r--lib/libc/sparc64/gen/signalcontext.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_sigtramp_setup.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap_align.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap_emul.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap_install.c2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap_private.h2
-rw-r--r--lib/libc/sparc64/sys/__sparc_utrap_setup.c2
-rw-r--r--lib/libc/stdio/_flock_stub.c4
-rw-r--r--lib/libc/stdio/asprintf.c2
-rw-r--r--lib/libc/stdio/clrerr.c2
-rw-r--r--lib/libc/stdio/dprintf.c2
-rw-r--r--lib/libc/stdio/fclose.c2
-rw-r--r--lib/libc/stdio/fcloseall.c2
-rw-r--r--lib/libc/stdio/fdopen.c2
-rw-r--r--lib/libc/stdio/feof.c2
-rw-r--r--lib/libc/stdio/ferror.c2
-rw-r--r--lib/libc/stdio/fflush.c2
-rw-r--r--lib/libc/stdio/fgetc.c2
-rw-r--r--lib/libc/stdio/fgetln.c2
-rw-r--r--lib/libc/stdio/fgetpos.c2
-rw-r--r--lib/libc/stdio/fgets.c2
-rw-r--r--lib/libc/stdio/fgetwc.c2
-rw-r--r--lib/libc/stdio/fgetwln.c2
-rw-r--r--lib/libc/stdio/fgetws.c2
-rw-r--r--lib/libc/stdio/fileno.c2
-rw-r--r--lib/libc/stdio/findfp.c2
-rw-r--r--lib/libc/stdio/flags.c2
-rw-r--r--lib/libc/stdio/floatio.h2
-rw-r--r--lib/libc/stdio/fmemopen.c2
-rw-r--r--lib/libc/stdio/fopen.c2
-rw-r--r--lib/libc/stdio/fprintf.c2
-rw-r--r--lib/libc/stdio/fpurge.c2
-rw-r--r--lib/libc/stdio/fputc.c2
-rw-r--r--lib/libc/stdio/fputs.c2
-rw-r--r--lib/libc/stdio/fputwc.c2
-rw-r--r--lib/libc/stdio/fputws.c2
-rw-r--r--lib/libc/stdio/fread.c2
-rw-r--r--lib/libc/stdio/freopen.c2
-rw-r--r--lib/libc/stdio/fscanf.c2
-rw-r--r--lib/libc/stdio/fseek.c2
-rw-r--r--lib/libc/stdio/fsetpos.c2
-rw-r--r--lib/libc/stdio/ftell.c2
-rw-r--r--lib/libc/stdio/funopen.c2
-rw-r--r--lib/libc/stdio/fvwrite.c2
-rw-r--r--lib/libc/stdio/fvwrite.h2
-rw-r--r--lib/libc/stdio/fwalk.c2
-rw-r--r--lib/libc/stdio/fwide.c2
-rw-r--r--lib/libc/stdio/fwprintf.c2
-rw-r--r--lib/libc/stdio/fwrite.c2
-rw-r--r--lib/libc/stdio/fwscanf.c2
-rw-r--r--lib/libc/stdio/getc.c2
-rw-r--r--lib/libc/stdio/getchar.c2
-rw-r--r--lib/libc/stdio/getdelim.c2
-rw-r--r--lib/libc/stdio/getline.c2
-rw-r--r--lib/libc/stdio/gets.c2
-rw-r--r--lib/libc/stdio/getw.c2
-rw-r--r--lib/libc/stdio/getwc.c2
-rw-r--r--lib/libc/stdio/getwchar.c2
-rw-r--r--lib/libc/stdio/glue.h2
-rw-r--r--lib/libc/stdio/local.h2
-rw-r--r--lib/libc/stdio/makebuf.c2
-rw-r--r--lib/libc/stdio/mktemp.c4
-rw-r--r--lib/libc/stdio/open_memstream.c2
-rw-r--r--lib/libc/stdio/open_wmemstream.c2
-rw-r--r--lib/libc/stdio/perror.c4
-rw-r--r--lib/libc/stdio/printf-pos.c2
-rw-r--r--lib/libc/stdio/printf.c2
-rw-r--r--lib/libc/stdio/printfcommon.h2
-rw-r--r--lib/libc/stdio/printflocal.h2
-rw-r--r--lib/libc/stdio/putc.c2
-rw-r--r--lib/libc/stdio/putchar.c2
-rw-r--r--lib/libc/stdio/puts.c2
-rw-r--r--lib/libc/stdio/putw.c2
-rw-r--r--lib/libc/stdio/putwc.c2
-rw-r--r--lib/libc/stdio/putwchar.c2
-rw-r--r--lib/libc/stdio/refill.c2
-rw-r--r--lib/libc/stdio/remove.c2
-rw-r--r--lib/libc/stdio/rewind.c2
-rw-r--r--lib/libc/stdio/rget.c2
-rw-r--r--lib/libc/stdio/scanf.c2
-rw-r--r--lib/libc/stdio/setbuf.c2
-rw-r--r--lib/libc/stdio/setbuffer.c2
-rw-r--r--lib/libc/stdio/setvbuf.c2
-rw-r--r--lib/libc/stdio/snprintf.c2
-rw-r--r--lib/libc/stdio/sprintf.c2
-rw-r--r--lib/libc/stdio/sscanf.c2
-rw-r--r--lib/libc/stdio/stdio.c2
-rw-r--r--lib/libc/stdio/swprintf.c2
-rw-r--r--lib/libc/stdio/swscanf.c2
-rw-r--r--lib/libc/stdio/tempnam.c4
-rw-r--r--lib/libc/stdio/tmpfile.c2
-rw-r--r--lib/libc/stdio/tmpnam.c2
-rw-r--r--lib/libc/stdio/ungetc.c2
-rw-r--r--lib/libc/stdio/ungetwc.c2
-rw-r--r--lib/libc/stdio/vasprintf.c4
-rw-r--r--lib/libc/stdio/vdprintf.c2
-rw-r--r--lib/libc/stdio/vfprintf.c2
-rw-r--r--lib/libc/stdio/vfscanf.c2
-rw-r--r--lib/libc/stdio/vfwprintf.c2
-rw-r--r--lib/libc/stdio/vfwscanf.c2
-rw-r--r--lib/libc/stdio/vprintf.c2
-rw-r--r--lib/libc/stdio/vscanf.c2
-rw-r--r--lib/libc/stdio/vsnprintf.c2
-rw-r--r--lib/libc/stdio/vsprintf.c2
-rw-r--r--lib/libc/stdio/vsscanf.c2
-rw-r--r--lib/libc/stdio/vswprintf.c4
-rw-r--r--lib/libc/stdio/vswscanf.c2
-rw-r--r--lib/libc/stdio/vwprintf.c2
-rw-r--r--lib/libc/stdio/vwscanf.c2
-rw-r--r--lib/libc/stdio/wbuf.c2
-rw-r--r--lib/libc/stdio/wprintf.c2
-rw-r--r--lib/libc/stdio/wscanf.c2
-rw-r--r--lib/libc/stdio/wsetup.c2
-rw-r--r--lib/libc/stdio/xprintf.c2
-rw-r--r--lib/libc/stdio/xprintf_errno.c2
-rw-r--r--lib/libc/stdio/xprintf_float.c2
-rw-r--r--lib/libc/stdio/xprintf_hexdump.c2
-rw-r--r--lib/libc/stdio/xprintf_int.c2
-rw-r--r--lib/libc/stdio/xprintf_quote.c2
-rw-r--r--lib/libc/stdio/xprintf_str.c2
-rw-r--r--lib/libc/stdio/xprintf_time.c2
-rw-r--r--lib/libc/stdio/xprintf_vis.c2
-rw-r--r--lib/libc/stdlib/abort.c4
-rw-r--r--lib/libc/stdlib/abs.c2
-rw-r--r--lib/libc/stdlib/atexit.c2
-rw-r--r--lib/libc/stdlib/atexit.h2
-rw-r--r--lib/libc/stdlib/atof.c4
-rw-r--r--lib/libc/stdlib/atoi.c4
-rw-r--r--lib/libc/stdlib/atol.c4
-rw-r--r--lib/libc/stdlib/atoll.c4
-rw-r--r--lib/libc/stdlib/bsearch.c4
-rw-r--r--lib/libc/stdlib/div.c4
-rw-r--r--lib/libc/stdlib/exit.c2
-rw-r--r--lib/libc/stdlib/getenv.c2
-rw-r--r--lib/libc/stdlib/getopt.c4
-rw-r--r--lib/libc/stdlib/getsubopt.c2
-rw-r--r--lib/libc/stdlib/hcreate.c2
-rw-r--r--lib/libc/stdlib/heapsort.c2
-rw-r--r--lib/libc/stdlib/imaxabs.c2
-rw-r--r--lib/libc/stdlib/imaxdiv.c2
-rw-r--r--lib/libc/stdlib/labs.c2
-rw-r--r--lib/libc/stdlib/ldiv.c4
-rw-r--r--lib/libc/stdlib/llabs.c2
-rw-r--r--lib/libc/stdlib/lldiv.c2
-rw-r--r--lib/libc/stdlib/merge.c2
-rw-r--r--lib/libc/stdlib/ptsname.c2
-rw-r--r--lib/libc/stdlib/qsort.c2
-rw-r--r--lib/libc/stdlib/quick_exit.c2
-rw-r--r--lib/libc/stdlib/radixsort.c2
-rw-r--r--lib/libc/stdlib/rand.c2
-rw-r--r--lib/libc/stdlib/random.c4
-rw-r--r--lib/libc/stdlib/reallocf.c2
-rw-r--r--lib/libc/stdlib/realpath.c4
-rw-r--r--lib/libc/stdlib/strfmon.c2
-rw-r--r--lib/libc/stdlib/strtoimax.c2
-rw-r--r--lib/libc/stdlib/strtol.c2
-rw-r--r--lib/libc/stdlib/strtoll.c2
-rw-r--r--lib/libc/stdlib/strtoq.c2
-rw-r--r--lib/libc/stdlib/strtoul.c4
-rw-r--r--lib/libc/stdlib/strtoull.c2
-rw-r--r--lib/libc/stdlib/strtoumax.c2
-rw-r--r--lib/libc/stdlib/strtouq.c2
-rw-r--r--lib/libc/stdlib/system.c4
-rw-r--r--lib/libc/stdtime/strptime.c2
-rw-r--r--lib/libc/stdtime/timelocal.c2
-rw-r--r--lib/libc/stdtime/timelocal.h2
-rw-r--r--lib/libc/string/bcmp.c4
-rw-r--r--lib/libc/string/bcopy.c2
-rw-r--r--lib/libc/string/ffs.c2
-rw-r--r--lib/libc/string/ffsl.c2
-rw-r--r--lib/libc/string/ffsll.c2
-rw-r--r--lib/libc/string/fls.c2
-rw-r--r--lib/libc/string/flsl.c2
-rw-r--r--lib/libc/string/flsll.c2
-rw-r--r--lib/libc/string/memccpy.c2
-rw-r--r--lib/libc/string/memchr.c2
-rw-r--r--lib/libc/string/memcmp.c2
-rw-r--r--lib/libc/string/memmem.c3
-rw-r--r--lib/libc/string/memset.c2
-rw-r--r--lib/libc/string/stpcpy.c4
-rw-r--r--lib/libc/string/stpncpy.c2
-rw-r--r--lib/libc/string/strcasecmp.c4
-rw-r--r--lib/libc/string/strcasestr.c2
-rw-r--r--lib/libc/string/strcat.c4
-rw-r--r--lib/libc/string/strchr.c2
-rw-r--r--lib/libc/string/strchrnul.c2
-rw-r--r--lib/libc/string/strcmp.c2
-rw-r--r--lib/libc/string/strcoll.c2
-rw-r--r--lib/libc/string/strcpy.c4
-rw-r--r--lib/libc/string/strcspn.c2
-rw-r--r--lib/libc/string/strdup.c4
-rw-r--r--lib/libc/string/strerror.c2
-rw-r--r--lib/libc/string/strlen.c2
-rw-r--r--lib/libc/string/strmode.c2
-rw-r--r--lib/libc/string/strncat.c2
-rw-r--r--lib/libc/string/strncmp.c4
-rw-r--r--lib/libc/string/strncpy.c2
-rw-r--r--lib/libc/string/strnlen.c2
-rw-r--r--lib/libc/string/strnstr.c2
-rw-r--r--lib/libc/string/strpbrk.c4
-rw-r--r--lib/libc/string/strrchr.c4
-rw-r--r--lib/libc/string/strsep.c2
-rw-r--r--lib/libc/string/strsignal.c4
-rw-r--r--lib/libc/string/strspn.c2
-rw-r--r--lib/libc/string/strstr.c3
-rw-r--r--lib/libc/string/strtok.c2
-rw-r--r--lib/libc/string/strxfrm.c2
-rw-r--r--lib/libc/string/swab.c4
-rw-r--r--lib/libc/string/wcpcpy.c4
-rw-r--r--lib/libc/string/wcpncpy.c2
-rw-r--r--lib/libc/string/wcscasecmp.c2
-rw-r--r--lib/libc/string/wcscat.c2
-rw-r--r--lib/libc/string/wcschr.c2
-rw-r--r--lib/libc/string/wcscmp.c2
-rw-r--r--lib/libc/string/wcscoll.c2
-rw-r--r--lib/libc/string/wcscpy.c2
-rw-r--r--lib/libc/string/wcscspn.c2
-rw-r--r--lib/libc/string/wcsdup.c2
-rw-r--r--lib/libc/string/wcslcat.c4
-rw-r--r--lib/libc/string/wcslcpy.c2
-rw-r--r--lib/libc/string/wcslen.c2
-rw-r--r--lib/libc/string/wcsncasecmp.c2
-rw-r--r--lib/libc/string/wcsncat.c2
-rw-r--r--lib/libc/string/wcsncmp.c4
-rw-r--r--lib/libc/string/wcsncpy.c2
-rw-r--r--lib/libc/string/wcsnlen.c2
-rw-r--r--lib/libc/string/wcspbrk.c2
-rw-r--r--lib/libc/string/wcsrchr.c2
-rw-r--r--lib/libc/string/wcsspn.c2
-rw-r--r--lib/libc/string/wcsstr.c2
-rw-r--r--lib/libc/string/wcstok.c2
-rw-r--r--lib/libc/string/wcswidth.c4
-rw-r--r--lib/libc/string/wcsxfrm.c2
-rw-r--r--lib/libc/string/wmemchr.c2
-rw-r--r--lib/libc/string/wmemcmp.c2
-rw-r--r--lib/libc/string/wmemcpy.c2
-rw-r--r--lib/libc/string/wmemmove.c2
-rw-r--r--lib/libc/string/wmemset.c2
-rw-r--r--lib/libc/sys/__error.c4
-rw-r--r--lib/libc/sys/__vdso_gettimeofday.c2
-rw-r--r--lib/libc/sys/clock_gettime.c2
-rw-r--r--lib/libc/sys/fcntl.c2
-rw-r--r--lib/libc/sys/gettimeofday.c2
-rw-r--r--lib/libc/sys/sigwait.c2
-rw-r--r--lib/libc/uuid/uuid_compare.c2
-rw-r--r--lib/libc/uuid/uuid_create.c2
-rw-r--r--lib/libc/uuid/uuid_create_nil.c2
-rw-r--r--lib/libc/uuid/uuid_equal.c2
-rw-r--r--lib/libc/uuid/uuid_from_string.c2
-rw-r--r--lib/libc/uuid/uuid_hash.c2
-rw-r--r--lib/libc/uuid/uuid_is_nil.c2
-rw-r--r--lib/libc/uuid/uuid_stream.c2
-rw-r--r--lib/libc/uuid/uuid_to_string.c2
-rw-r--r--lib/libc/xdr/xdr.c2
-rw-r--r--lib/libc/xdr/xdr_array.c2
-rw-r--r--lib/libc/xdr/xdr_float.c2
-rw-r--r--lib/libc/xdr/xdr_mem.c2
-rw-r--r--lib/libc/xdr/xdr_rec.c2
-rw-r--r--lib/libc/xdr/xdr_reference.c2
-rw-r--r--lib/libc/xdr/xdr_sizeof.c2
-rw-r--r--lib/libc/xdr/xdr_stdio.c2
-rw-r--r--lib/libc/yp/xdryp.c4
-rw-r--r--lib/libc/yp/yplib.c4
-rw-r--r--lib/libc_nonshared/__stub.c2
-rw-r--r--lib/libcalendar/calendar.c2
-rw-r--r--lib/libcalendar/calendar.h2
-rw-r--r--lib/libcalendar/easter.c2
-rw-r--r--lib/libcam/camlib.c4
-rw-r--r--lib/libcam/camlib.h4
-rw-r--r--lib/libcam/scsi_cmdparse.c5
-rw-r--r--lib/libcompat/4.1/ftime.c4
-rw-r--r--lib/libcompat/4.3/re_comp.c2
-rw-r--r--lib/libcompat/4.3/rexec.c4
-rw-r--r--lib/libcompat/4.4/cuserid.c2
-rw-r--r--lib/libcrypt/crypt-md5.c2
-rw-r--r--lib/libcrypt/crypt-nthash.c2
-rw-r--r--lib/libcrypt/crypt-sha256.c4
-rw-r--r--lib/libcrypt/crypt-sha512.c4
-rw-r--r--lib/libcrypt/crypt.c2
-rw-r--r--lib/libcrypt/crypt.h4
-rw-r--r--lib/libcrypt/misc.c4
-rw-r--r--lib/libdevinfo/devinfo.c2
-rw-r--r--lib/libdevinfo/devinfo.h2
-rw-r--r--lib/libdevinfo/devinfo_var.h2
-rw-r--r--lib/libdevstat/devstat.c4
-rw-r--r--lib/libdevstat/devstat.h4
-rw-r--r--lib/libfetch/common.c2
-rw-r--r--lib/libfetch/common.h2
-rw-r--r--lib/libfetch/fetch.c2
-rw-r--r--lib/libfetch/fetch.h2
-rw-r--r--lib/libfetch/file.c2
-rw-r--r--lib/libfetch/ftp.c2
-rw-r--r--lib/libfetch/http.c2
-rw-r--r--lib/libgeom/geom_ctl.c2
-rw-r--r--lib/libgeom/geom_getxml.c2
-rw-r--r--lib/libgeom/geom_stats.c2
-rw-r--r--lib/libgeom/geom_util.c2
-rw-r--r--lib/libgeom/geom_xml2tree.c2
-rw-r--r--lib/libgeom/libgeom.h2
-rw-r--r--lib/libgssapi/context.h2
-rw-r--r--lib/libgssapi/cred.h2
-rw-r--r--lib/libgssapi/gss_accept_sec_context.c2
-rw-r--r--lib/libgssapi/gss_acquire_cred.c2
-rw-r--r--lib/libgssapi/gss_add_cred.c2
-rw-r--r--lib/libgssapi/gss_add_oid_set_member.c2
-rw-r--r--lib/libgssapi/gss_buffer_set.c4
-rw-r--r--lib/libgssapi/gss_canonicalize_name.c2
-rw-r--r--lib/libgssapi/gss_compare_name.c2
-rw-r--r--lib/libgssapi/gss_context_time.c2
-rw-r--r--lib/libgssapi/gss_create_empty_oid_set.c2
-rw-r--r--lib/libgssapi/gss_decapsulate_token.c2
-rw-r--r--lib/libgssapi/gss_delete_sec_context.c2
-rw-r--r--lib/libgssapi/gss_display_name.c2
-rw-r--r--lib/libgssapi/gss_display_status.c2
-rw-r--r--lib/libgssapi/gss_duplicate_name.c2
-rw-r--r--lib/libgssapi/gss_duplicate_oid.c2
-rw-r--r--lib/libgssapi/gss_encapsulate_token.c2
-rw-r--r--lib/libgssapi/gss_export_name.c2
-rw-r--r--lib/libgssapi/gss_export_sec_context.c2
-rw-r--r--lib/libgssapi/gss_get_mic.c2
-rw-r--r--lib/libgssapi/gss_import_name.c2
-rw-r--r--lib/libgssapi/gss_import_sec_context.c2
-rw-r--r--lib/libgssapi/gss_indicate_mechs.c2
-rw-r--r--lib/libgssapi/gss_init_sec_context.c2
-rw-r--r--lib/libgssapi/gss_inquire_context.c2
-rw-r--r--lib/libgssapi/gss_inquire_cred.c2
-rw-r--r--lib/libgssapi/gss_inquire_cred_by_mech.c2
-rw-r--r--lib/libgssapi/gss_inquire_cred_by_oid.c4
-rw-r--r--lib/libgssapi/gss_inquire_mechs_for_name.c2
-rw-r--r--lib/libgssapi/gss_inquire_names_for_mech.c2
-rw-r--r--lib/libgssapi/gss_inquire_sec_context_by_oid.c2
-rw-r--r--lib/libgssapi/gss_krb5.c2
-rw-r--r--lib/libgssapi/gss_mech_switch.c2
-rw-r--r--lib/libgssapi/gss_names.c2
-rw-r--r--lib/libgssapi/gss_oid_to_str.c2
-rw-r--r--lib/libgssapi/gss_pname_to_uid.c2
-rw-r--r--lib/libgssapi/gss_process_context_token.c2
-rw-r--r--lib/libgssapi/gss_pseudo_random.c2
-rw-r--r--lib/libgssapi/gss_release_buffer.c2
-rw-r--r--lib/libgssapi/gss_release_cred.c2
-rw-r--r--lib/libgssapi/gss_release_name.c2
-rw-r--r--lib/libgssapi/gss_release_oid.c2
-rw-r--r--lib/libgssapi/gss_release_oid_set.c2
-rw-r--r--lib/libgssapi/gss_seal.c2
-rw-r--r--lib/libgssapi/gss_set_cred_option.c4
-rw-r--r--lib/libgssapi/gss_set_sec_context_option.c4
-rw-r--r--lib/libgssapi/gss_sign.c2
-rw-r--r--lib/libgssapi/gss_test_oid_set_member.c2
-rw-r--r--lib/libgssapi/gss_unseal.c2
-rw-r--r--lib/libgssapi/gss_unwrap.c2
-rw-r--r--lib/libgssapi/gss_utils.c2
-rw-r--r--lib/libgssapi/gss_verify.c2
-rw-r--r--lib/libgssapi/gss_verify_mic.c2
-rw-r--r--lib/libgssapi/gss_wrap.c2
-rw-r--r--lib/libgssapi/gss_wrap_size_limit.c2
-rw-r--r--lib/libgssapi/mech_switch.h2
-rw-r--r--lib/libgssapi/name.h2
-rw-r--r--lib/libgssapi/spnego.h2
-rw-r--r--lib/libgssapi/utils.h2
-rw-r--r--lib/libiconv_modules/BIG5/citrus_big5.c2
-rw-r--r--lib/libiconv_modules/BIG5/citrus_big5.h2
-rw-r--r--lib/libiconv_modules/DECHanyu/citrus_dechanyu.c2
-rw-r--r--lib/libiconv_modules/DECHanyu/citrus_dechanyu.h2
-rw-r--r--lib/libiconv_modules/EUC/citrus_euc.c2
-rw-r--r--lib/libiconv_modules/EUC/citrus_euc.h2
-rw-r--r--lib/libiconv_modules/EUCTW/citrus_euctw.c2
-rw-r--r--lib/libiconv_modules/EUCTW/citrus_euctw.h2
-rw-r--r--lib/libiconv_modules/GBK2K/citrus_gbk2k.c2
-rw-r--r--lib/libiconv_modules/GBK2K/citrus_gbk2k.h2
-rw-r--r--lib/libiconv_modules/HZ/citrus_hz.c2
-rw-r--r--lib/libiconv_modules/HZ/citrus_hz.h2
-rw-r--r--lib/libiconv_modules/ISO2022/citrus_iso2022.c2
-rw-r--r--lib/libiconv_modules/ISO2022/citrus_iso2022.h2
-rw-r--r--lib/libiconv_modules/JOHAB/citrus_johab.c2
-rw-r--r--lib/libiconv_modules/JOHAB/citrus_johab.h2
-rw-r--r--lib/libiconv_modules/MSKanji/citrus_mskanji.c2
-rw-r--r--lib/libiconv_modules/MSKanji/citrus_mskanji.h2
-rw-r--r--lib/libiconv_modules/UES/citrus_ues.c2
-rw-r--r--lib/libiconv_modules/UES/citrus_ues.h2
-rw-r--r--lib/libiconv_modules/UTF1632/citrus_utf1632.c2
-rw-r--r--lib/libiconv_modules/UTF1632/citrus_utf1632.h2
-rw-r--r--lib/libiconv_modules/UTF7/citrus_utf7.c2
-rw-r--r--lib/libiconv_modules/UTF7/citrus_utf7.h2
-rw-r--r--lib/libiconv_modules/UTF8/citrus_utf8.c2
-rw-r--r--lib/libiconv_modules/UTF8/citrus_utf8.h2
-rw-r--r--lib/libiconv_modules/VIQR/citrus_viqr.c2
-rw-r--r--lib/libiconv_modules/VIQR/citrus_viqr.h2
-rw-r--r--lib/libiconv_modules/ZW/citrus_zw.c2
-rw-r--r--lib/libiconv_modules/ZW/citrus_zw.h2
-rw-r--r--lib/libiconv_modules/iconv_none/citrus_iconv_none.c2
-rw-r--r--lib/libiconv_modules/iconv_none/citrus_iconv_none.h2
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std.c2
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std.h2
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h2
-rw-r--r--lib/libiconv_modules/mapper_646/citrus_mapper_646.c2
-rw-r--r--lib/libiconv_modules/mapper_646/citrus_mapper_646.h2
-rw-r--r--lib/libiconv_modules/mapper_none/citrus_mapper_none.c2
-rw-r--r--lib/libiconv_modules/mapper_none/citrus_mapper_none.h2
-rw-r--r--lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c2
-rw-r--r--lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h2
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std.c2
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std.h2
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h2
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h2
-rw-r--r--lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c2
-rw-r--r--lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h2
-rw-r--r--lib/libipsec/ipsec_dump_policy.c4
-rw-r--r--lib/libipsec/ipsec_get_policylen.c4
-rw-r--r--lib/libipsec/ipsec_strerror.c4
-rw-r--r--lib/libipsec/ipsec_strerror.h4
-rw-r--r--lib/libipsec/libpfkey.h4
-rw-r--r--lib/libipsec/pfkey.c4
-rw-r--r--lib/libipsec/pfkey_dump.c4
-rw-r--r--lib/libipsec/policy_parse.y4
-rw-r--r--lib/libipsec/policy_token.l4
-rw-r--r--lib/libipsec/test-policy.c4
-rw-r--r--lib/libjail/jail.c2
-rw-r--r--lib/libjail/jail.h2
-rw-r--r--lib/libjail/jail_getid.c2
-rw-r--r--lib/libkiconv/kiconv_sysctl.c2
-rw-r--r--lib/libkiconv/quirks.c2
-rw-r--r--lib/libkiconv/quirks.h2
-rw-r--r--lib/libkiconv/xlat16_iconv.c2
-rw-r--r--lib/libkiconv/xlat16_sysctl.c4
-rw-r--r--lib/libkvm/kvm.c2
-rw-r--r--lib/libkvm/kvm.h2
-rw-r--r--lib/libkvm/kvm_amd64.c2
-rw-r--r--lib/libkvm/kvm_arm.c2
-rw-r--r--lib/libkvm/kvm_cptime.c2
-rw-r--r--lib/libkvm/kvm_getloadavg.c2
-rw-r--r--lib/libkvm/kvm_getswapinfo.c4
-rw-r--r--lib/libkvm/kvm_i386.c2
-rw-r--r--lib/libkvm/kvm_minidump_amd64.c2
-rw-r--r--lib/libkvm/kvm_minidump_arm.c2
-rw-r--r--lib/libkvm/kvm_minidump_i386.c2
-rw-r--r--lib/libkvm/kvm_minidump_mips.c2
-rw-r--r--lib/libkvm/kvm_pcpu.c2
-rw-r--r--lib/libkvm/kvm_powerpc.c2
-rw-r--r--lib/libkvm/kvm_powerpc64.c2
-rw-r--r--lib/libkvm/kvm_private.h2
-rw-r--r--lib/libkvm/kvm_proc.c2
-rw-r--r--lib/libkvm/kvm_sparc64.c2
-rw-r--r--lib/libkvm/kvm_vnet.c2
-rw-r--r--lib/libmemstat/memstat.c2
-rw-r--r--lib/libmemstat/memstat.h2
-rw-r--r--lib/libmemstat/memstat_all.c2
-rw-r--r--lib/libmemstat/memstat_internal.h2
-rw-r--r--lib/libmemstat/memstat_malloc.c2
-rw-r--r--lib/libmemstat/memstat_uma.c2
-rw-r--r--lib/libmp/mpasbn.c4
-rw-r--r--lib/libnandfs/libnandfs.h2
-rw-r--r--lib/libnandfs/nandfs.c2
-rw-r--r--lib/libnetbsd/rmd160.h2
-rw-r--r--lib/libnetbsd/sha1.h2
-rw-r--r--lib/libnetbsd/sha2.h2
-rw-r--r--lib/libnetbsd/stdlib.h2
-rw-r--r--lib/libnetbsd/strsuftoll.c2
-rw-r--r--lib/libnetbsd/sys/cdefs.h2
-rw-r--r--lib/libnetbsd/util.c2
-rw-r--r--lib/libnetbsd/util.h2
-rw-r--r--lib/libnv/common_impl.h2
-rw-r--r--lib/libnv/msgio.c2
-rw-r--r--lib/libnv/msgio.h2
-rw-r--r--lib/libpam/libpam/security/pam_mod_misc.h2
-rw-r--r--lib/libpam/modules/pam_chroot/pam_chroot.c2
-rw-r--r--lib/libpam/modules/pam_deny/pam_deny.c2
-rw-r--r--lib/libpam/modules/pam_echo/pam_echo.c2
-rw-r--r--lib/libpam/modules/pam_exec/pam_exec.c2
-rw-r--r--lib/libpam/modules/pam_ftpusers/pam_ftpusers.c2
-rw-r--r--lib/libpam/modules/pam_group/pam_group.c2
-rw-r--r--lib/libpam/modules/pam_guest/pam_guest.c2
-rw-r--r--lib/libpam/modules/pam_ksu/pam_ksu.c2
-rw-r--r--lib/libpam/modules/pam_lastlog/pam_lastlog.c2
-rw-r--r--lib/libpam/modules/pam_login_access/pam_login_access.c2
-rw-r--r--lib/libpam/modules/pam_login_access/pam_login_access.h2
-rw-r--r--lib/libpam/modules/pam_nologin/pam_nologin.c2
-rw-r--r--lib/libpam/modules/pam_opie/pam_opie.c2
-rw-r--r--lib/libpam/modules/pam_opieaccess/pam_opieaccess.c2
-rw-r--r--lib/libpam/modules/pam_permit/pam_permit.c2
-rw-r--r--lib/libpam/modules/pam_radius/pam_radius.c2
-rw-r--r--lib/libpam/modules/pam_rhosts/pam_rhosts.c2
-rw-r--r--lib/libpam/modules/pam_rootok/pam_rootok.c2
-rw-r--r--lib/libpam/modules/pam_securetty/pam_securetty.c2
-rw-r--r--lib/libpam/modules/pam_self/pam_self.c2
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c2
-rw-r--r--lib/libpam/modules/pam_tacplus/pam_tacplus.c2
-rw-r--r--lib/libpam/modules/pam_unix/pam_unix.c2
-rw-r--r--lib/libpjdlog/pjdlog.c2
-rw-r--r--lib/libpjdlog/pjdlog.h2
-rw-r--r--lib/libpmc/libpmc.c2
-rw-r--r--lib/libpmc/libpmcinternal.h2
-rw-r--r--lib/libpmc/pmc.h2
-rw-r--r--lib/libpmc/pmclog.c2
-rw-r--r--lib/libpmc/pmclog.h2
-rw-r--r--lib/libprocstat/cd9660.c2
-rw-r--r--lib/libprocstat/common_kvm.c2
-rw-r--r--lib/libprocstat/common_kvm.h2
-rw-r--r--lib/libprocstat/core.c2
-rw-r--r--lib/libprocstat/core.h2
-rw-r--r--lib/libprocstat/libprocstat.c2
-rw-r--r--lib/libprocstat/libprocstat.h2
-rw-r--r--lib/libprocstat/libprocstat_internal.h2
-rw-r--r--lib/libprocstat/msdosfs.c4
-rw-r--r--lib/libprocstat/smbfs.c2
-rw-r--r--lib/libprocstat/udf.c2
-rw-r--r--lib/libprocstat/zfs.c2
-rw-r--r--lib/libradius/radlib.c2
-rw-r--r--lib/libradius/radlib.h2
-rw-r--r--lib/libradius/radlib_private.h2
-rw-r--r--lib/libradius/radlib_vs.h2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss.c2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_conf.c2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_int.h2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_misc.c2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_prot.c2
-rw-r--r--lib/librpcsec_gss/svc_rpcsec_gss.c4
-rw-r--r--lib/librpcsvc/yp_passwd.c4
-rw-r--r--lib/librpcsvc/yp_update.c4
-rw-r--r--lib/librt/aio.c4
-rw-r--r--lib/librt/mq.c2
-rw-r--r--lib/librt/sigev_thread.c4
-rw-r--r--lib/librt/sigev_thread.h4
-rw-r--r--lib/librt/timer.c4
-rw-r--r--lib/librtld_db/rtld_db.c2
-rw-r--r--lib/librtld_db/rtld_db.h2
-rw-r--r--lib/libsdp/sdp-int.h4
-rw-r--r--lib/libsdp/sdp.h4
-rw-r--r--lib/libsdp/search.c4
-rw-r--r--lib/libsdp/service.c4
-rw-r--r--lib/libsdp/session.c4
-rw-r--r--lib/libsdp/util.c4
-rw-r--r--lib/libstdbuf/stdbuf.c2
-rw-r--r--lib/libstdthreads/call_once.c2
-rw-r--r--lib/libstdthreads/cnd.c2
-rw-r--r--lib/libstdthreads/mtx.c2
-rw-r--r--lib/libstdthreads/thrd.c2
-rw-r--r--lib/libstdthreads/threads.h2
-rw-r--r--lib/libstdthreads/tss.c2
-rw-r--r--lib/libtacplus/taclib.c2
-rw-r--r--lib/libtacplus/taclib.h2
-rw-r--r--lib/libtacplus/taclib_private.h2
-rw-r--r--lib/libthr/arch/amd64/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/arm/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/i386/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/mips/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/powerpc/include/pthread_md.h4
-rw-r--r--lib/libthr/arch/sparc64/include/pthread_md.h2
-rw-r--r--lib/libthr/sys/thr_error.c4
-rw-r--r--lib/libthr/thread/thr_affinity.c4
-rw-r--r--lib/libthr/thread/thr_attr.c4
-rw-r--r--lib/libthr/thread/thr_autoinit.c4
-rw-r--r--lib/libthr/thread/thr_barrier.c2
-rw-r--r--lib/libthr/thread/thr_barrierattr.c4
-rw-r--r--lib/libthr/thread/thr_cancel.c4
-rw-r--r--lib/libthr/thread/thr_clean.c5
-rw-r--r--lib/libthr/thread/thr_concurrency.c4
-rw-r--r--lib/libthr/thread/thr_cond.c4
-rw-r--r--lib/libthr/thread/thr_condattr.c4
-rw-r--r--lib/libthr/thread/thr_create.c4
-rw-r--r--lib/libthr/thread/thr_detach.c4
-rw-r--r--lib/libthr/thread/thr_equal.c4
-rw-r--r--lib/libthr/thread/thr_event.c4
-rw-r--r--lib/libthr/thread/thr_exit.c4
-rw-r--r--lib/libthr/thread/thr_fork.c4
-rw-r--r--lib/libthr/thread/thr_getcpuclockid.c4
-rw-r--r--lib/libthr/thread/thr_getprio.c4
-rw-r--r--lib/libthr/thread/thr_getschedparam.c4
-rw-r--r--lib/libthr/thread/thr_getthreadid_np.c4
-rw-r--r--lib/libthr/thread/thr_info.c4
-rw-r--r--lib/libthr/thread/thr_init.c4
-rw-r--r--lib/libthr/thread/thr_join.c4
-rw-r--r--lib/libthr/thread/thr_kern.c4
-rw-r--r--lib/libthr/thread/thr_kill.c4
-rw-r--r--lib/libthr/thread/thr_list.c4
-rw-r--r--lib/libthr/thread/thr_main_np.c4
-rw-r--r--lib/libthr/thread/thr_multi_np.c4
-rw-r--r--lib/libthr/thread/thr_mutex.c4
-rw-r--r--lib/libthr/thread/thr_mutexattr.c4
-rw-r--r--lib/libthr/thread/thr_once.c4
-rw-r--r--lib/libthr/thread/thr_printf.c2
-rw-r--r--lib/libthr/thread/thr_private.h4
-rw-r--r--lib/libthr/thread/thr_pspinlock.c2
-rw-r--r--lib/libthr/thread/thr_resume_np.c4
-rw-r--r--lib/libthr/thread/thr_rtld.c4
-rw-r--r--lib/libthr/thread/thr_rwlock.c2
-rw-r--r--lib/libthr/thread/thr_rwlockattr.c2
-rw-r--r--lib/libthr/thread/thr_self.c4
-rw-r--r--lib/libthr/thread/thr_sem.c4
-rw-r--r--lib/libthr/thread/thr_setprio.c4
-rw-r--r--lib/libthr/thread/thr_setschedparam.c4
-rw-r--r--lib/libthr/thread/thr_sig.c4
-rw-r--r--lib/libthr/thread/thr_single_np.c4
-rw-r--r--lib/libthr/thread/thr_sleepq.c4
-rw-r--r--lib/libthr/thread/thr_spec.c4
-rw-r--r--lib/libthr/thread/thr_spinlock.c4
-rw-r--r--lib/libthr/thread/thr_stack.c4
-rw-r--r--lib/libthr/thread/thr_suspend_np.c4
-rw-r--r--lib/libthr/thread/thr_switch_np.c4
-rw-r--r--lib/libthr/thread/thr_symbols.c4
-rw-r--r--lib/libthr/thread/thr_syscalls.c4
-rw-r--r--lib/libthr/thread/thr_umtx.c4
-rw-r--r--lib/libthr/thread/thr_umtx.h2
-rw-r--r--lib/libthr/thread/thr_yield.c4
-rw-r--r--lib/libthread_db/arch/amd64/libpthread_md.c4
-rw-r--r--lib/libthread_db/arch/arm/libpthread_md.c4
-rw-r--r--lib/libthread_db/arch/i386/libpthread_md.c4
-rw-r--r--lib/libthread_db/arch/mips/libpthread_md.c4
-rw-r--r--lib/libthread_db/arch/powerpc/libpthread_md.c4
-rw-r--r--lib/libthread_db/arch/sparc64/libpthread_md.c4
-rw-r--r--lib/libthread_db/kse.h2
-rw-r--r--lib/libthread_db/libpthread_db.c4
-rw-r--r--lib/libthread_db/libpthread_db.h4
-rw-r--r--lib/libthread_db/libthr_db.c4
-rw-r--r--lib/libthread_db/thread_db.c4
-rw-r--r--lib/libthread_db/thread_db.h4
-rw-r--r--lib/libthread_db/thread_db_int.h4
-rw-r--r--lib/libufs/block.c4
-rw-r--r--lib/libufs/cgroup.c4
-rw-r--r--lib/libufs/inode.c4
-rw-r--r--lib/libufs/libufs.h4
-rw-r--r--lib/libufs/sblock.c4
-rw-r--r--lib/libufs/type.c4
-rw-r--r--lib/libugidfw/ugidfw.c2
-rw-r--r--lib/libugidfw/ugidfw.h2
-rw-r--r--lib/libulog/ulog.h2
-rw-r--r--lib/libulog/ulog_login.c2
-rw-r--r--lib/libulog/ulog_login_pseudo.c2
-rw-r--r--lib/libulog/utempter.c2
-rw-r--r--lib/libulog/utempter.h2
-rw-r--r--lib/libusb/libusb.h2
-rw-r--r--lib/libusb/libusb01.c2
-rw-r--r--lib/libusb/libusb10.c2
-rw-r--r--lib/libusb/libusb10.h2
-rw-r--r--lib/libusb/libusb10_desc.c2
-rw-r--r--lib/libusb/libusb10_io.c2
-rw-r--r--lib/libusb/libusb20.c2
-rw-r--r--lib/libusb/libusb20.h2
-rw-r--r--lib/libusb/libusb20_desc.c2
-rw-r--r--lib/libusb/libusb20_desc.h2
-rw-r--r--lib/libusb/libusb20_int.h2
-rw-r--r--lib/libusb/libusb20_ugen20.c2
-rw-r--r--lib/libusb/libusb_global_linux.h2
-rw-r--r--lib/libusb/usb.h2
-rw-r--r--lib/libusbhid/data.c4
-rw-r--r--lib/libusbhid/descr.c4
-rw-r--r--lib/libusbhid/descr_compat.c4
-rw-r--r--lib/libusbhid/parse.c4
-rw-r--r--lib/libusbhid/usage.c4
-rw-r--r--lib/libusbhid/usbhid.h4
-rw-r--r--lib/libusbhid/usbvar.h4
-rw-r--r--lib/libutil/auth.c4
-rw-r--r--lib/libutil/expand_number.c2
-rw-r--r--lib/libutil/fparseln.c4
-rw-r--r--lib/libutil/gr_util.c2
-rw-r--r--lib/libutil/hexdump.c2
-rw-r--r--lib/libutil/humanize_number.c4
-rw-r--r--lib/libutil/kinfo_getallproc.c2
-rw-r--r--lib/libutil/kinfo_getproc.c2
-rw-r--r--lib/libutil/kld.c2
-rw-r--r--lib/libutil/libutil.h4
-rw-r--r--lib/libutil/login_crypt.c2
-rw-r--r--lib/libutil/login_tty.c2
-rw-r--r--lib/libutil/pidfile.c2
-rw-r--r--lib/libutil/property.c4
-rw-r--r--lib/libutil/pty.c2
-rw-r--r--lib/libutil/pw_util.c4
-rw-r--r--lib/libutil/quotafile.c2
-rw-r--r--lib/libutil/realhostname.c2
-rw-r--r--lib/libutil/stub.c2
-rw-r--r--lib/libutil/trimdomain.c2
-rw-r--r--lib/libutil/uucplock.c4
-rw-r--r--lib/libvgl/bitmap.c2
-rw-r--r--lib/libvgl/keyboard.c2
-rw-r--r--lib/libvgl/main.c2
-rw-r--r--lib/libvgl/mouse.c2
-rw-r--r--lib/libvgl/simple.c2
-rw-r--r--lib/libvgl/text.c2
-rw-r--r--lib/libvgl/vgl.h2
-rw-r--r--lib/libvmmapi/vmmapi.c2
-rw-r--r--lib/libvmmapi/vmmapi.h2
-rw-r--r--lib/libvmmapi/vmmapi_freebsd.c2
-rw-r--r--lib/liby/main.c2
-rw-r--r--lib/liby/yyerror.c2
-rw-r--r--lib/libypclnt/ypclnt.h2
-rw-r--r--lib/libypclnt/ypclnt_connect.c2
-rw-r--r--lib/libypclnt/ypclnt_error.c2
-rw-r--r--lib/libypclnt/ypclnt_free.c2
-rw-r--r--lib/libypclnt/ypclnt_get.c2
-rw-r--r--lib/libypclnt/ypclnt_new.c2
-rw-r--r--lib/libypclnt/ypclnt_passwd.c2
-rw-r--r--lib/msun/amd64/fenv.c2
-rw-r--r--lib/msun/arm/fenv.c2
-rw-r--r--lib/msun/arm/fenv.h2
-rw-r--r--lib/msun/bsdsrc/b_exp.c4
-rw-r--r--lib/msun/bsdsrc/b_log.c4
-rw-r--r--lib/msun/bsdsrc/b_tgamma.c2
-rw-r--r--lib/msun/bsdsrc/mathimpl.h4
-rw-r--r--lib/msun/i387/fenv.c2
-rw-r--r--lib/msun/i387/invtrig.c2
-rw-r--r--lib/msun/ld128/invtrig.c2
-rw-r--r--lib/msun/ld128/invtrig.h2
-rw-r--r--lib/msun/ld128/k_expl.h2
-rw-r--r--lib/msun/ld128/s_exp2l.c2
-rw-r--r--lib/msun/ld128/s_expl.c2
-rw-r--r--lib/msun/ld128/s_logl.c2
-rw-r--r--lib/msun/ld128/s_nanl.c2
-rw-r--r--lib/msun/ld80/invtrig.c2
-rw-r--r--lib/msun/ld80/invtrig.h2
-rw-r--r--lib/msun/ld80/k_expl.h2
-rw-r--r--lib/msun/ld80/s_exp2l.c2
-rw-r--r--lib/msun/ld80/s_expl.c2
-rw-r--r--lib/msun/ld80/s_logl.c2
-rw-r--r--lib/msun/ld80/s_nanl.c2
-rw-r--r--lib/msun/mips/fenv.c2
-rw-r--r--lib/msun/mips/fenv.h2
-rw-r--r--lib/msun/powerpc/fenv.c2
-rw-r--r--lib/msun/powerpc/fenv.h2
-rw-r--r--lib/msun/sparc64/fenv.c2
-rw-r--r--lib/msun/sparc64/fenv.h2
-rw-r--r--lib/msun/src/catrig.c2
-rw-r--r--lib/msun/src/catrigf.c2
-rw-r--r--lib/msun/src/e_remainderl.c2
-rw-r--r--lib/msun/src/e_sqrtl.c2
-rw-r--r--lib/msun/src/fenv-softfloat.h2
-rw-r--r--lib/msun/src/imprecise.c2
-rw-r--r--lib/msun/src/k_exp.c2
-rw-r--r--lib/msun/src/k_expf.c2
-rw-r--r--lib/msun/src/s_carg.c2
-rw-r--r--lib/msun/src/s_cargf.c2
-rw-r--r--lib/msun/src/s_cargl.c2
-rw-r--r--lib/msun/src/s_ccosh.c2
-rw-r--r--lib/msun/src/s_ccoshf.c2
-rw-r--r--lib/msun/src/s_cexp.c2
-rw-r--r--lib/msun/src/s_cexpf.c2
-rw-r--r--lib/msun/src/s_cimag.c2
-rw-r--r--lib/msun/src/s_cimagf.c2
-rw-r--r--lib/msun/src/s_cimagl.c2
-rw-r--r--lib/msun/src/s_conj.c2
-rw-r--r--lib/msun/src/s_conjf.c2
-rw-r--r--lib/msun/src/s_conjl.c2
-rw-r--r--lib/msun/src/s_copysignl.c2
-rw-r--r--lib/msun/src/s_cosl.c2
-rw-r--r--lib/msun/src/s_cproj.c2
-rw-r--r--lib/msun/src/s_cprojf.c2
-rw-r--r--lib/msun/src/s_cprojl.c2
-rw-r--r--lib/msun/src/s_creal.c2
-rw-r--r--lib/msun/src/s_crealf.c2
-rw-r--r--lib/msun/src/s_creall.c2
-rw-r--r--lib/msun/src/s_csinh.c2
-rw-r--r--lib/msun/src/s_csinhf.c2
-rw-r--r--lib/msun/src/s_csqrt.c2
-rw-r--r--lib/msun/src/s_csqrtf.c2
-rw-r--r--lib/msun/src/s_csqrtl.c2
-rw-r--r--lib/msun/src/s_ctanh.c2
-rw-r--r--lib/msun/src/s_ctanhf.c2
-rw-r--r--lib/msun/src/s_exp2.c2
-rw-r--r--lib/msun/src/s_exp2f.c2
-rw-r--r--lib/msun/src/s_fabsl.c2
-rw-r--r--lib/msun/src/s_fdim.c2
-rw-r--r--lib/msun/src/s_fma.c2
-rw-r--r--lib/msun/src/s_fmaf.c2
-rw-r--r--lib/msun/src/s_fmal.c2
-rw-r--r--lib/msun/src/s_fmax.c2
-rw-r--r--lib/msun/src/s_fmaxf.c2
-rw-r--r--lib/msun/src/s_fmaxl.c2
-rw-r--r--lib/msun/src/s_fmin.c2
-rw-r--r--lib/msun/src/s_fminf.c2
-rw-r--r--lib/msun/src/s_fminl.c2
-rw-r--r--lib/msun/src/s_frexpl.c2
-rw-r--r--lib/msun/src/s_isfinite.c2
-rw-r--r--lib/msun/src/s_isnan.c2
-rw-r--r--lib/msun/src/s_isnormal.c2
-rw-r--r--lib/msun/src/s_lrint.c2
-rw-r--r--lib/msun/src/s_lround.c2
-rw-r--r--lib/msun/src/s_modfl.c2
-rw-r--r--lib/msun/src/s_nan.c2
-rw-r--r--lib/msun/src/s_nearbyint.c2
-rw-r--r--lib/msun/src/s_rintl.c2
-rw-r--r--lib/msun/src/s_round.c2
-rw-r--r--lib/msun/src/s_roundf.c2
-rw-r--r--lib/msun/src/s_roundl.c2
-rw-r--r--lib/msun/src/s_scalbln.c2
-rw-r--r--lib/msun/src/s_signbit.c2
-rw-r--r--lib/msun/src/s_sinl.c2
-rw-r--r--lib/msun/src/s_tanl.c2
-rw-r--r--lib/msun/src/s_tgammaf.c2
-rw-r--r--lib/msun/x86/fenv.h2
-rw-r--r--lib/ncurses/ncurses/pathnames.h4
-rw-r--r--lib/ncurses/ncurses/termcap.c4
-rw-r--r--libexec/bootpd/rtmsg.c4
-rw-r--r--libexec/comsat/comsat.c4
-rw-r--r--libexec/fingerd/fingerd.c4
-rw-r--r--libexec/fingerd/pathnames.h4
-rw-r--r--libexec/ftpd/extern.h2
-rw-r--r--libexec/ftpd/ftpcmd.y4
-rw-r--r--libexec/ftpd/ftpd.c4
-rw-r--r--libexec/ftpd/logwtmp.c4
-rw-r--r--libexec/ftpd/pathnames.h4
-rw-r--r--libexec/ftpd/popen.c4
-rw-r--r--libexec/getty/extern.h4
-rw-r--r--libexec/getty/gettytab.h4
-rw-r--r--libexec/getty/init.c4
-rw-r--r--libexec/getty/main.c2
-rw-r--r--libexec/getty/pathnames.h4
-rw-r--r--libexec/getty/subr.c4
-rw-r--r--libexec/mknetid/hash.c4
-rw-r--r--libexec/mknetid/hash.h4
-rw-r--r--libexec/mknetid/mknetid.c4
-rw-r--r--libexec/mknetid/parse_group.c4
-rw-r--r--libexec/rbootd/bpf.c4
-rw-r--r--libexec/rbootd/conf.c4
-rw-r--r--libexec/rbootd/defs.h4
-rw-r--r--libexec/rbootd/parseconf.c4
-rw-r--r--libexec/rbootd/pathnames.h4
-rw-r--r--libexec/rbootd/rbootd.c4
-rw-r--r--libexec/rbootd/rmp.h4
-rw-r--r--libexec/rbootd/rmp_var.h4
-rw-r--r--libexec/rbootd/rmpproto.c4
-rw-r--r--libexec/rbootd/utils.c4
-rw-r--r--libexec/revnetgroup/hash.c4
-rw-r--r--libexec/revnetgroup/hash.h4
-rw-r--r--libexec/revnetgroup/parse_netgroup.c4
-rw-r--r--libexec/revnetgroup/revnetgroup.c4
-rw-r--r--libexec/rpc.rstatd/rstatd.c2
-rw-r--r--libexec/rpc.rusersd/extern.h2
-rw-r--r--libexec/rpc.rusersd/rusers_proc.c2
-rw-r--r--libexec/rpc.rusersd/rusersd.c2
-rw-r--r--libexec/rtld-elf/malloc.c2
-rw-r--r--libexec/rtld-elf/rtld_printf.c2
-rw-r--r--libexec/talkd/announce.c4
-rw-r--r--libexec/talkd/print.c4
-rw-r--r--libexec/talkd/process.c4
-rw-r--r--libexec/talkd/table.c4
-rw-r--r--libexec/talkd/talkd.c2
-rw-r--r--libexec/tftpd/tftpd.c4
-rw-r--r--libexec/ypxfr/yp_dbwrite.c4
-rw-r--r--libexec/ypxfr/ypxfr_extern.h4
-rw-r--r--libexec/ypxfr/ypxfr_getmap.c4
-rw-r--r--libexec/ypxfr/ypxfr_main.c4
-rw-r--r--libexec/ypxfr/ypxfr_misc.c4
-rw-r--r--libexec/ypxfr/ypxfrd_getmap.c4
-rw-r--r--release/picobsd/tinyware/login/pathnames.h2
-rw-r--r--release/picobsd/tinyware/login/pico-login.c2
-rw-r--r--release/picobsd/tinyware/passwd/extern.h4
-rw-r--r--release/picobsd/tinyware/passwd/local_passwd.c2
-rw-r--r--release/picobsd/tinyware/passwd/passwd.c4
-rw-r--r--release/picobsd/tinyware/passwd/pw_copy.c2
-rw-r--r--release/picobsd/tinyware/passwd/pw_util.c2
-rw-r--r--release/picobsd/tinyware/passwd/pw_util.h2
-rw-r--r--sbin/bsdlabel/bsdlabel.c4
-rw-r--r--sbin/bsdlabel/pathnames.h4
-rw-r--r--sbin/clri/clri.c4
-rw-r--r--sbin/devd/devd.cc2
-rw-r--r--sbin/dhclient/alloc.c4
-rw-r--r--sbin/dhclient/bpf.c4
-rw-r--r--sbin/dhclient/clparse.c4
-rw-r--r--sbin/dhclient/conflex.c4
-rw-r--r--sbin/dhclient/convert.c4
-rw-r--r--sbin/dhclient/dhclient.c4
-rw-r--r--sbin/dhclient/dhcp.h4
-rw-r--r--sbin/dhclient/dhcpd.h4
-rw-r--r--sbin/dhclient/dispatch.c4
-rw-r--r--sbin/dhclient/errwarn.c4
-rw-r--r--sbin/dhclient/hash.c4
-rw-r--r--sbin/dhclient/inet.c4
-rw-r--r--sbin/dhclient/options.c4
-rw-r--r--sbin/dhclient/packet.c4
-rw-r--r--sbin/dhclient/parse.c4
-rw-r--r--sbin/dhclient/tables.c4
-rw-r--r--sbin/dhclient/tree.c4
-rw-r--r--sbin/dmesg/dmesg.c2
-rw-r--r--sbin/dump/dump.h2
-rw-r--r--sbin/dump/dumprmt.c2
-rw-r--r--sbin/dump/itime.c2
-rw-r--r--sbin/dump/main.c2
-rw-r--r--sbin/dump/optr.c2
-rw-r--r--sbin/dump/pathnames.h4
-rw-r--r--sbin/dump/tape.c2
-rw-r--r--sbin/dump/traverse.c2
-rw-r--r--sbin/dump/unctime.c2
-rw-r--r--sbin/dumpfs/dumpfs.c2
-rw-r--r--sbin/dumpon/dumpon.c4
-rw-r--r--sbin/etherswitchcfg/ifmedia.c4
-rw-r--r--sbin/ffsinfo/ffsinfo.c4
-rw-r--r--sbin/fsck/fsck.c4
-rw-r--r--sbin/fsck/fsutil.c4
-rw-r--r--sbin/fsck/preen.c4
-rw-r--r--sbin/fsck_ffs/dir.c4
-rw-r--r--sbin/fsck_ffs/fsck.h4
-rw-r--r--sbin/fsck_ffs/fsutil.c4
-rw-r--r--sbin/fsck_ffs/gjournal.c2
-rw-r--r--sbin/fsck_ffs/globs.c4
-rw-r--r--sbin/fsck_ffs/inode.c4
-rw-r--r--sbin/fsck_ffs/main.c4
-rw-r--r--sbin/fsck_ffs/pass1.c4
-rw-r--r--sbin/fsck_ffs/pass1b.c4
-rw-r--r--sbin/fsck_ffs/pass2.c4
-rw-r--r--sbin/fsck_ffs/pass3.c4
-rw-r--r--sbin/fsck_ffs/pass4.c4
-rw-r--r--sbin/fsck_ffs/pass5.c4
-rw-r--r--sbin/fsck_ffs/setup.c4
-rw-r--r--sbin/fsck_ffs/utilities.c4
-rw-r--r--sbin/growfs/debug.c4
-rw-r--r--sbin/growfs/debug.h4
-rw-r--r--sbin/growfs/growfs.c4
-rw-r--r--sbin/gvinum/gvinum.h2
-rw-r--r--sbin/ifconfig/af_inet.c4
-rw-r--r--sbin/ifconfig/af_inet6.c4
-rw-r--r--sbin/ifconfig/af_link.c4
-rw-r--r--sbin/ifconfig/ifclone.c4
-rw-r--r--sbin/ifconfig/ifconfig.c4
-rw-r--r--sbin/ifconfig/ifmedia.c4
-rw-r--r--sbin/ifconfig/ifvlan.c4
-rw-r--r--sbin/init/init.c2
-rw-r--r--sbin/init/pathnames.h2
-rw-r--r--sbin/mknod/mknod.c2
-rw-r--r--sbin/mount/getmntopts.c2
-rw-r--r--sbin/mount/mntopts.h2
-rw-r--r--sbin/mount/mount.c2
-rw-r--r--sbin/mount/mount_fs.c4
-rw-r--r--sbin/mount/pathnames.h4
-rw-r--r--sbin/mount/vfslist.c2
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c4
-rw-r--r--sbin/mount_nfs/mount_nfs.c4
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c4
-rw-r--r--sbin/mount_udf/mount_udf.c4
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c2
-rw-r--r--sbin/newfs/mkfs.c4
-rw-r--r--sbin/newfs/newfs.c4
-rw-r--r--sbin/newfs/newfs.h4
-rw-r--r--sbin/nfsiod/nfsiod.c4
-rw-r--r--sbin/ping/ping.c4
-rw-r--r--sbin/ping6/ping6.c4
-rw-r--r--sbin/quotacheck/preen.c4
-rw-r--r--sbin/quotacheck/quotacheck.c4
-rw-r--r--sbin/quotacheck/quotacheck.h4
-rw-r--r--sbin/rcorder/ealloc.c4
-rw-r--r--sbin/rcorder/hash.c4
-rw-r--r--sbin/rcorder/hash.h4
-rw-r--r--sbin/reboot/reboot.c4
-rw-r--r--sbin/restore/dirs.c4
-rw-r--r--sbin/restore/extern.h2
-rw-r--r--sbin/restore/interactive.c4
-rw-r--r--sbin/restore/main.c4
-rw-r--r--sbin/restore/restore.c4
-rw-r--r--sbin/restore/restore.h2
-rw-r--r--sbin/restore/symtab.c4
-rw-r--r--sbin/restore/tape.c4
-rw-r--r--sbin/restore/utilities.c4
-rw-r--r--sbin/route/route.c4
-rw-r--r--sbin/routed/defs.h4
-rw-r--r--sbin/routed/if.c4
-rw-r--r--sbin/routed/input.c4
-rw-r--r--sbin/routed/main.c4
-rw-r--r--sbin/routed/output.c4
-rw-r--r--sbin/routed/parms.c4
-rw-r--r--sbin/routed/pathnames.h4
-rw-r--r--sbin/routed/radix.c4
-rw-r--r--sbin/routed/radix.h4
-rw-r--r--sbin/routed/rdisc.c4
-rw-r--r--sbin/routed/rtquery/rtquery.c2
-rw-r--r--sbin/routed/table.c4
-rw-r--r--sbin/routed/trace.c4
-rw-r--r--sbin/savecore/savecore.c2
-rw-r--r--sbin/setkey/parse.y4
-rw-r--r--sbin/setkey/setkey.c4
-rw-r--r--sbin/setkey/test-pfkey.c4
-rw-r--r--sbin/setkey/test-policy.c4
-rw-r--r--sbin/setkey/token.l4
-rw-r--r--sbin/setkey/vchar.h4
-rw-r--r--sbin/shutdown/shutdown.c4
-rw-r--r--sbin/sunlabel/sunlabel.c4
-rw-r--r--sbin/swapon/swapon.c2
-rw-r--r--sbin/sysctl/sysctl.c4
-rw-r--r--sbin/tunefs/tunefs.c4
-rw-r--r--sbin/umount/umount.c2
-rw-r--r--share/examples/tests/tests/atf/cp_test.sh2
-rw-r--r--share/examples/tests/tests/atf/printf_test.c2
-rw-r--r--share/examples/tests/tests/plain/printf_test.c5
-rw-r--r--sys/amd64/acpica/acpi_machdep.c2
-rw-r--r--sys/amd64/amd64/atomic.c2
-rw-r--r--sys/amd64/amd64/bios.c2
-rw-r--r--sys/amd64/amd64/bpf_jit_machdep.c2
-rw-r--r--sys/amd64/amd64/bpf_jit_machdep.h2
-rw-r--r--sys/amd64/amd64/elf_machdep.c2
-rw-r--r--sys/amd64/amd64/fpu.c2
-rw-r--r--sys/amd64/amd64/gdb_machdep.c2
-rw-r--r--sys/amd64/amd64/genassym.c2
-rw-r--r--sys/amd64/amd64/in_cksum.c2
-rw-r--r--sys/amd64/amd64/initcpu.c2
-rw-r--r--sys/amd64/amd64/io.c2
-rw-r--r--sys/amd64/amd64/machdep.c2
-rw-r--r--sys/amd64/amd64/mem.c2
-rw-r--r--sys/amd64/amd64/minidump_machdep.c2
-rw-r--r--sys/amd64/amd64/mp_machdep.c2
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/amd64/amd64/prof_machdep.c2
-rw-r--r--sys/amd64/amd64/ptrace_machdep.c2
-rw-r--r--sys/amd64/amd64/sys_machdep.c2
-rw-r--r--sys/amd64/amd64/trap.c2
-rw-r--r--sys/amd64/amd64/uio_machdep.c2
-rw-r--r--sys/amd64/amd64/uma_machdep.c2
-rw-r--r--sys/amd64/amd64/vm_machdep.c2
-rw-r--r--sys/amd64/ia32/ia32_misc.c2
-rw-r--r--sys/amd64/ia32/ia32_reg.c2
-rw-r--r--sys/amd64/ia32/ia32_signal.c2
-rw-r--r--sys/amd64/ia32/ia32_syscall.c2
-rw-r--r--sys/amd64/include/_bus.h2
-rw-r--r--sys/amd64/include/asm.h2
-rw-r--r--sys/amd64/include/asmacros.h2
-rw-r--r--sys/amd64/include/atomic.h2
-rw-r--r--sys/amd64/include/bus_dma.h2
-rw-r--r--sys/amd64/include/counter.h2
-rw-r--r--sys/amd64/include/cpu.h2
-rw-r--r--sys/amd64/include/cpufunc.h2
-rw-r--r--sys/amd64/include/exec.h2
-rw-r--r--sys/amd64/include/floatingpoint.h2
-rw-r--r--sys/amd64/include/fpu.h2
-rw-r--r--sys/amd64/include/gdb_machdep.h2
-rw-r--r--sys/amd64/include/ieeefp.h2
-rw-r--r--sys/amd64/include/in_cksum.h2
-rw-r--r--sys/amd64/include/intr_machdep.h2
-rw-r--r--sys/amd64/include/iodev.h2
-rw-r--r--sys/amd64/include/kdb.h2
-rw-r--r--sys/amd64/include/limits.h2
-rw-r--r--sys/amd64/include/md_var.h2
-rw-r--r--sys/amd64/include/memdev.h2
-rw-r--r--sys/amd64/include/minidump.h2
-rw-r--r--sys/amd64/include/mp_watchdog.h2
-rw-r--r--sys/amd64/include/param.h2
-rw-r--r--sys/amd64/include/pc/bios.h2
-rw-r--r--sys/amd64/include/pcb.h2
-rw-r--r--sys/amd64/include/pcpu.h2
-rw-r--r--sys/amd64/include/pmap.h2
-rw-r--r--sys/amd64/include/pmc_mdep.h2
-rw-r--r--sys/amd64/include/ppireg.h2
-rw-r--r--sys/amd64/include/proc.h2
-rw-r--r--sys/amd64/include/profile.h2
-rw-r--r--sys/amd64/include/reloc.h2
-rw-r--r--sys/amd64/include/runq.h2
-rw-r--r--sys/amd64/include/segments.h2
-rw-r--r--sys/amd64/include/sf_buf.h2
-rw-r--r--sys/amd64/include/timerreg.h2
-rw-r--r--sys/amd64/include/tss.h2
-rw-r--r--sys/amd64/include/varargs.h2
-rw-r--r--sys/amd64/include/vm.h2
-rw-r--r--sys/amd64/include/vmm.h2
-rw-r--r--sys/amd64/include/vmm_dev.h2
-rw-r--r--sys/amd64/include/vmm_instruction_emul.h2
-rw-r--r--sys/amd64/include/vmparam.h2
-rw-r--r--sys/amd64/linux32/linux.h2
-rw-r--r--sys/amd64/linux32/linux32_dummy.c28
-rw-r--r--sys/amd64/linux32/linux32_machdep.c2
-rw-r--r--sys/amd64/linux32/linux32_sysvec.c2
-rw-r--r--sys/amd64/pci/pci_cfgreg.c2
-rw-r--r--sys/amd64/vmm/amd/amdv.c2
-rw-r--r--sys/amd64/vmm/intel/ept.c2
-rw-r--r--sys/amd64/vmm/intel/ept.h2
-rw-r--r--sys/amd64/vmm/intel/vmcs.c2
-rw-r--r--sys/amd64/vmm/intel/vmcs.h2
-rw-r--r--sys/amd64/vmm/intel/vmx.c2
-rw-r--r--sys/amd64/vmm/intel/vmx.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_controls.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_cpufunc.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_genassym.c2
-rw-r--r--sys/amd64/vmm/intel/vmx_msr.c2
-rw-r--r--sys/amd64/vmm/intel/vmx_msr.h2
-rw-r--r--sys/amd64/vmm/intel/vtd.c2
-rw-r--r--sys/amd64/vmm/io/iommu.c2
-rw-r--r--sys/amd64/vmm/io/iommu.h2
-rw-r--r--sys/amd64/vmm/io/ppt.c2
-rw-r--r--sys/amd64/vmm/io/ppt.h2
-rw-r--r--sys/amd64/vmm/io/vhpet.c2
-rw-r--r--sys/amd64/vmm/io/vhpet.h2
-rw-r--r--sys/amd64/vmm/io/vioapic.c2
-rw-r--r--sys/amd64/vmm/io/vioapic.h2
-rw-r--r--sys/amd64/vmm/io/vlapic.c2
-rw-r--r--sys/amd64/vmm/io/vlapic.h2
-rw-r--r--sys/amd64/vmm/io/vlapic_priv.h2
-rw-r--r--sys/amd64/vmm/vmm.c2
-rw-r--r--sys/amd64/vmm/vmm_dev.c2
-rw-r--r--sys/amd64/vmm/vmm_host.c2
-rw-r--r--sys/amd64/vmm/vmm_host.h2
-rw-r--r--sys/amd64/vmm/vmm_instruction_emul.c2
-rw-r--r--sys/amd64/vmm/vmm_ktr.h2
-rw-r--r--sys/amd64/vmm/vmm_lapic.c2
-rw-r--r--sys/amd64/vmm/vmm_lapic.h2
-rw-r--r--sys/amd64/vmm/vmm_mem.c2
-rw-r--r--sys/amd64/vmm/vmm_mem.h2
-rw-r--r--sys/amd64/vmm/vmm_stat.c2
-rw-r--r--sys/amd64/vmm/vmm_stat.h2
-rw-r--r--sys/amd64/vmm/vmm_util.c2
-rw-r--r--sys/amd64/vmm/vmm_util.h2
-rw-r--r--sys/amd64/vmm/x86.c2
-rw-r--r--sys/amd64/vmm/x86.h2
-rw-r--r--sys/arm/allwinner/a10_ehci.c2
-rw-r--r--sys/arm/allwinner/a10_gpio.c2
-rw-r--r--sys/arm/allwinner/a10_sramc.c2
-rw-r--r--sys/arm/allwinner/a10_sramc.h2
-rw-r--r--sys/arm/allwinner/a20/a20_cpu_cfg.c2
-rw-r--r--sys/arm/allwinner/a20/a20_cpu_cfg.h2
-rw-r--r--sys/arm/allwinner/if_emac.c2
-rw-r--r--sys/arm/allwinner/if_emacreg.h4
-rw-r--r--sys/arm/arm/autoconf.c2
-rw-r--r--sys/arm/arm/bus_space_generic.c2
-rw-r--r--sys/arm/arm/busdma_machdep-v6.c2
-rw-r--r--sys/arm/arm/cpufunc.c2
-rw-r--r--sys/arm/arm/db_disasm.c2
-rw-r--r--sys/arm/arm/disassem.c2
-rw-r--r--sys/arm/arm/dump_machdep.c2
-rw-r--r--sys/arm/arm/elf_machdep.c2
-rw-r--r--sys/arm/arm/elf_trampoline.c2
-rw-r--r--sys/arm/arm/fiq.c2
-rw-r--r--sys/arm/arm/gdb_machdep.c2
-rw-r--r--sys/arm/arm/genassym.c2
-rw-r--r--sys/arm/arm/generic_timer.c2
-rw-r--r--sys/arm/arm/gic.c2
-rw-r--r--sys/arm/arm/in_cksum.c2
-rw-r--r--sys/arm/arm/intr.c2
-rw-r--r--sys/arm/arm/machdep.c2
-rw-r--r--sys/arm/arm/mem.c2
-rw-r--r--sys/arm/arm/minidump_machdep.c2
-rw-r--r--sys/arm/arm/mp_machdep.c2
-rw-r--r--sys/arm/arm/mpcore_timer.c2
-rw-r--r--sys/arm/arm/physmem.c2
-rw-r--r--sys/arm/arm/pl310.c2
-rw-r--r--sys/arm/arm/pmap-v6.c2
-rw-r--r--sys/arm/arm/sc_machdep.c2
-rw-r--r--sys/arm/arm/stack_machdep.c2
-rw-r--r--sys/arm/arm/stdatomic.c2
-rw-r--r--sys/arm/arm/sys_machdep.c2
-rw-r--r--sys/arm/arm/uio_machdep.c2
-rw-r--r--sys/arm/arm/undefined.c2
-rw-r--r--sys/arm/arm/vfp.c2
-rw-r--r--sys/arm/arm/vm_machdep.c2
-rw-r--r--sys/arm/at91/at91.c2
-rw-r--r--sys/arm/at91/at91_aic.c2
-rw-r--r--sys/arm/at91/at91_aicreg.h2
-rw-r--r--sys/arm/at91/at91_cfata.c2
-rw-r--r--sys/arm/at91/at91_gpio.h2
-rw-r--r--sys/arm/at91/at91_machdep.c2
-rw-r--r--sys/arm/at91/at91_mci.c2
-rw-r--r--sys/arm/at91/at91_mcireg.h2
-rw-r--r--sys/arm/at91/at91_pdcreg.h2
-rw-r--r--sys/arm/at91/at91_pio.c2
-rw-r--r--sys/arm/at91/at91_pio_sam9g45.h2
-rw-r--r--sys/arm/at91/at91_pioreg.h2
-rw-r--r--sys/arm/at91/at91_piovar.h2
-rw-r--r--sys/arm/at91/at91_pit.c2
-rw-r--r--sys/arm/at91/at91_pitreg.h2
-rw-r--r--sys/arm/at91/at91_pmc.c2
-rw-r--r--sys/arm/at91/at91_pmcreg.h2
-rw-r--r--sys/arm/at91/at91_pmcvar.h2
-rw-r--r--sys/arm/at91/at91_rst.c2
-rw-r--r--sys/arm/at91/at91_rstreg.h2
-rw-r--r--sys/arm/at91/at91_rtc.c2
-rw-r--r--sys/arm/at91/at91_rtcreg.h2
-rw-r--r--sys/arm/at91/at91_sdramc.c2
-rw-r--r--sys/arm/at91/at91_shdwc.c2
-rw-r--r--sys/arm/at91/at91_smc.c2
-rw-r--r--sys/arm/at91/at91_smc.h2
-rw-r--r--sys/arm/at91/at91_spi.c2
-rw-r--r--sys/arm/at91/at91_spireg.h2
-rw-r--r--sys/arm/at91/at91_ssc.c2
-rw-r--r--sys/arm/at91/at91_sscreg.h2
-rw-r--r--sys/arm/at91/at91_st.c2
-rw-r--r--sys/arm/at91/at91_streg.h2
-rw-r--r--sys/arm/at91/at91_tcb.c2
-rw-r--r--sys/arm/at91/at91_twi.c2
-rw-r--r--sys/arm/at91/at91_twiio.h2
-rw-r--r--sys/arm/at91/at91_twireg.h2
-rw-r--r--sys/arm/at91/at91_usartreg.h2
-rw-r--r--sys/arm/at91/at91_wdt.c2
-rw-r--r--sys/arm/at91/at91_wdtreg.h2
-rw-r--r--sys/arm/at91/at91board.h2
-rw-r--r--sys/arm/at91/at91reg.h2
-rw-r--r--sys/arm/at91/at91rm9200.c2
-rw-r--r--sys/arm/at91/at91rm9200_devices.c2
-rw-r--r--sys/arm/at91/at91rm9200var.h2
-rw-r--r--sys/arm/at91/at91rm92reg.h2
-rw-r--r--sys/arm/at91/at91sam9260.c2
-rw-r--r--sys/arm/at91/at91sam9260reg.h2
-rw-r--r--sys/arm/at91/at91sam9g20.c2
-rw-r--r--sys/arm/at91/at91sam9g20reg.h2
-rw-r--r--sys/arm/at91/at91sam9g45.c2
-rw-r--r--sys/arm/at91/at91sam9g45reg.h2
-rw-r--r--sys/arm/at91/at91sam9x5.c2
-rw-r--r--sys/arm/at91/at91sam9x5reg.h2
-rw-r--r--sys/arm/at91/at91soc.c2
-rw-r--r--sys/arm/at91/at91soc.h2
-rw-r--r--sys/arm/at91/at91var.h2
-rw-r--r--sys/arm/at91/board_bwct.c2
-rw-r--r--sys/arm/at91/board_eb9200.c2
-rw-r--r--sys/arm/at91/board_ethernut5.c2
-rw-r--r--sys/arm/at91/board_hl200.c2
-rw-r--r--sys/arm/at91/board_hl201.c2
-rw-r--r--sys/arm/at91/board_kb920x.c2
-rw-r--r--sys/arm/at91/board_qila9g20.c2
-rw-r--r--sys/arm/at91/board_sam9260ek.c2
-rw-r--r--sys/arm/at91/board_sam9g20ek.c2
-rw-r--r--sys/arm/at91/board_sam9x25ek.c2
-rw-r--r--sys/arm/at91/board_sn9g45.c2
-rw-r--r--sys/arm/at91/board_tsc4370.c2
-rw-r--r--sys/arm/at91/if_ate.c2
-rw-r--r--sys/arm/at91/if_atereg.h2
-rw-r--r--sys/arm/at91/if_macb.c2
-rw-r--r--sys/arm/at91/uart_bus_at91usart.c2
-rw-r--r--sys/arm/at91/uart_cpu_at91usart.c2
-rw-r--r--sys/arm/at91/uart_dev_at91usart.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bsc.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bscreg.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bscvar.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.c4
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.h4
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fb.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fbd.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_gpio.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_gpio.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_intr.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_machdep.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_mbox.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_mbox.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_sdhci.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spi.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spireg.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spivar.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_systimer.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_vcbus.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.h2
-rw-r--r--sys/arm/conf/genboardid.awk2
-rw-r--r--sys/arm/freescale/fsl_ocotp.c2
-rw-r--r--sys/arm/freescale/fsl_ocotpreg.h2
-rw-r--r--sys/arm/freescale/fsl_ocotpvar.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ccm.c4
-rw-r--r--sys/arm/freescale/imx/imx51_ccmreg.h4
-rw-r--r--sys/arm/freescale/imx/imx51_ccmvar.h4
-rw-r--r--sys/arm/freescale/imx/imx51_dpllreg.h4
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3.c2
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3_fbd.c2
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3reg.h4
-rw-r--r--sys/arm/freescale/imx/imx51_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx51_sdmareg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ssireg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_tzicreg.h4
-rw-r--r--sys/arm/freescale/imx/imx53_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx6_anatop.c2
-rw-r--r--sys/arm/freescale/imx/imx6_anatopreg.h2
-rw-r--r--sys/arm/freescale/imx/imx6_anatopvar.h2
-rw-r--r--sys/arm/freescale/imx/imx6_ccm.c2
-rw-r--r--sys/arm/freescale/imx/imx6_ccmreg.h2
-rw-r--r--sys/arm/freescale/imx/imx6_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx6_mp.c2
-rw-r--r--sys/arm/freescale/imx/imx6_pl310.c2
-rw-r--r--sys/arm/freescale/imx/imx6_usbphy.c2
-rw-r--r--sys/arm/freescale/imx/imx_common.c2
-rw-r--r--sys/arm/freescale/imx/imx_gpt.c2
-rw-r--r--sys/arm/freescale/imx/imx_gptreg.h2
-rw-r--r--sys/arm/freescale/imx/imx_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx_machdep.h2
-rw-r--r--sys/arm/freescale/imx/imx_nop_usbphy.c2
-rw-r--r--sys/arm/freescale/imx/imx_wdog.c2
-rw-r--r--sys/arm/freescale/imx/imx_wdogreg.h2
-rw-r--r--sys/arm/freescale/imx/tzic.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_anadig.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_ccm.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_common.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_dcu4.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_dmamux.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_dmamux.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_edma.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_edma.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_ehci.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_gpio.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_i2c.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_iomuxc.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_iomuxc.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_machdep.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_mscm.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_nfc.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_port.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_port.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_sai.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_src.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_src.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_tcon.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_uart.c2
-rw-r--r--sys/arm/include/_align.h2
-rw-r--r--sys/arm/include/_bus.h2
-rw-r--r--sys/arm/include/_inttypes.h2
-rw-r--r--sys/arm/include/_limits.h2
-rw-r--r--sys/arm/include/_stdint.h2
-rw-r--r--sys/arm/include/_types.h2
-rw-r--r--sys/arm/include/armreg.h2
-rw-r--r--sys/arm/include/asm.h2
-rw-r--r--sys/arm/include/asmacros.h2
-rw-r--r--sys/arm/include/at91_gpio.h2
-rw-r--r--sys/arm/include/atags.h2
-rw-r--r--sys/arm/include/atomic.h2
-rw-r--r--sys/arm/include/blockio.h2
-rw-r--r--sys/arm/include/board.h2
-rw-r--r--sys/arm/include/bus.h2
-rw-r--r--sys/arm/include/bus_dma.h2
-rw-r--r--sys/arm/include/clock.h2
-rw-r--r--sys/arm/include/counter.h2
-rw-r--r--sys/arm/include/cpufunc.h2
-rw-r--r--sys/arm/include/disassem.h2
-rw-r--r--sys/arm/include/elf.h2
-rw-r--r--sys/arm/include/endian.h2
-rw-r--r--sys/arm/include/exec.h2
-rw-r--r--sys/arm/include/fdt.h2
-rw-r--r--sys/arm/include/fiq.h2
-rw-r--r--sys/arm/include/float.h2
-rw-r--r--sys/arm/include/floatingpoint.h2
-rw-r--r--sys/arm/include/frame.h2
-rw-r--r--sys/arm/include/gdb_machdep.h2
-rw-r--r--sys/arm/include/ieee.h2
-rw-r--r--sys/arm/include/in_cksum.h2
-rw-r--r--sys/arm/include/intr.h2
-rw-r--r--sys/arm/include/kdb.h2
-rw-r--r--sys/arm/include/limits.h2
-rw-r--r--sys/arm/include/md_var.h2
-rw-r--r--sys/arm/include/memdev.h2
-rw-r--r--sys/arm/include/metadata.h2
-rw-r--r--sys/arm/include/minidump.h2
-rw-r--r--sys/arm/include/ofw_machdep.h2
-rw-r--r--sys/arm/include/param.h2
-rw-r--r--sys/arm/include/pcb.h2
-rw-r--r--sys/arm/include/pcpu.h2
-rw-r--r--sys/arm/include/physmem.h2
-rw-r--r--sys/arm/include/pl310.h2
-rw-r--r--sys/arm/include/pmap.h2
-rw-r--r--sys/arm/include/pmc_mdep.h2
-rw-r--r--sys/arm/include/proc.h2
-rw-r--r--sys/arm/include/profile.h2
-rw-r--r--sys/arm/include/psl.h2
-rw-r--r--sys/arm/include/reloc.h2
-rw-r--r--sys/arm/include/runq.h2
-rw-r--r--sys/arm/include/sc_machdep.h2
-rw-r--r--sys/arm/include/sf_buf.h2
-rw-r--r--sys/arm/include/signal.h2
-rw-r--r--sys/arm/include/stdarg.h2
-rw-r--r--sys/arm/include/sysarch.h2
-rw-r--r--sys/arm/include/ucontext.h2
-rw-r--r--sys/arm/include/undefined.h2
-rw-r--r--sys/arm/include/utrap.h2
-rw-r--r--sys/arm/include/vdso.h2
-rw-r--r--sys/arm/include/vfp.h4
-rw-r--r--sys/arm/include/vm.h2
-rw-r--r--sys/arm/include/vmparam.h2
-rw-r--r--sys/arm/lpc/if_lpe.c2
-rw-r--r--sys/arm/lpc/if_lpereg.h2
-rw-r--r--sys/arm/lpc/lpc_dmac.c2
-rw-r--r--sys/arm/lpc/lpc_fb.c2
-rw-r--r--sys/arm/lpc/lpc_gpio.c2
-rw-r--r--sys/arm/lpc/lpc_intc.c2
-rw-r--r--sys/arm/lpc/lpc_machdep.c2
-rw-r--r--sys/arm/lpc/lpc_mmc.c2
-rw-r--r--sys/arm/lpc/lpc_ohci.c2
-rw-r--r--sys/arm/lpc/lpc_pll.c2
-rw-r--r--sys/arm/lpc/lpc_pwr.c2
-rw-r--r--sys/arm/lpc/lpc_rtc.c2
-rw-r--r--sys/arm/lpc/lpc_spi.c2
-rw-r--r--sys/arm/lpc/lpc_timer.c2
-rw-r--r--sys/arm/lpc/lpcreg.h2
-rw-r--r--sys/arm/lpc/lpcvar.h2
-rw-r--r--sys/arm/lpc/ssd1289.c2
-rw-r--r--sys/arm/mv/armadaxp/armadaxp.c2
-rw-r--r--sys/arm/mv/armadaxp/armadaxp_mp.c2
-rw-r--r--sys/arm/mv/discovery/discovery.c2
-rw-r--r--sys/arm/mv/gpio.c2
-rw-r--r--sys/arm/mv/ic.c2
-rw-r--r--sys/arm/mv/kirkwood/kirkwood.c2
-rw-r--r--sys/arm/mv/mpic.c2
-rw-r--r--sys/arm/mv/mv_common.c2
-rw-r--r--sys/arm/mv/mv_localbus.c2
-rw-r--r--sys/arm/mv/mv_machdep.c2
-rw-r--r--sys/arm/mv/mv_pci.c2
-rw-r--r--sys/arm/mv/mv_ts.c2
-rw-r--r--sys/arm/mv/mvreg.h2
-rw-r--r--sys/arm/mv/mvvar.h2
-rw-r--r--sys/arm/mv/mvwin.h2
-rw-r--r--sys/arm/mv/orion/db88f5xxx.c2
-rw-r--r--sys/arm/mv/orion/orion.c2
-rw-r--r--sys/arm/mv/rtc.c2
-rw-r--r--sys/arm/mv/timer.c2
-rw-r--r--sys/arm/rockchip/rk30xx_gpio.c2
-rw-r--r--sys/arm/rockchip/rk30xx_grf.c2
-rw-r--r--sys/arm/rockchip/rk30xx_grf.h2
-rw-r--r--sys/arm/rockchip/rk30xx_machdep.c2
-rw-r--r--sys/arm/rockchip/rk30xx_pmu.c2
-rw-r--r--sys/arm/rockchip/rk30xx_pmu.h2
-rw-r--r--sys/arm/rockchip/rk30xx_wdog.c2
-rw-r--r--sys/arm/rockchip/rk30xx_wdog.h2
-rw-r--r--sys/arm/samsung/exynos/exynos5_machdep.c2
-rw-r--r--sys/arm/samsung/exynos/exynos5_mp.c2
-rw-r--r--sys/arm/ti/aintc.c2
-rw-r--r--sys/arm/ti/am335x/am335x_dmtimer.c2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd.c2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd.h2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd_syscons.c2
-rw-r--r--sys/arm/ti/am335x/am335x_pmic.c2
-rw-r--r--sys/arm/ti/am335x/am335x_prcm.c2
-rw-r--r--sys/arm/ti/am335x/am335x_pwm.h2
-rw-r--r--sys/arm/ti/am335x/am335x_reg.h2
-rw-r--r--sys/arm/ti/am335x/am335x_scm.h2
-rw-r--r--sys/arm/ti/am335x/am335x_scm_padconf.c2
-rw-r--r--sys/arm/ti/am335x/am335x_usbss.c2
-rw-r--r--sys/arm/ti/cpsw/if_cpsw.c2
-rw-r--r--sys/arm/ti/cpsw/if_cpswreg.h2
-rw-r--r--sys/arm/ti/cpsw/if_cpswvar.h2
-rw-r--r--sys/arm/ti/omap4/omap4_l2cache.c2
-rw-r--r--sys/arm/ti/omap4/omap4_mp.c2
-rw-r--r--sys/arm/ti/omap4/omap4_prcm_clks.c2
-rw-r--r--sys/arm/ti/omap4/omap4_reg.h2
-rw-r--r--sys/arm/ti/omap4/omap4_scm_padconf.c2
-rw-r--r--sys/arm/ti/omap4/omap4_smc.h2
-rw-r--r--sys/arm/ti/omap4/pandaboard/pandaboard.c2
-rw-r--r--sys/arm/ti/ti_cpuid.c2
-rw-r--r--sys/arm/ti/ti_cpuid.h2
-rw-r--r--sys/arm/ti/ti_edma3.c2
-rw-r--r--sys/arm/ti/ti_edma3.h2
-rw-r--r--sys/arm/ti/ti_gpio.c2
-rw-r--r--sys/arm/ti/ti_i2c.c2
-rw-r--r--sys/arm/ti/ti_i2c.h2
-rw-r--r--sys/arm/ti/ti_machdep.c2
-rw-r--r--sys/arm/ti/ti_mbox.c2
-rw-r--r--sys/arm/ti/ti_mbox.h2
-rw-r--r--sys/arm/ti/ti_prcm.c4
-rw-r--r--sys/arm/ti/ti_prcm.h4
-rw-r--r--sys/arm/ti/ti_pruss.c2
-rw-r--r--sys/arm/ti/ti_pruss.h2
-rw-r--r--sys/arm/ti/ti_scm.c4
-rw-r--r--sys/arm/ti/ti_scm.h4
-rw-r--r--sys/arm/ti/ti_sdhci.c2
-rw-r--r--sys/arm/ti/ti_sdma.c2
-rw-r--r--sys/arm/ti/ti_sdma.h2
-rw-r--r--sys/arm/ti/ti_sdmareg.h2
-rw-r--r--sys/arm/ti/ti_smc.h2
-rw-r--r--sys/arm/ti/tivar.h4
-rw-r--r--sys/arm/ti/twl/twl.c2
-rw-r--r--sys/arm/ti/twl/twl.h2
-rw-r--r--sys/arm/ti/twl/twl_clks.c2
-rw-r--r--sys/arm/ti/twl/twl_clks.h2
-rw-r--r--sys/arm/ti/twl/twl_vreg.c2
-rw-r--r--sys/arm/ti/twl/twl_vreg.h2
-rw-r--r--sys/arm/ti/usb/omap_ehci.c2
-rw-r--r--sys/arm/ti/usb/omap_usb.h4
-rw-r--r--sys/arm/xilinx/uart_dev_cdnc.c2
-rw-r--r--sys/arm/xilinx/zy7_devcfg.c2
-rw-r--r--sys/arm/xilinx/zy7_ehci.c2
-rw-r--r--sys/arm/xilinx/zy7_gpio.c2
-rw-r--r--sys/arm/xilinx/zy7_l2cache.c2
-rw-r--r--sys/arm/xilinx/zy7_machdep.c2
-rw-r--r--sys/arm/xilinx/zy7_reg.h2
-rw-r--r--sys/arm/xilinx/zy7_slcr.c2
-rw-r--r--sys/arm/xilinx/zy7_slcr.h2
-rw-r--r--sys/arm/xscale/i8134x/crb_machdep.c2
-rw-r--r--sys/arm/xscale/i8134x/i81342.c2
-rw-r--r--sys/arm/xscale/i8134x/i81342_mcu.c2
-rw-r--r--sys/arm/xscale/i8134x/i81342_pci.c2
-rw-r--r--sys/arm/xscale/i8134x/i81342_space.c2
-rw-r--r--sys/arm/xscale/i8134x/i81342reg.h2
-rw-r--r--sys/arm/xscale/i8134x/i81342var.h2
-rw-r--r--sys/arm/xscale/i8134x/iq81342_7seg.c2
-rw-r--r--sys/arm/xscale/i8134x/iq81342reg.h2
-rw-r--r--sys/arm/xscale/i8134x/iq81342var.h2
-rw-r--r--sys/arm/xscale/i8134x/obio.c2
-rw-r--r--sys/arm/xscale/i8134x/obiovar.h2
-rw-r--r--sys/arm/xscale/i8134x/uart_bus_i81342.c2
-rw-r--r--sys/arm/xscale/i8134x/uart_cpu_i81342.c2
-rw-r--r--sys/arm/xscale/ixp425/avila_ata.c2
-rw-r--r--sys/arm/xscale/ixp425/avila_gpio.c2
-rw-r--r--sys/arm/xscale/ixp425/avila_led.c2
-rw-r--r--sys/arm/xscale/ixp425/avila_machdep.c2
-rw-r--r--sys/arm/xscale/ixp425/cambria_exp_space.c2
-rw-r--r--sys/arm/xscale/ixp425/cambria_fled.c2
-rw-r--r--sys/arm/xscale/ixp425/cambria_gpio.c2
-rw-r--r--sys/arm/xscale/ixp425/cambria_led.c2
-rw-r--r--sys/arm/xscale/ixp425/if_npe.c2
-rw-r--r--sys/arm/xscale/ixp425/if_npereg.h4
-rw-r--r--sys/arm/xscale/ixp425/ixdp425_pci.c4
-rw-r--r--sys/arm/xscale/ixp425/ixdp425reg.h4
-rw-r--r--sys/arm/xscale/ixp425/ixp425.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_a4x_space.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_iic.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_intr.h4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_mem.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_npe.c2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_npereg.h2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_npevar.h2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_pci.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_pci_space.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_qmgr.c2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_qmgr.h2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_space.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_timer.c4
-rw-r--r--sys/arm/xscale/ixp425/ixp425_wdog.c2
-rw-r--r--sys/arm/xscale/ixp425/ixp425reg.h4
-rw-r--r--sys/arm/xscale/ixp425/ixp425var.h4
-rw-r--r--sys/arm/xscale/ixp425/uart_bus_ixp425.c2
-rw-r--r--sys/arm/xscale/ixp425/uart_cpu_ixp425.c2
-rw-r--r--sys/arm/xscale/pxa/if_smc_smi.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_gpio.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_icu.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_machdep.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_obio.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_smi.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_space.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_timer.c2
-rw-r--r--sys/arm/xscale/pxa/pxareg.h4
-rw-r--r--sys/arm/xscale/pxa/pxavar.h2
-rw-r--r--sys/arm/xscale/pxa/uart_bus_pxa.c2
-rw-r--r--sys/arm/xscale/pxa/uart_cpu_pxa.c2
-rw-r--r--sys/bsm/audit.h2
-rw-r--r--sys/bsm/audit_domain.h2
-rw-r--r--sys/bsm/audit_errno.h2
-rw-r--r--sys/bsm/audit_fcntl.h2
-rw-r--r--sys/bsm/audit_internal.h2
-rw-r--r--sys/bsm/audit_kevents.h2
-rw-r--r--sys/bsm/audit_record.h2
-rw-r--r--sys/bsm/audit_socket_type.h2
-rw-r--r--sys/compat/freebsd32/freebsd32_ioctl.c2
-rw-r--r--sys/compat/freebsd32/freebsd32_ioctl.h2
-rw-r--r--sys/compat/linprocfs/linprocfs.c2
-rw-r--r--sys/compat/ndis/cfg_var.h2
-rw-r--r--sys/compat/ndis/hal_var.h2
-rw-r--r--sys/compat/ndis/kern_ndis.c2
-rw-r--r--sys/compat/ndis/kern_windrv.c2
-rw-r--r--sys/compat/ndis/ndis_var.h2
-rw-r--r--sys/compat/ndis/ntoskrnl_var.h2
-rw-r--r--sys/compat/ndis/pe_var.h2
-rw-r--r--sys/compat/ndis/resource_var.h2
-rw-r--r--sys/compat/ndis/subr_hal.c2
-rw-r--r--sys/compat/ndis/subr_ndis.c2
-rw-r--r--sys/compat/ndis/subr_ntoskrnl.c2
-rw-r--r--sys/compat/ndis/subr_pe.c2
-rw-r--r--sys/compat/ndis/subr_usbd.c2
-rw-r--r--sys/compat/ndis/usbd_var.h2
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/conf/systags.sh2
-rw-r--r--sys/crypto/sha1.c4
-rw-r--r--sys/crypto/sha1.h4
-rw-r--r--sys/ddb/db_ps.c2
-rw-r--r--sys/ddb/ddb.h2
-rw-r--r--sys/dev/aac/aac.c2
-rw-r--r--sys/dev/aac/aac_cam.c2
-rw-r--r--sys/dev/aac/aac_debug.c2
-rw-r--r--sys/dev/aac/aac_disk.c2
-rw-r--r--sys/dev/aac/aac_linux.c2
-rw-r--r--sys/dev/aac/aac_pci.c2
-rw-r--r--sys/dev/aac/aac_tables.h2
-rw-r--r--sys/dev/aac/aacreg.h2
-rw-r--r--sys/dev/aac/aacvar.h2
-rw-r--r--sys/dev/aacraid/aacraid.c2
-rw-r--r--sys/dev/aacraid/aacraid_cam.c2
-rw-r--r--sys/dev/aacraid/aacraid_debug.c3
-rw-r--r--sys/dev/aacraid/aacraid_debug.h2
-rw-r--r--sys/dev/aacraid/aacraid_linux.c2
-rw-r--r--sys/dev/aacraid/aacraid_pci.c2
-rw-r--r--sys/dev/aacraid/aacraid_reg.h2
-rw-r--r--sys/dev/aacraid/aacraid_var.h2
-rw-r--r--sys/dev/adb/adb.h2
-rw-r--r--sys/dev/adb/adb_bus.c2
-rw-r--r--sys/dev/adb/adb_buttons.c2
-rw-r--r--sys/dev/adb/adb_kbd.c2
-rw-r--r--sys/dev/adb/adb_mouse.c2
-rw-r--r--sys/dev/adb/adbvar.h2
-rw-r--r--sys/dev/adlink/adlink.c2
-rw-r--r--sys/dev/advansys/adv_isa.c2
-rw-r--r--sys/dev/advansys/adv_pci.c2
-rw-r--r--sys/dev/advansys/advansys.c2
-rw-r--r--sys/dev/advansys/advansys.h2
-rw-r--r--sys/dev/advansys/advlib.c2
-rw-r--r--sys/dev/advansys/advlib.h2
-rw-r--r--sys/dev/advansys/adw_pci.c2
-rw-r--r--sys/dev/advansys/adwcam.c2
-rw-r--r--sys/dev/advansys/adwlib.c2
-rw-r--r--sys/dev/advansys/adwlib.h2
-rw-r--r--sys/dev/advansys/adwvar.h2
-rw-r--r--sys/dev/ae/if_ae.c2
-rw-r--r--sys/dev/ae/if_aereg.h2
-rw-r--r--sys/dev/ae/if_aevar.h2
-rw-r--r--sys/dev/age/if_age.c2
-rw-r--r--sys/dev/age/if_agereg.h2
-rw-r--r--sys/dev/age/if_agevar.h2
-rw-r--r--sys/dev/agp/agp.c2
-rw-r--r--sys/dev/agp/agp_ali.c2
-rw-r--r--sys/dev/agp/agp_amd.c2
-rw-r--r--sys/dev/agp/agp_amd64.c2
-rw-r--r--sys/dev/agp/agp_apple.c2
-rw-r--r--sys/dev/agp/agp_ati.c2
-rw-r--r--sys/dev/agp/agp_i810.c2
-rw-r--r--sys/dev/agp/agp_i810.h2
-rw-r--r--sys/dev/agp/agp_intel.c2
-rw-r--r--sys/dev/agp/agp_nvidia.c2
-rw-r--r--sys/dev/agp/agp_sis.c2
-rw-r--r--sys/dev/agp/agp_via.c2
-rw-r--r--sys/dev/agp/agppriv.h2
-rw-r--r--sys/dev/agp/agpreg.h2
-rw-r--r--sys/dev/agp/agpvar.h2
-rw-r--r--sys/dev/aha/aha.c4
-rw-r--r--sys/dev/aha/aha_isa.c2
-rw-r--r--sys/dev/aha/ahareg.h2
-rw-r--r--sys/dev/ahci/ahci.c2
-rw-r--r--sys/dev/ahci/ahci.h2
-rw-r--r--sys/dev/ahci/ahciem.c2
-rw-r--r--sys/dev/aic/aic.c2
-rw-r--r--sys/dev/aic/aic6360reg.h2
-rw-r--r--sys/dev/aic/aic_isa.c2
-rw-r--r--sys/dev/aic/aic_pccard.c2
-rw-r--r--sys/dev/aic/aicvar.h2
-rw-r--r--sys/dev/aic7xxx/ahc_isa.c2
-rw-r--r--sys/dev/aic7xxx/aic7770.c2
-rw-r--r--sys/dev/aic7xxx/aic79xx.c2
-rw-r--r--sys/dev/aic7xxx/aic79xx.h2
-rw-r--r--sys/dev/aic7xxx/aic79xx_inline.h2
-rw-r--r--sys/dev/aic7xxx/aic79xx_pci.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_93cx6.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_inline.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_pci.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.h2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_gram.y2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_insformat.h2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_scan.l2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_symbol.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_symbol.h2
-rw-r--r--sys/dev/alc/if_alc.c2
-rw-r--r--sys/dev/alc/if_alcreg.h2
-rw-r--r--sys/dev/alc/if_alcvar.h2
-rw-r--r--sys/dev/ale/if_ale.c2
-rw-r--r--sys/dev/ale/if_alereg.h2
-rw-r--r--sys/dev/ale/if_alevar.h2
-rw-r--r--sys/dev/altera/atse/a_api.h2
-rw-r--r--sys/dev/altera/atse/if_atse.c103
-rw-r--r--sys/dev/altera/atse/if_atse_fdt.c2
-rw-r--r--sys/dev/altera/atse/if_atse_nexus.c2
-rw-r--r--sys/dev/altera/atse/if_atsereg.h2
-rw-r--r--sys/dev/altera/avgen/altera_avgen.c238
-rw-r--r--sys/dev/altera/avgen/altera_avgen.h19
-rw-r--r--sys/dev/altera/avgen/altera_avgen_fdt.c15
-rw-r--r--sys/dev/altera/avgen/altera_avgen_nexus.c13
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart.h2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c158
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard.h2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_disk.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_fdt.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_io.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_nexus.c2
-rw-r--r--sys/dev/amdsbwd/amdsbwd.c2
-rw-r--r--sys/dev/amdtemp/amdtemp.c2
-rw-r--r--sys/dev/amr/amr.c2
-rw-r--r--sys/dev/amr/amr_cam.c2
-rw-r--r--sys/dev/amr/amr_disk.c2
-rw-r--r--sys/dev/amr/amr_linux.c2
-rw-r--r--sys/dev/amr/amr_pci.c2
-rw-r--r--sys/dev/amr/amr_tables.h2
-rw-r--r--sys/dev/amr/amrio.h2
-rw-r--r--sys/dev/amr/amrreg.h2
-rw-r--r--sys/dev/amr/amrvar.h2
-rw-r--r--sys/dev/an/if_aironet_ieee.h2
-rw-r--r--sys/dev/an/if_an.c2
-rw-r--r--sys/dev/an/if_an_isa.c2
-rw-r--r--sys/dev/an/if_an_pccard.c2
-rw-r--r--sys/dev/an/if_an_pci.c2
-rw-r--r--sys/dev/an/if_anreg.h2
-rw-r--r--sys/dev/arcmsr/arcmsr.c2
-rw-r--r--sys/dev/arcmsr/arcmsr.h2
-rw-r--r--sys/dev/asmc/asmc.c2
-rw-r--r--sys/dev/asmc/asmcvar.h2
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/ata-all.h2
-rw-r--r--sys/dev/ata/ata-card.c2
-rw-r--r--sys/dev/ata/ata-dma.c2
-rw-r--r--sys/dev/ata/ata-isa.c2
-rw-r--r--sys/dev/ata/ata-lowlevel.c2
-rw-r--r--sys/dev/ata/ata-pci.c2
-rw-r--r--sys/dev/ata/ata-pci.h2
-rw-r--r--sys/dev/ata/ata-sata.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acard.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acerlabs.c2
-rw-r--r--sys/dev/ata/chipsets/ata-amd.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ati.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cenatek.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cypress.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cyrix.c2
-rw-r--r--sys/dev/ata/chipsets/ata-fsl.c2
-rw-r--r--sys/dev/ata/chipsets/ata-highpoint.c2
-rw-r--r--sys/dev/ata/chipsets/ata-intel.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ite.c2
-rw-r--r--sys/dev/ata/chipsets/ata-jmicron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-marvell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-micron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-national.c2
-rw-r--r--sys/dev/ata/chipsets/ata-netcell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-nvidia.c2
-rw-r--r--sys/dev/ata/chipsets/ata-promise.c2
-rw-r--r--sys/dev/ata/chipsets/ata-serverworks.c2
-rw-r--r--sys/dev/ata/chipsets/ata-siliconimage.c2
-rw-r--r--sys/dev/ata/chipsets/ata-sis.c2
-rw-r--r--sys/dev/ata/chipsets/ata-via.c2
-rw-r--r--sys/dev/ath/ah_osdep.c2
-rw-r--r--sys/dev/ath/ah_osdep.h2
-rw-r--r--sys/dev/ath/ath_dfs/null/dfs_null.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9002phy.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9280_olc.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9280_olc.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_cal.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_cal.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_phy.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_phy.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285phy.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_cal.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_cal.h4
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_olc.c4
-rw-r--r--sys/dev/ath/ath_hal/ar9003/ar9300_devid.h4
-rw-r--r--sys/dev/ath/ath_rate/amrr/amrr.c2
-rw-r--r--sys/dev/ath/ath_rate/amrr/amrr.h2
-rw-r--r--sys/dev/ath/ath_rate/onoe/onoe.c2
-rw-r--r--sys/dev/ath/ath_rate/onoe/onoe.h2
-rw-r--r--sys/dev/ath/ath_rate/sample/sample.c2
-rw-r--r--sys/dev/ath/ath_rate/sample/sample.h2
-rw-r--r--sys/dev/ath/ath_rate/sample/tx_schedules.h2
-rw-r--r--sys/dev/ath/if_ath.c2
-rw-r--r--sys/dev/ath/if_ath_ahb.c2
-rw-r--r--sys/dev/ath/if_ath_alq.c2
-rw-r--r--sys/dev/ath/if_ath_alq.h2
-rw-r--r--sys/dev/ath/if_ath_beacon.c2
-rw-r--r--sys/dev/ath/if_ath_beacon.h2
-rw-r--r--sys/dev/ath/if_ath_btcoex.c2
-rw-r--r--sys/dev/ath/if_ath_btcoex.h2
-rw-r--r--sys/dev/ath/if_ath_debug.c2
-rw-r--r--sys/dev/ath/if_ath_debug.h2
-rw-r--r--sys/dev/ath/if_ath_keycache.c2
-rw-r--r--sys/dev/ath/if_ath_keycache.h2
-rw-r--r--sys/dev/ath/if_ath_led.c2
-rw-r--r--sys/dev/ath/if_ath_led.h2
-rw-r--r--sys/dev/ath/if_ath_lna_div.c2
-rw-r--r--sys/dev/ath/if_ath_lna_div.h2
-rw-r--r--sys/dev/ath/if_ath_misc.h2
-rw-r--r--sys/dev/ath/if_ath_pci.c2
-rw-r--r--sys/dev/ath/if_ath_rx.c2
-rw-r--r--sys/dev/ath/if_ath_rx.h2
-rw-r--r--sys/dev/ath/if_ath_rx_edma.c2
-rw-r--r--sys/dev/ath/if_ath_rx_edma.h2
-rw-r--r--sys/dev/ath/if_ath_spectral.c2
-rw-r--r--sys/dev/ath/if_ath_spectral.h2
-rw-r--r--sys/dev/ath/if_ath_sysctl.c2
-rw-r--r--sys/dev/ath/if_ath_sysctl.h4
-rw-r--r--sys/dev/ath/if_ath_tdma.c2
-rw-r--r--sys/dev/ath/if_ath_tdma.h2
-rw-r--r--sys/dev/ath/if_ath_tsf.h2
-rw-r--r--sys/dev/ath/if_ath_tx.c2
-rw-r--r--sys/dev/ath/if_ath_tx.h2
-rw-r--r--sys/dev/ath/if_ath_tx_edma.c2
-rw-r--r--sys/dev/ath/if_ath_tx_edma.h2
-rw-r--r--sys/dev/ath/if_ath_tx_ht.c2
-rw-r--r--sys/dev/ath/if_ath_tx_ht.h4
-rw-r--r--sys/dev/ath/if_athdfs.h2
-rw-r--r--sys/dev/ath/if_athioctl.h2
-rw-r--r--sys/dev/ath/if_athrate.h2
-rw-r--r--sys/dev/ath/if_athvar.h2
-rw-r--r--sys/dev/atkbdc/atkbd.c2
-rw-r--r--sys/dev/atkbdc/atkbd_atkbdc.c2
-rw-r--r--sys/dev/atkbdc/atkbdc.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_ebus.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_isa.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.h2
-rw-r--r--sys/dev/atkbdc/atkbdcreg.h2
-rw-r--r--sys/dev/atkbdc/atkbdreg.h2
-rw-r--r--sys/dev/auxio/auxio.c2
-rw-r--r--sys/dev/auxio/auxioreg.h2
-rw-r--r--sys/dev/bce/if_bce.c2
-rw-r--r--sys/dev/bce/if_bcefw.h2
-rw-r--r--sys/dev/bce/if_bcereg.h2
-rw-r--r--sys/dev/bfe/if_bfe.c2
-rw-r--r--sys/dev/bfe/if_bfereg.h2
-rw-r--r--sys/dev/bge/if_bge.c2
-rw-r--r--sys/dev/bge/if_bgereg.h2
-rw-r--r--sys/dev/bktr/bktr_audio.c2
-rw-r--r--sys/dev/bktr/bktr_audio.h2
-rw-r--r--sys/dev/bktr/bktr_card.c2
-rw-r--r--sys/dev/bktr/bktr_card.h2
-rw-r--r--sys/dev/bktr/bktr_core.c2
-rw-r--r--sys/dev/bktr/bktr_core.h2
-rw-r--r--sys/dev/bktr/bktr_i2c.c2
-rw-r--r--sys/dev/bktr/bktr_i2c.h2
-rw-r--r--sys/dev/bktr/bktr_mem.c2
-rw-r--r--sys/dev/bktr/bktr_mem.h2
-rw-r--r--sys/dev/bktr/bktr_os.c2
-rw-r--r--sys/dev/bktr/bktr_os.h2
-rw-r--r--sys/dev/bktr/bktr_reg.h2
-rw-r--r--sys/dev/bktr/bktr_tuner.c2
-rw-r--r--sys/dev/bktr/bktr_tuner.h2
-rw-r--r--sys/dev/bktr/ioctl_meteor.h2
-rw-r--r--sys/dev/bktr/msp34xx.c2
-rw-r--r--sys/dev/bm/if_bm.c2
-rw-r--r--sys/dev/bm/if_bmreg.h6
-rw-r--r--sys/dev/bm/if_bmvar.h2
-rw-r--r--sys/dev/buslogic/bt.c2
-rw-r--r--sys/dev/buslogic/bt_isa.c2
-rw-r--r--sys/dev/buslogic/bt_pci.c2
-rw-r--r--sys/dev/buslogic/btreg.h2
-rw-r--r--sys/dev/bvm/bvm_console.c2
-rw-r--r--sys/dev/bvm/bvm_dbg.c2
-rw-r--r--sys/dev/bwi/bitops.h4
-rw-r--r--sys/dev/bwi/bwimac.c4
-rw-r--r--sys/dev/bwi/bwimac.h4
-rw-r--r--sys/dev/bwi/bwiphy.c4
-rw-r--r--sys/dev/bwi/bwiphy.h4
-rw-r--r--sys/dev/bwi/bwirf.c4
-rw-r--r--sys/dev/bwi/bwirf.h4
-rw-r--r--sys/dev/bwi/if_bwi.c4
-rw-r--r--sys/dev/bwi/if_bwi_pci.c2
-rw-r--r--sys/dev/bwi/if_bwireg.h4
-rw-r--r--sys/dev/bwi/if_bwivar.h4
-rw-r--r--sys/dev/bwn/if_bwn.c2
-rw-r--r--sys/dev/bwn/if_bwnreg.h2
-rw-r--r--sys/dev/bwn/if_bwnvar.h2
-rw-r--r--sys/dev/bxe/57710_init_values.c2
-rw-r--r--sys/dev/bxe/57710_int_offsets.h2
-rw-r--r--sys/dev/bxe/57711_init_values.c2
-rw-r--r--sys/dev/bxe/57711_int_offsets.h2
-rw-r--r--sys/dev/bxe/57712_init_values.c2
-rw-r--r--sys/dev/bxe/57712_int_offsets.h2
-rw-r--r--sys/dev/bxe/bxe.c2
-rw-r--r--sys/dev/bxe/bxe.h2
-rw-r--r--sys/dev/bxe/bxe_dcb.h2
-rw-r--r--sys/dev/bxe/bxe_debug.c2
-rw-r--r--sys/dev/bxe/bxe_elink.c2
-rw-r--r--sys/dev/bxe/bxe_elink.h2
-rw-r--r--sys/dev/bxe/bxe_stats.c2
-rw-r--r--sys/dev/bxe/bxe_stats.h2
-rw-r--r--sys/dev/bxe/ecore_fw_defs.h2
-rw-r--r--sys/dev/bxe/ecore_hsi.h2
-rw-r--r--sys/dev/bxe/ecore_init.h2
-rw-r--r--sys/dev/bxe/ecore_init_ops.h2
-rw-r--r--sys/dev/bxe/ecore_mfw_req.h2
-rw-r--r--sys/dev/bxe/ecore_reg.h2
-rw-r--r--sys/dev/bxe/ecore_sp.c2
-rw-r--r--sys/dev/bxe/ecore_sp.h2
-rw-r--r--sys/dev/cadence/if_cgem.c2
-rw-r--r--sys/dev/cadence/if_cgem_hw.h2
-rw-r--r--sys/dev/cardbus/cardbus.c2
-rw-r--r--sys/dev/cardbus/cardbus_cis.c2
-rw-r--r--sys/dev/cardbus/cardbus_cis.h2
-rw-r--r--sys/dev/cardbus/cardbus_device.c2
-rw-r--r--sys/dev/cardbus/cardbusreg.h2
-rw-r--r--sys/dev/cardbus/cardbusvar.h2
-rw-r--r--sys/dev/cas/if_cas.c2
-rw-r--r--sys/dev/cas/if_casreg.h2
-rw-r--r--sys/dev/cas/if_casvar.h2
-rw-r--r--sys/dev/cesa/cesa.c2
-rw-r--r--sys/dev/cesa/cesa.h2
-rw-r--r--sys/dev/cfe/cfe_api.c2
-rw-r--r--sys/dev/cfe/cfe_api.h2
-rw-r--r--sys/dev/cfe/cfe_api_int.h2
-rw-r--r--sys/dev/cfe/cfe_console.c2
-rw-r--r--sys/dev/cfe/cfe_env.c2
-rw-r--r--sys/dev/cfe/cfe_error.h2
-rw-r--r--sys/dev/cfe/cfe_ioctl.h125
-rw-r--r--sys/dev/cfe/cfe_resource.c2
-rw-r--r--sys/dev/cfi/cfi_bus_fdt.c2
-rw-r--r--sys/dev/cfi/cfi_bus_ixp4xx.c2
-rw-r--r--sys/dev/cfi/cfi_bus_nexus.c2
-rw-r--r--sys/dev/cfi/cfi_core.c2
-rw-r--r--sys/dev/cfi/cfi_dev.c2
-rw-r--r--sys/dev/cfi/cfi_disk.c2
-rw-r--r--sys/dev/cfi/cfi_reg.h2
-rw-r--r--sys/dev/cfi/cfi_var.h2
-rw-r--r--sys/dev/ciss/ciss.c2
-rw-r--r--sys/dev/ciss/cissio.h2
-rw-r--r--sys/dev/ciss/cissreg.h2
-rw-r--r--sys/dev/ciss/cissvar.h2
-rw-r--r--sys/dev/cm/if_cm_isa.c2
-rw-r--r--sys/dev/cm/smc90cx6.c2
-rw-r--r--sys/dev/cm/smc90cx6reg.h2
-rw-r--r--sys/dev/cm/smc90cx6var.h2
-rw-r--r--sys/dev/cmx/cmx_pccard.c2
-rw-r--r--sys/dev/cmx/cmxreg.h2
-rw-r--r--sys/dev/cmx/cmxvar.h2
-rw-r--r--sys/dev/coretemp/coretemp.c2
-rw-r--r--sys/dev/cpuctl/cpuctl.c2
-rw-r--r--sys/dev/cpufreq/ichss.c2
-rw-r--r--sys/dev/cs/if_cs.c2
-rw-r--r--sys/dev/cs/if_cs_isa.c2
-rw-r--r--sys/dev/cs/if_cs_pccard.c2
-rw-r--r--sys/dev/cs/if_csreg.h2
-rw-r--r--sys/dev/cs/if_csvar.h2
-rw-r--r--sys/dev/cxgb/bin2h.pl2
-rw-r--r--sys/dev/cxgb/common/cxgb_ael1002.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_aq100x.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_common.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_firmware_exports.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_mc5.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_mv88e1xxx.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_regs.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_sge_defs.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_t3_cpl.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_t3_hw.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_tcb.h1
-rw-r--r--sys/dev/cxgb/common/cxgb_tn1010.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_vsc7323.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_vsc8211.c1
-rw-r--r--sys/dev/cxgb/common/cxgb_xgmac.c1
-rw-r--r--sys/dev/cxgb/cxgb_adapter.h1
-rw-r--r--sys/dev/cxgb/cxgb_ioctl.h1
-rw-r--r--sys/dev/cxgb/cxgb_main.c1
-rw-r--r--sys/dev/cxgb/cxgb_offload.h1
-rw-r--r--sys/dev/cxgb/cxgb_osdep.h1
-rw-r--r--sys/dev/cxgb/cxgb_sge.c1
-rw-r--r--sys/dev/cxgb/cxgb_t3fw.h1
-rw-r--r--sys/dev/cxgb/sys/mvec.h2
-rw-r--r--sys/dev/cxgb/sys/uipc_mvec.c2
-rw-r--r--sys/dev/cxgb/t3b_protocol_sram.h1
-rw-r--r--sys/dev/cxgb/t3b_tp_eeprom.h1
-rw-r--r--sys/dev/cxgb/t3c_protocol_sram.h1
-rw-r--r--sys/dev/cxgb/t3c_tp_eeprom.h1
-rw-r--r--sys/dev/cxgbe/adapter.h2
-rw-r--r--sys/dev/cxgbe/common/common.h2
-rw-r--r--sys/dev/cxgbe/common/t4_hw.c2
-rw-r--r--sys/dev/cxgbe/common/t4_hw.h2
-rw-r--r--sys/dev/cxgbe/common/t4_msg.h2
-rw-r--r--sys/dev/cxgbe/common/t4_regs.h2
-rw-r--r--sys/dev/cxgbe/common/t4_regs_values.h2
-rw-r--r--sys/dev/cxgbe/common/t4_tcb.h2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/cm.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/cq.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/device.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/ev.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/id_table.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/mem.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/provider.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/qp.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/resource.c4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/t4.h4
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/user.h4
-rw-r--r--sys/dev/cxgbe/offload.h2
-rw-r--r--sys/dev/cxgbe/osdep.h2
-rw-r--r--sys/dev/cxgbe/t4_ioctl.h2
-rw-r--r--sys/dev/cxgbe/t4_l2t.c2
-rw-r--r--sys/dev/cxgbe/t4_l2t.h2
-rw-r--r--sys/dev/cxgbe/t4_main.c2
-rw-r--r--sys/dev/cxgbe/t4_sge.c2
-rw-r--r--sys/dev/cxgbe/t4_tracer.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_connect.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_cpl_io.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_ddp.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_listen.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom.h2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom_l2t.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom_l2t.h2
-rw-r--r--sys/dev/cy/cy.c2
-rw-r--r--sys/dev/cy/cy_isa.c2
-rw-r--r--sys/dev/cy/cy_pci.c2
-rw-r--r--sys/dev/cy/cyreg.h2
-rw-r--r--sys/dev/cy/cyvar.h2
-rw-r--r--sys/dev/dc/dcphy.c2
-rw-r--r--sys/dev/dc/if_dc.c2
-rw-r--r--sys/dev/dc/if_dcreg.h2
-rw-r--r--sys/dev/dc/pnphy.c2
-rw-r--r--sys/dev/dcons/dcons.c2
-rw-r--r--sys/dev/dcons/dcons.h2
-rw-r--r--sys/dev/dcons/dcons_crom.c2
-rw-r--r--sys/dev/dcons/dcons_os.c2
-rw-r--r--sys/dev/dcons/dcons_os.h2
-rw-r--r--sys/dev/de/dc21040reg.h2
-rw-r--r--sys/dev/de/if_de.c2
-rw-r--r--sys/dev/de/if_devar.h2
-rw-r--r--sys/dev/dpms/dpms.c2
-rw-r--r--sys/dev/dpt/dpt.h2
-rw-r--r--sys/dev/dpt/dpt_pci.c2
-rw-r--r--sys/dev/dpt/dpt_scsi.c2
-rw-r--r--sys/dev/drm2/drm_gem.c2
-rw-r--r--sys/dev/drm2/drm_gem_names.c2
-rw-r--r--sys/dev/drm2/drm_gem_names.h2
-rw-r--r--sys/dev/drm2/drm_linux_list_sort.c4
-rw-r--r--sys/dev/drm2/i915/i915_gem.c2
-rw-r--r--sys/dev/e1000/e1000_80003es2lan.c1
-rw-r--r--sys/dev/e1000/e1000_80003es2lan.h1
-rw-r--r--sys/dev/e1000/e1000_82540.c1
-rw-r--r--sys/dev/e1000/e1000_82541.c1
-rw-r--r--sys/dev/e1000/e1000_82541.h1
-rw-r--r--sys/dev/e1000/e1000_82542.c1
-rw-r--r--sys/dev/e1000/e1000_82543.c1
-rw-r--r--sys/dev/e1000/e1000_82543.h1
-rw-r--r--sys/dev/e1000/e1000_82571.c1
-rw-r--r--sys/dev/e1000/e1000_82571.h1
-rw-r--r--sys/dev/e1000/e1000_82575.c1
-rw-r--r--sys/dev/e1000/e1000_82575.h1
-rw-r--r--sys/dev/e1000/e1000_api.c1
-rw-r--r--sys/dev/e1000/e1000_api.h1
-rw-r--r--sys/dev/e1000/e1000_defines.h1
-rw-r--r--sys/dev/e1000/e1000_hw.h1
-rw-r--r--sys/dev/e1000/e1000_i210.c1
-rw-r--r--sys/dev/e1000/e1000_i210.h1
-rw-r--r--sys/dev/e1000/e1000_ich8lan.c1
-rw-r--r--sys/dev/e1000/e1000_ich8lan.h1
-rw-r--r--sys/dev/e1000/e1000_mac.c1
-rw-r--r--sys/dev/e1000/e1000_mac.h1
-rw-r--r--sys/dev/e1000/e1000_manage.c1
-rw-r--r--sys/dev/e1000/e1000_manage.h1
-rw-r--r--sys/dev/e1000/e1000_mbx.c1
-rw-r--r--sys/dev/e1000/e1000_mbx.h1
-rw-r--r--sys/dev/e1000/e1000_nvm.c1
-rw-r--r--sys/dev/e1000/e1000_nvm.h1
-rw-r--r--sys/dev/e1000/e1000_osdep.c1
-rw-r--r--sys/dev/e1000/e1000_osdep.h1
-rw-r--r--sys/dev/e1000/e1000_phy.c1
-rw-r--r--sys/dev/e1000/e1000_phy.h1
-rw-r--r--sys/dev/e1000/e1000_regs.h1
-rw-r--r--sys/dev/e1000/e1000_vf.c1
-rw-r--r--sys/dev/e1000/e1000_vf.h1
-rw-r--r--sys/dev/e1000/if_em.c27
-rw-r--r--sys/dev/e1000/if_em.h27
-rw-r--r--sys/dev/ed/ax88x90reg.h2
-rw-r--r--sys/dev/ed/dl100xxreg.h2
-rw-r--r--sys/dev/ed/if_ed.c2
-rw-r--r--sys/dev/ed/if_ed_3c503.c2
-rw-r--r--sys/dev/ed/if_ed_hpp.c2
-rw-r--r--sys/dev/ed/if_ed_isa.c2
-rw-r--r--sys/dev/ed/if_ed_novell.c2
-rw-r--r--sys/dev/ed/if_ed_pccard.c2
-rw-r--r--sys/dev/ed/if_ed_pci.c2
-rw-r--r--sys/dev/ed/if_ed_rtl80x9.c2
-rw-r--r--sys/dev/ed/if_ed_sic.c2
-rw-r--r--sys/dev/ed/if_ed_wd80x3.c2
-rw-r--r--sys/dev/ed/if_edvar.h2
-rw-r--r--sys/dev/ed/rtl80x9reg.h2
-rw-r--r--sys/dev/ed/tc5299jreg.h2
-rw-r--r--sys/dev/ep/if_ep.c2
-rw-r--r--sys/dev/ep/if_ep_isa.c2
-rw-r--r--sys/dev/ep/if_ep_pccard.c2
-rw-r--r--sys/dev/ep/if_epreg.h2
-rw-r--r--sys/dev/ep/if_epvar.h2
-rw-r--r--sys/dev/esp/am53c974reg.h2
-rw-r--r--sys/dev/esp/esp_pci.c2
-rw-r--r--sys/dev/esp/esp_sbus.c2
-rw-r--r--sys/dev/esp/ncr53c9x.c2
-rw-r--r--sys/dev/esp/ncr53c9xreg.h2
-rw-r--r--sys/dev/esp/ncr53c9xvar.h2
-rw-r--r--sys/dev/et/if_et.c2
-rw-r--r--sys/dev/et/if_etreg.h2
-rw-r--r--sys/dev/et/if_etvar.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_7240.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_7240.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8216.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8216.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8226.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8226.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8316.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8316.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8327.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8327.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_9340.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_9340.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_phy.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_phy.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_reg.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_reg.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_vlans.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_vlans.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitchreg.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitchvar.h2
-rw-r--r--sys/dev/etherswitch/etherswitch.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175c.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175c.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175d.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175d.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_phy.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_phy.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_reg.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_var.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_vlans.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_vlans.h2
-rw-r--r--sys/dev/etherswitch/miiproxy.c2
-rw-r--r--sys/dev/etherswitch/miiproxy.h2
-rw-r--r--sys/dev/etherswitch/rtl8366/rtl8366rb.c2
-rw-r--r--sys/dev/etherswitch/rtl8366/rtl8366rbvar.h2
-rw-r--r--sys/dev/etherswitch/ukswitch/ukswitch.c2
-rw-r--r--sys/dev/ex/if_ex.c2
-rw-r--r--sys/dev/ex/if_ex_isa.c2
-rw-r--r--sys/dev/ex/if_ex_pccard.c2
-rw-r--r--sys/dev/ex/if_exreg.h2
-rw-r--r--sys/dev/ex/if_exvar.h2
-rw-r--r--sys/dev/exca/exca.c2
-rw-r--r--sys/dev/exca/excareg.h2
-rw-r--r--sys/dev/exca/excavar.h2
-rw-r--r--sys/dev/fb/creator.c2
-rw-r--r--sys/dev/fb/creatorreg.h2
-rw-r--r--sys/dev/fb/fb.c2
-rw-r--r--sys/dev/fb/fbd.c2
-rw-r--r--sys/dev/fb/fbreg.h2
-rw-r--r--sys/dev/fb/gallant12x22.c2
-rw-r--r--sys/dev/fb/machfb.c2
-rw-r--r--sys/dev/fb/s3_pci.c2
-rw-r--r--sys/dev/fb/splash.c2
-rw-r--r--sys/dev/fb/splash_bmp.c2
-rw-r--r--sys/dev/fb/splash_pcx.c2
-rw-r--r--sys/dev/fb/splash_txt.c2
-rw-r--r--sys/dev/fb/splashreg.h2
-rw-r--r--sys/dev/fb/vesa.c2
-rw-r--r--sys/dev/fb/vesa.h2
-rw-r--r--sys/dev/fb/vga.c2
-rw-r--r--sys/dev/fb/vgareg.h2
-rw-r--r--sys/dev/fdc/fdc.c2
-rw-r--r--sys/dev/fdc/fdc_acpi.c2
-rw-r--r--sys/dev/fdc/fdc_isa.c2
-rw-r--r--sys/dev/fdc/fdc_pccard.c2
-rw-r--r--sys/dev/fdc/fdcvar.h2
-rw-r--r--sys/dev/fdt/fdt_common.c2
-rw-r--r--sys/dev/fdt/fdt_common.h2
-rw-r--r--sys/dev/fdt/fdt_powerpc.c2
-rw-r--r--sys/dev/fdt/fdt_slicer.c2
-rw-r--r--sys/dev/fdt/simplebus.c2
-rw-r--r--sys/dev/ffec/if_ffec.c2
-rw-r--r--sys/dev/ffec/if_ffecreg.h2
-rw-r--r--sys/dev/filemon/filemon.c2
-rw-r--r--sys/dev/filemon/filemon.h2
-rw-r--r--sys/dev/filemon/filemon_wrapper.c2
-rw-r--r--sys/dev/firewire/firewire.c2
-rw-r--r--sys/dev/firewire/firewire.h2
-rw-r--r--sys/dev/firewire/firewire_phy.h2
-rw-r--r--sys/dev/firewire/firewirereg.h2
-rw-r--r--sys/dev/firewire/fwcrom.c2
-rw-r--r--sys/dev/firewire/fwdev.c2
-rw-r--r--sys/dev/firewire/fwdma.c2
-rw-r--r--sys/dev/firewire/fwdma.h2
-rw-r--r--sys/dev/firewire/fwmem.c2
-rw-r--r--sys/dev/firewire/fwmem.h2
-rw-r--r--sys/dev/firewire/fwohci.c2
-rw-r--r--sys/dev/firewire/fwohci_pci.c2
-rw-r--r--sys/dev/firewire/fwohcireg.h2
-rw-r--r--sys/dev/firewire/fwohcivar.h2
-rw-r--r--sys/dev/firewire/fwphyreg.h2
-rw-r--r--sys/dev/firewire/iec13213.h2
-rw-r--r--sys/dev/firewire/iec68113.h2
-rw-r--r--sys/dev/firewire/if_fwe.c2
-rw-r--r--sys/dev/firewire/if_fwevar.h2
-rw-r--r--sys/dev/firewire/if_fwip.c2
-rw-r--r--sys/dev/firewire/if_fwipvar.h2
-rw-r--r--sys/dev/firewire/sbp.c2
-rw-r--r--sys/dev/firewire/sbp.h2
-rw-r--r--sys/dev/firewire/sbp_targ.c2
-rw-r--r--sys/dev/flash/at45d.c2
-rw-r--r--sys/dev/flash/mx25l.c2
-rw-r--r--sys/dev/flash/mx25lreg.h2
-rw-r--r--sys/dev/fxp/if_fxp.c2
-rw-r--r--sys/dev/fxp/if_fxpreg.h2
-rw-r--r--sys/dev/fxp/if_fxpvar.h2
-rw-r--r--sys/dev/fxp/inphy.c2
-rw-r--r--sys/dev/fxp/inphyreg.h2
-rw-r--r--sys/dev/fxp/rcvbundl.h2
-rw-r--r--sys/dev/gem/if_gem.c2
-rw-r--r--sys/dev/gem/if_gem_pci.c2
-rw-r--r--sys/dev/gem/if_gem_sbus.c2
-rw-r--r--sys/dev/gem/if_gemreg.h2
-rw-r--r--sys/dev/gem/if_gemvar.h2
-rw-r--r--sys/dev/glxiic/glxiic.c2
-rw-r--r--sys/dev/glxsb/glxsb.h2
-rw-r--r--sys/dev/glxsb/glxsb_hash.c2
-rw-r--r--sys/dev/gpio/gpiobus.c2
-rw-r--r--sys/dev/gpio/gpiobusvar.h2
-rw-r--r--sys/dev/gpio/gpioc.c2
-rw-r--r--sys/dev/gpio/gpioiic.c2
-rw-r--r--sys/dev/gpio/gpioled.c2
-rw-r--r--sys/dev/gpio/ofw_gpiobus.c2
-rw-r--r--sys/dev/gxemul/cons/gxemul_cons.c2
-rw-r--r--sys/dev/gxemul/disk/gxemul_disk.c2
-rw-r--r--sys/dev/gxemul/disk/gxemul_diskreg.h2
-rw-r--r--sys/dev/gxemul/ether/gxreg.h2
-rw-r--r--sys/dev/gxemul/ether/if_gx.c2
-rw-r--r--sys/dev/hifn/hifn7751.c2
-rw-r--r--sys/dev/hifn/hifn7751reg.h2
-rw-r--r--sys/dev/hifn/hifn7751var.h2
-rw-r--r--sys/dev/hme/if_hme.c2
-rw-r--r--sys/dev/hme/if_hme_pci.c2
-rw-r--r--sys/dev/hme/if_hme_sbus.c2
-rw-r--r--sys/dev/hme/if_hmereg.h2
-rw-r--r--sys/dev/hme/if_hmevar.h2
-rw-r--r--sys/dev/hpt27xx/array.h2
-rw-r--r--sys/dev/hpt27xx/him.h2
-rw-r--r--sys/dev/hpt27xx/himfuncs.h2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_config.c2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_config.h2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_os_bsd.c2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_osm_bsd.c2
-rw-r--r--sys/dev/hpt27xx/hptintf.h2
-rw-r--r--sys/dev/hpt27xx/ldm.h2
-rw-r--r--sys/dev/hpt27xx/list.h2
-rw-r--r--sys/dev/hpt27xx/os_bsd.h2
-rw-r--r--sys/dev/hpt27xx/osm.h2
-rw-r--r--sys/dev/hpt27xx/wj.h2
-rw-r--r--sys/dev/hptiop/hptiop.c4
-rw-r--r--sys/dev/hptiop/hptiop.h4
-rw-r--r--sys/dev/hptmv/access601.h4
-rw-r--r--sys/dev/hptmv/array.h4
-rw-r--r--sys/dev/hptmv/atapi.h4
-rw-r--r--sys/dev/hptmv/command.h4
-rw-r--r--sys/dev/hptmv/entry.c4
-rw-r--r--sys/dev/hptmv/global.h4
-rw-r--r--sys/dev/hptmv/gui_lib.c4
-rw-r--r--sys/dev/hptmv/hptintf.h4
-rw-r--r--sys/dev/hptmv/hptproc.c4
-rw-r--r--sys/dev/hptmv/ioctl.c4
-rw-r--r--sys/dev/hptmv/mv.c4
-rw-r--r--sys/dev/hptmv/mvOs.h4
-rw-r--r--sys/dev/hptmv/mvSata.h4
-rw-r--r--sys/dev/hptmv/mvStorageDev.h4
-rw-r--r--sys/dev/hptmv/osbsd.h4
-rw-r--r--sys/dev/hptmv/raid5n.h4
-rw-r--r--sys/dev/hptmv/vdevice.h4
-rw-r--r--sys/dev/hptnr/array.h2
-rw-r--r--sys/dev/hptnr/him.h2
-rw-r--r--sys/dev/hptnr/himfuncs.h2
-rw-r--r--sys/dev/hptnr/hptintf.h2
-rw-r--r--sys/dev/hptnr/hptnr_config.c2
-rw-r--r--sys/dev/hptnr/hptnr_config.h2
-rw-r--r--sys/dev/hptnr/hptnr_os_bsd.c2
-rw-r--r--sys/dev/hptnr/hptnr_osm_bsd.c2
-rw-r--r--sys/dev/hptnr/ldm.h2
-rw-r--r--sys/dev/hptnr/list.h2
-rw-r--r--sys/dev/hptnr/os_bsd.h2
-rw-r--r--sys/dev/hptnr/osm.h2
-rw-r--r--sys/dev/hptnr/wj.h2
-rw-r--r--sys/dev/hptrr/array.h4
-rw-r--r--sys/dev/hptrr/him.h4
-rw-r--r--sys/dev/hptrr/himfuncs.h4
-rw-r--r--sys/dev/hptrr/hptintf.h4
-rw-r--r--sys/dev/hptrr/hptrr_config.c4
-rw-r--r--sys/dev/hptrr/hptrr_config.h4
-rw-r--r--sys/dev/hptrr/hptrr_os_bsd.c4
-rw-r--r--sys/dev/hptrr/hptrr_osm_bsd.c4
-rw-r--r--sys/dev/hptrr/ldm.h4
-rw-r--r--sys/dev/hptrr/list.h4
-rw-r--r--sys/dev/hptrr/os_bsd.h4
-rw-r--r--sys/dev/hptrr/osm.h4
-rw-r--r--sys/dev/hwpmc/hwpmc_amd.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_amd.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_arm.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_core.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_core.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_intel.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_logging.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mips.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mips24k.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mod.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mpc7xxx.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_octeon.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_pentium.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_pentium.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_piv.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_piv.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_powerpc.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_powerpc.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_ppc970.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_ppro.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_ppro.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_soft.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_soft.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_sparc64.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_tsc.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_tsc.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_uncore.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_uncore.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_x86.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_xscale.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_xscale.h2
-rw-r--r--sys/dev/hwpmc/pmc_events.h2
-rw-r--r--sys/dev/hyperv/include/hyperv.h2
-rw-r--r--sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c2
-rw-r--r--sys/dev/hyperv/storvsc/hv_vstorage.h2
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.h2
-rw-r--r--sys/dev/ic/cd1400.h2
-rw-r--r--sys/dev/ic/cd180.h2
-rw-r--r--sys/dev/ic/esp.h2
-rw-r--r--sys/dev/ic/i8253reg.h2
-rw-r--r--sys/dev/ic/i82586.h2
-rw-r--r--sys/dev/ic/i8259.h2
-rw-r--r--sys/dev/ic/nec765.h2
-rw-r--r--sys/dev/ic/ns16550.h2
-rw-r--r--sys/dev/ic/quicc.h2
-rw-r--r--sys/dev/ic/sab82532.h2
-rw-r--r--sys/dev/ic/via6522reg.h4
-rw-r--r--sys/dev/ic/z8530.h2
-rw-r--r--sys/dev/ichwd/ichwd.c2
-rw-r--r--sys/dev/ichwd/ichwd.h2
-rw-r--r--sys/dev/ida/ida.c2
-rw-r--r--sys/dev/ida/ida_disk.c2
-rw-r--r--sys/dev/ida/ida_pci.c2
-rw-r--r--sys/dev/ida/idareg.h2
-rw-r--r--sys/dev/ida/idavar.h2
-rw-r--r--sys/dev/if_ndis/if_ndis.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pccard.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pci.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_usb.c2
-rw-r--r--sys/dev/if_ndis/if_ndisvar.h2
-rw-r--r--sys/dev/iicbus/ad7417.c2
-rw-r--r--sys/dev/iicbus/ad7418.c2
-rw-r--r--sys/dev/iicbus/adt746x.c2
-rw-r--r--sys/dev/iicbus/ds1631.c2
-rw-r--r--sys/dev/iicbus/ds1672.c2
-rw-r--r--sys/dev/iicbus/ds1775.c2
-rw-r--r--sys/dev/iicbus/icee.c2
-rw-r--r--sys/dev/iicbus/if_ic.c2
-rw-r--r--sys/dev/iicbus/iic.c2
-rw-r--r--sys/dev/iicbus/iic.h2
-rw-r--r--sys/dev/iicbus/iicbb.c2
-rw-r--r--sys/dev/iicbus/iicbus.c2
-rw-r--r--sys/dev/iicbus/iicbus.h2
-rw-r--r--sys/dev/iicbus/iicoc.c2
-rw-r--r--sys/dev/iicbus/iicoc.h2
-rw-r--r--sys/dev/iicbus/iiconf.c2
-rw-r--r--sys/dev/iicbus/iiconf.h2
-rw-r--r--sys/dev/iicbus/iicsmb.c2
-rw-r--r--sys/dev/iicbus/max6690.c2
-rw-r--r--sys/dev/iicbus/s35390a.c2
-rw-r--r--sys/dev/iir/iir.c2
-rw-r--r--sys/dev/iir/iir.h2
-rw-r--r--sys/dev/iir/iir_ctrl.c2
-rw-r--r--sys/dev/iir/iir_pci.c2
-rw-r--r--sys/dev/io/iodev.c2
-rw-r--r--sys/dev/io/iodev.h2
-rw-r--r--sys/dev/ipmi/ipmi.c2
-rw-r--r--sys/dev/ipmi/ipmi_acpi.c2
-rw-r--r--sys/dev/ipmi/ipmi_isa.c2
-rw-r--r--sys/dev/ipmi/ipmi_kcs.c2
-rw-r--r--sys/dev/ipmi/ipmi_linux.c2
-rw-r--r--sys/dev/ipmi/ipmi_pci.c2
-rw-r--r--sys/dev/ipmi/ipmi_smbios.c2
-rw-r--r--sys/dev/ipmi/ipmi_smbus.c2
-rw-r--r--sys/dev/ipmi/ipmi_smic.c2
-rw-r--r--sys/dev/ipmi/ipmi_ssif.c2
-rw-r--r--sys/dev/ipmi/ipmivars.h2
-rw-r--r--sys/dev/ips/ips.c2
-rw-r--r--sys/dev/ips/ips.h2
-rw-r--r--sys/dev/ips/ips_commands.c2
-rw-r--r--sys/dev/ips/ips_disk.c2
-rw-r--r--sys/dev/ips/ips_disk.h2
-rw-r--r--sys/dev/ips/ips_ioctl.c2
-rw-r--r--sys/dev/ips/ips_ioctl.h2
-rw-r--r--sys/dev/ips/ips_pci.c2
-rw-r--r--sys/dev/ips/ipsreg.h2
-rw-r--r--sys/dev/ipw/if_ipw.c2
-rw-r--r--sys/dev/ipw/if_ipwreg.h2
-rw-r--r--sys/dev/ipw/if_ipwvar.h2
-rw-r--r--sys/dev/isci/environment.h2
-rw-r--r--sys/dev/isci/isci.c2
-rw-r--r--sys/dev/isci/isci.h2
-rw-r--r--sys/dev/isci/isci_controller.c2
-rw-r--r--sys/dev/isci/isci_domain.c2
-rw-r--r--sys/dev/isci/isci_interrupt.c2
-rw-r--r--sys/dev/isci/isci_io_request.c2
-rw-r--r--sys/dev/isci/isci_logger.c2
-rw-r--r--sys/dev/isci/isci_oem_parameters.c2
-rw-r--r--sys/dev/isci/isci_remote_device.c2
-rw-r--r--sys/dev/isci/isci_sysctl.c2
-rw-r--r--sys/dev/isci/isci_task_request.c2
-rw-r--r--sys/dev/isci/isci_timer.c2
-rw-r--r--sys/dev/isci/scil/intel_ata.h2
-rw-r--r--sys/dev/isci/scil/intel_pci.h2
-rw-r--r--sys/dev/isci/scil/intel_sas.h2
-rw-r--r--sys/dev/isci/scil/intel_sat.h2
-rw-r--r--sys/dev/isci/scil/intel_sata.h2
-rw-r--r--sys/dev/isci/scil/intel_scsi.h2
-rw-r--r--sys/dev/isci/scil/sati.c2
-rw-r--r--sys/dev/isci/scil/sati.h2
-rw-r--r--sys/dev/isci/scil/sati_abort_task_set.c2
-rw-r--r--sys/dev/isci/scil/sati_abort_task_set.h2
-rw-r--r--sys/dev/isci/scil/sati_atapi.c2
-rw-r--r--sys/dev/isci/scil/sati_atapi.h2
-rw-r--r--sys/dev/isci/scil/sati_callbacks.h2
-rw-r--r--sys/dev/isci/scil/sati_design.h2
-rw-r--r--sys/dev/isci/scil/sati_device.c2
-rw-r--r--sys/dev/isci/scil/sati_device.h2
-rw-r--r--sys/dev/isci/scil/sati_inquiry.c2
-rw-r--r--sys/dev/isci/scil/sati_inquiry.h2
-rw-r--r--sys/dev/isci/scil/sati_log_sense.c2
-rw-r--r--sys/dev/isci/scil/sati_log_sense.h2
-rw-r--r--sys/dev/isci/scil/sati_lun_reset.c2
-rw-r--r--sys/dev/isci/scil/sati_lun_reset.h2
-rw-r--r--sys/dev/isci/scil/sati_mode_pages.c2
-rw-r--r--sys/dev/isci/scil/sati_mode_pages.h2
-rw-r--r--sys/dev/isci/scil/sati_mode_select.c2
-rw-r--r--sys/dev/isci/scil/sati_mode_select.h2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense.c2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense.h2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense_10.c2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense_10.h2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense_6.c2
-rw-r--r--sys/dev/isci/scil/sati_mode_sense_6.h2
-rw-r--r--sys/dev/isci/scil/sati_move.c2
-rw-r--r--sys/dev/isci/scil/sati_move.h2
-rw-r--r--sys/dev/isci/scil/sati_passthrough.c2
-rw-r--r--sys/dev/isci/scil/sati_passthrough.h2
-rw-r--r--sys/dev/isci/scil/sati_read.c2
-rw-r--r--sys/dev/isci/scil/sati_read.h2
-rw-r--r--sys/dev/isci/scil/sati_read_buffer.c2
-rw-r--r--sys/dev/isci/scil/sati_read_buffer.h2
-rw-r--r--sys/dev/isci/scil/sati_read_capacity.c2
-rw-r--r--sys/dev/isci/scil/sati_read_capacity.h2
-rw-r--r--sys/dev/isci/scil/sati_reassign_blocks.c2
-rw-r--r--sys/dev/isci/scil/sati_reassign_blocks.h2
-rw-r--r--sys/dev/isci/scil/sati_report_luns.c2
-rw-r--r--sys/dev/isci/scil/sati_report_luns.h2
-rw-r--r--sys/dev/isci/scil/sati_request_sense.c2
-rw-r--r--sys/dev/isci/scil/sati_request_sense.h2
-rw-r--r--sys/dev/isci/scil/sati_start_stop_unit.c2
-rw-r--r--sys/dev/isci/scil/sati_start_stop_unit.h2
-rw-r--r--sys/dev/isci/scil/sati_synchronize_cache.c2
-rw-r--r--sys/dev/isci/scil/sati_synchronize_cache.h2
-rw-r--r--sys/dev/isci/scil/sati_test_unit_ready.c2
-rw-r--r--sys/dev/isci/scil/sati_test_unit_ready.h2
-rw-r--r--sys/dev/isci/scil/sati_translator_sequence.h2
-rw-r--r--sys/dev/isci/scil/sati_types.h2
-rw-r--r--sys/dev/isci/scil/sati_unmap.c2
-rw-r--r--sys/dev/isci/scil/sati_unmap.h2
-rw-r--r--sys/dev/isci/scil/sati_util.c2
-rw-r--r--sys/dev/isci/scil/sati_util.h2
-rw-r--r--sys/dev/isci/scil/sati_verify.c2
-rw-r--r--sys/dev/isci/scil/sati_verify.h2
-rw-r--r--sys/dev/isci/scil/sati_write.c2
-rw-r--r--sys/dev/isci/scil/sati_write.h2
-rw-r--r--sys/dev/isci/scil/sati_write_and_verify.c2
-rw-r--r--sys/dev/isci/scil/sati_write_and_verify.h2
-rw-r--r--sys/dev/isci/scil/sati_write_buffer.c2
-rw-r--r--sys/dev/isci/scil/sati_write_buffer.h2
-rw-r--r--sys/dev/isci/scil/sati_write_long.c2
-rw-r--r--sys/dev/isci/scil/sati_write_long.h2
-rw-r--r--sys/dev/isci/scil/sci_abstract_list.c2
-rw-r--r--sys/dev/isci/scil/sci_abstract_list.h2
-rw-r--r--sys/dev/isci/scil/sci_base_controller.c2
-rw-r--r--sys/dev/isci/scil/sci_base_controller.h2
-rw-r--r--sys/dev/isci/scil/sci_base_domain.c2
-rw-r--r--sys/dev/isci/scil/sci_base_domain.h2
-rw-r--r--sys/dev/isci/scil/sci_base_iterator.c2
-rw-r--r--sys/dev/isci/scil/sci_base_iterator.h2
-rw-r--r--sys/dev/isci/scil/sci_base_library.c2
-rw-r--r--sys/dev/isci/scil/sci_base_library.h2
-rw-r--r--sys/dev/isci/scil/sci_base_logger.c2
-rw-r--r--sys/dev/isci/scil/sci_base_logger.h2
-rw-r--r--sys/dev/isci/scil/sci_base_memory_descriptor_list.c2
-rw-r--r--sys/dev/isci/scil/sci_base_memory_descriptor_list.h2
-rw-r--r--sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c2
-rw-r--r--sys/dev/isci/scil/sci_base_object.c2
-rw-r--r--sys/dev/isci/scil/sci_base_object.h2
-rw-r--r--sys/dev/isci/scil/sci_base_observer.c2
-rw-r--r--sys/dev/isci/scil/sci_base_observer.h2
-rw-r--r--sys/dev/isci/scil/sci_base_phy.c2
-rw-r--r--sys/dev/isci/scil/sci_base_phy.h2
-rw-r--r--sys/dev/isci/scil/sci_base_port.c2
-rw-r--r--sys/dev/isci/scil/sci_base_port.h2
-rw-r--r--sys/dev/isci/scil/sci_base_remote_device.c2
-rw-r--r--sys/dev/isci/scil/sci_base_remote_device.h2
-rw-r--r--sys/dev/isci/scil/sci_base_request.c2
-rw-r--r--sys/dev/isci/scil/sci_base_request.h2
-rw-r--r--sys/dev/isci/scil/sci_base_state.h2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine.c2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine.h2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine_logger.c2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine_logger.h2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine_observer.c2
-rw-r--r--sys/dev/isci/scil/sci_base_state_machine_observer.h2
-rw-r--r--sys/dev/isci/scil/sci_base_subject.c2
-rw-r--r--sys/dev/isci/scil/sci_base_subject.h2
-rw-r--r--sys/dev/isci/scil/sci_controller.h2
-rw-r--r--sys/dev/isci/scil/sci_controller_constants.h2
-rw-r--r--sys/dev/isci/scil/sci_fast_list.h2
-rw-r--r--sys/dev/isci/scil/sci_iterator.h2
-rw-r--r--sys/dev/isci/scil/sci_library.h2
-rw-r--r--sys/dev/isci/scil/sci_logger.h2
-rw-r--r--sys/dev/isci/scil/sci_memory_descriptor_list.h2
-rw-r--r--sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h2
-rw-r--r--sys/dev/isci/scil/sci_object.h2
-rw-r--r--sys/dev/isci/scil/sci_overview.h2
-rw-r--r--sys/dev/isci/scil/sci_pool.h2
-rw-r--r--sys/dev/isci/scil/sci_simple_list.h2
-rw-r--r--sys/dev/isci/scil/sci_status.h2
-rw-r--r--sys/dev/isci/scil/sci_types.h2
-rw-r--r--sys/dev/isci/scil/sci_util.c2
-rw-r--r--sys/dev/isci/scil/sci_util.h2
-rw-r--r--sys/dev/isci/scil/scic_config_parameters.h2
-rw-r--r--sys/dev/isci/scil/scic_controller.h2
-rw-r--r--sys/dev/isci/scil/scic_io_request.h2
-rw-r--r--sys/dev/isci/scil/scic_library.h2
-rw-r--r--sys/dev/isci/scil/scic_logger.h2
-rw-r--r--sys/dev/isci/scil/scic_overview.h2
-rw-r--r--sys/dev/isci/scil/scic_phy.h2
-rw-r--r--sys/dev/isci/scil/scic_port.h2
-rw-r--r--sys/dev/isci/scil/scic_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_controller.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_controller.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_controller_registers.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_library.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_library.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_logger.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_pci.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_pci.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_phy.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_phy.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_phy_registers.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_port.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_port.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_port_configuration_agent.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_port_configuration_agent.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_port_registers.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_node_context.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_node_context.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_node_table.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_remote_node_table.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_request.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_request.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_sgpio.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_smp_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_smp_request.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_smp_request.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_ssp_request.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_packet_request.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_packet_request.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_pio_request.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_request.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_stp_request.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c2
-rw-r--r--sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h2
-rw-r--r--sys/dev/isci/scil/scic_sgpio.h2
-rw-r--r--sys/dev/isci/scil/scic_task_request.h2
-rw-r--r--sys/dev/isci/scil/scic_user_callback.h2
-rw-r--r--sys/dev/isci/scil/scif_config_parameters.h2
-rw-r--r--sys/dev/isci/scil/scif_controller.h2
-rw-r--r--sys/dev/isci/scil/scif_domain.h2
-rw-r--r--sys/dev/isci/scil/scif_io_request.h2
-rw-r--r--sys/dev/isci/scil/scif_library.h2
-rw-r--r--sys/dev/isci/scil/scif_logger.h2
-rw-r--r--sys/dev/isci/scil/scif_overview.h2
-rw-r--r--sys/dev/isci/scil/scif_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_constants.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_controller.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_controller.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_controller_state_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_controller_states.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_design.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_domain.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_domain.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_domain_state_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_domain_states.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_high_priority_request_queue.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_high_priority_request_queue.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_internal_io_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_internal_io_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_io_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_io_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_io_request_state_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_io_request_states.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_library.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_library.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_logger.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_remote_device_states.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_sati_binding.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_io_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_io_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_phy.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_phy.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_smp_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_io_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_io_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_remote_device.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_remote_device.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_task_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_stp_task_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_task_request.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_task_request.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_task_request_state_handlers.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_task_request_states.c2
-rw-r--r--sys/dev/isci/scil/scif_sas_timer.c2
-rw-r--r--sys/dev/isci/scil/scif_task_request.h2
-rw-r--r--sys/dev/isci/scil/scif_user_callback.h2
-rw-r--r--sys/dev/isci/scil/scu_bios_definitions.h2
-rw-r--r--sys/dev/isci/scil/scu_completion_codes.h2
-rw-r--r--sys/dev/isci/scil/scu_constants.h2
-rw-r--r--sys/dev/isci/scil/scu_event_codes.h2
-rw-r--r--sys/dev/isci/scil/scu_registers.h2
-rw-r--r--sys/dev/isci/scil/scu_remote_node_context.h2
-rw-r--r--sys/dev/isci/scil/scu_task_context.h2
-rw-r--r--sys/dev/isci/scil/scu_unsolicited_frame.h2
-rw-r--r--sys/dev/isci/scil/scu_viit_data.h2
-rw-r--r--sys/dev/isci/types.h2
-rw-r--r--sys/dev/iscsi/icl.c2
-rw-r--r--sys/dev/iscsi/icl.h2
-rw-r--r--sys/dev/iscsi/iscsi.c2
-rw-r--r--sys/dev/iscsi/iscsi.h2
-rw-r--r--sys/dev/iscsi/iscsi_ioctl.h2
-rw-r--r--sys/dev/iscsi/iscsi_proto.h2
-rw-r--r--sys/dev/iscsi_initiator/isc_cam.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_sm.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_soc.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_subr.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsi.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsi.h2
-rw-r--r--sys/dev/iscsi_initiator/iscsi_subr.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsivar.h2
-rw-r--r--sys/dev/isp/isp_freebsd.c2
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/isp/isp_ioctl.h2
-rw-r--r--sys/dev/isp/isp_library.c2
-rw-r--r--sys/dev/isp/isp_library.h2
-rw-r--r--sys/dev/isp/isp_sbus.c2
-rw-r--r--sys/dev/isp/isp_stds.h2
-rw-r--r--sys/dev/isp/isp_target.c2
-rw-r--r--sys/dev/isp/isp_target.h2
-rw-r--r--sys/dev/isp/ispreg.h2
-rw-r--r--sys/dev/ispfw/asm_1000.h2
-rw-r--r--sys/dev/ispfw/asm_1040.h2
-rw-r--r--sys/dev/ispfw/asm_1080.h2
-rw-r--r--sys/dev/ispfw/asm_12160.h2
-rw-r--r--sys/dev/ispfw/asm_2100.h2
-rw-r--r--sys/dev/ispfw/asm_2200.h2
-rw-r--r--sys/dev/ispfw/asm_2300.h2
-rw-r--r--sys/dev/ispfw/asm_2322.h2
-rw-r--r--sys/dev/ispfw/asm_2400.h2
-rw-r--r--sys/dev/ispfw/asm_2500.h2
-rw-r--r--sys/dev/ispfw/ispfw.c2
-rw-r--r--sys/dev/iwi/if_iwi.c2
-rw-r--r--sys/dev/iwi/if_iwireg.h2
-rw-r--r--sys/dev/iwi/if_iwivar.h2
-rw-r--r--sys/dev/ixgb/if_ixgb.c1
-rw-r--r--sys/dev/ixgb/if_ixgb.h1
-rw-r--r--sys/dev/ixgb/if_ixgb_osdep.h1
-rw-r--r--sys/dev/ixgb/ixgb_ee.c1
-rw-r--r--sys/dev/ixgb/ixgb_ee.h1
-rw-r--r--sys/dev/ixgb/ixgb_hw.c1
-rw-r--r--sys/dev/ixgb/ixgb_hw.h1
-rw-r--r--sys/dev/ixgb/ixgb_ids.h1
-rw-r--r--sys/dev/ixgbe/ixgbe.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_82598.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_82598.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_82599.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_82599.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_api.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_api.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_common.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_common.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb_82598.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb_82598.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb_82599.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_dcb_82599.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_mbx.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_mbx.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_osdep.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_phy.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_phy.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_type.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_vf.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_vf.h1
-rw-r--r--sys/dev/ixgbe/ixgbe_x540.c1
-rw-r--r--sys/dev/ixgbe/ixgbe_x540.h1
-rw-r--r--sys/dev/jme/if_jme.c2
-rw-r--r--sys/dev/jme/if_jmereg.h2
-rw-r--r--sys/dev/jme/if_jmevar.h2
-rw-r--r--sys/dev/joy/joy.c2
-rw-r--r--sys/dev/joy/joy_isa.c2
-rw-r--r--sys/dev/joy/joyvar.h2
-rw-r--r--sys/dev/kbd/kbd.c2
-rw-r--r--sys/dev/kbd/kbdreg.h2
-rw-r--r--sys/dev/kbd/kbdtables.h2
-rw-r--r--sys/dev/kbdmux/kbdmux.c2
-rw-r--r--sys/dev/ksyms/ksyms.c2
-rw-r--r--sys/dev/le/am7990.c2
-rw-r--r--sys/dev/le/am79900.c2
-rw-r--r--sys/dev/le/am79900reg.h2
-rw-r--r--sys/dev/le/am79900var.h2
-rw-r--r--sys/dev/le/am7990reg.h2
-rw-r--r--sys/dev/le/am7990var.h2
-rw-r--r--sys/dev/le/if_le_isa.c2
-rw-r--r--sys/dev/le/if_le_lebuffer.c2
-rw-r--r--sys/dev/le/if_le_ledma.c2
-rw-r--r--sys/dev/le/if_le_pci.c2
-rw-r--r--sys/dev/le/lance.c2
-rw-r--r--sys/dev/le/lancereg.h2
-rw-r--r--sys/dev/le/lancevar.h2
-rw-r--r--sys/dev/le/lebuffer_sbus.c2
-rw-r--r--sys/dev/lge/if_lge.c2
-rw-r--r--sys/dev/lge/if_lgereg.h2
-rw-r--r--sys/dev/lmc/if_lmc.c4
-rw-r--r--sys/dev/lmc/if_lmc.h4
-rw-r--r--sys/dev/malo/if_malo.c2
-rw-r--r--sys/dev/malo/if_malo.h2
-rw-r--r--sys/dev/malo/if_malo_pci.c2
-rw-r--r--sys/dev/malo/if_malohal.c2
-rw-r--r--sys/dev/malo/if_malohal.h2
-rw-r--r--sys/dev/malo/if_maloioctl.h2
-rw-r--r--sys/dev/mc146818/mc146818.c2
-rw-r--r--sys/dev/mc146818/mc146818var.h2
-rw-r--r--sys/dev/md/md.c2
-rw-r--r--sys/dev/mem/memdev.c2
-rw-r--r--sys/dev/mem/memutil.c2
-rw-r--r--sys/dev/mfi/mfi.c2
-rw-r--r--sys/dev/mfi/mfi_cam.c2
-rw-r--r--sys/dev/mfi/mfi_debug.c2
-rw-r--r--sys/dev/mfi/mfi_disk.c2
-rw-r--r--sys/dev/mfi/mfi_ioctl.h2
-rw-r--r--sys/dev/mfi/mfi_linux.c2
-rw-r--r--sys/dev/mfi/mfi_pci.c2
-rw-r--r--sys/dev/mfi/mfi_syspd.c2
-rw-r--r--sys/dev/mfi/mfi_tbolt.c4
-rw-r--r--sys/dev/mfi/mfireg.h2
-rw-r--r--sys/dev/mfi/mfivar.h2
-rw-r--r--sys/dev/mge/if_mge.c2
-rw-r--r--sys/dev/mge/if_mgevar.h2
-rw-r--r--sys/dev/mii/acphy.c2
-rw-r--r--sys/dev/mii/acphyreg.h2
-rw-r--r--sys/dev/mii/amphy.c2
-rw-r--r--sys/dev/mii/amphyreg.h2
-rw-r--r--sys/dev/mii/atphy.c2
-rw-r--r--sys/dev/mii/atphyreg.h2
-rw-r--r--sys/dev/mii/axphy.c2
-rw-r--r--sys/dev/mii/bmtphy.c2
-rw-r--r--sys/dev/mii/bmtphyreg.h2
-rw-r--r--sys/dev/mii/brgphy.c2
-rw-r--r--sys/dev/mii/brgphyreg.h2
-rw-r--r--sys/dev/mii/ciphy.c2
-rw-r--r--sys/dev/mii/ciphyreg.h2
-rw-r--r--sys/dev/mii/e1000phy.c2
-rw-r--r--sys/dev/mii/e1000phyreg.h2
-rw-r--r--sys/dev/mii/gentbi.c2
-rw-r--r--sys/dev/mii/icsphy.c2
-rw-r--r--sys/dev/mii/icsphyreg.h2
-rw-r--r--sys/dev/mii/ip1000phy.c2
-rw-r--r--sys/dev/mii/ip1000phyreg.h2
-rw-r--r--sys/dev/mii/jmphy.c2
-rw-r--r--sys/dev/mii/jmphyreg.h2
-rw-r--r--sys/dev/mii/lxtphy.c2
-rw-r--r--sys/dev/mii/lxtphyreg.h2
-rw-r--r--sys/dev/mii/mii.c2
-rw-r--r--sys/dev/mii/mii.h2
-rw-r--r--sys/dev/mii/mii_bitbang.c2
-rw-r--r--sys/dev/mii/mii_bitbang.h2
-rw-r--r--sys/dev/mii/mii_physubr.c2
-rw-r--r--sys/dev/mii/miivar.h2
-rw-r--r--sys/dev/mii/mlphy.c2
-rw-r--r--sys/dev/mii/nsgphy.c2
-rw-r--r--sys/dev/mii/nsgphyreg.h2
-rw-r--r--sys/dev/mii/nsphy.c2
-rw-r--r--sys/dev/mii/nsphyreg.h2
-rw-r--r--sys/dev/mii/nsphyter.c2
-rw-r--r--sys/dev/mii/nsphyterreg.h2
-rw-r--r--sys/dev/mii/pnaphy.c2
-rw-r--r--sys/dev/mii/qsphy.c2
-rw-r--r--sys/dev/mii/qsphyreg.h2
-rw-r--r--sys/dev/mii/rdcphy.c2
-rw-r--r--sys/dev/mii/rdcphyreg.h2
-rw-r--r--sys/dev/mii/rgephy.c2
-rw-r--r--sys/dev/mii/rgephyreg.h2
-rw-r--r--sys/dev/mii/rlphy.c2
-rw-r--r--sys/dev/mii/rlswitch.c2
-rw-r--r--sys/dev/mii/smcphy.c2
-rw-r--r--sys/dev/mii/smscphy.c2
-rw-r--r--sys/dev/mii/tdkphy.c2
-rw-r--r--sys/dev/mii/tdkphyreg.h2
-rw-r--r--sys/dev/mii/tlphy.c2
-rw-r--r--sys/dev/mii/tlphyreg.h2
-rw-r--r--sys/dev/mii/truephy.c2
-rw-r--r--sys/dev/mii/truephyreg.h2
-rw-r--r--sys/dev/mii/ukphy.c2
-rw-r--r--sys/dev/mii/ukphy_subr.c2
-rw-r--r--sys/dev/mii/xmphy.c2
-rw-r--r--sys/dev/mii/xmphyreg.h2
-rw-r--r--sys/dev/mk48txx/mk48txx.c2
-rw-r--r--sys/dev/mk48txx/mk48txxreg.h2
-rw-r--r--sys/dev/mk48txx/mk48txxvar.h2
-rw-r--r--sys/dev/mlx/mlx.c2
-rw-r--r--sys/dev/mlx/mlx_disk.c2
-rw-r--r--sys/dev/mlx/mlx_pci.c2
-rw-r--r--sys/dev/mlx/mlxio.h2
-rw-r--r--sys/dev/mlx/mlxreg.h2
-rw-r--r--sys/dev/mlx/mlxvar.h2
-rw-r--r--sys/dev/mly/mly.c2
-rw-r--r--sys/dev/mly/mly_tables.h2
-rw-r--r--sys/dev/mly/mlyio.h2
-rw-r--r--sys/dev/mly/mlyreg.h2
-rw-r--r--sys/dev/mly/mlyvar.h2
-rw-r--r--sys/dev/mmc/bridge.h2
-rw-r--r--sys/dev/mmc/mmc.c2
-rw-r--r--sys/dev/mmc/mmcbrvar.h2
-rw-r--r--sys/dev/mmc/mmcreg.h2
-rw-r--r--sys/dev/mmc/mmcsd.c2
-rw-r--r--sys/dev/mmc/mmcvar.h2
-rw-r--r--sys/dev/mps/mpi/mpi2.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_cnfg.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_hbd.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_init.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_ioc.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_ra.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_raid.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_sas.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_targ.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_tool.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_type.h2
-rw-r--r--sys/dev/mps/mps.c2
-rw-r--r--sys/dev/mps/mps_config.c2
-rw-r--r--sys/dev/mps/mps_ioctl.h2
-rw-r--r--sys/dev/mps/mps_mapping.c2
-rw-r--r--sys/dev/mps/mps_mapping.h2
-rw-r--r--sys/dev/mps/mps_pci.c2
-rw-r--r--sys/dev/mps/mps_sas.c2
-rw-r--r--sys/dev/mps/mps_sas.h2
-rw-r--r--sys/dev/mps/mps_sas_lsi.c2
-rw-r--r--sys/dev/mps/mps_table.c2
-rw-r--r--sys/dev/mps/mps_table.h2
-rw-r--r--sys/dev/mps/mps_user.c2
-rw-r--r--sys/dev/mps/mpsvar.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_cnfg.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_fc.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_init.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_ioc.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_lan.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_log_fc.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_log_sas.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_raid.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_sas.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_targ.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_tool.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_type.h4
-rw-r--r--sys/dev/mpt/mpt.c2
-rw-r--r--sys/dev/mpt/mpt.h2
-rw-r--r--sys/dev/mpt/mpt_cam.c2
-rw-r--r--sys/dev/mpt/mpt_cam.h2
-rw-r--r--sys/dev/mpt/mpt_debug.c2
-rw-r--r--sys/dev/mpt/mpt_pci.c2
-rw-r--r--sys/dev/mpt/mpt_raid.c2
-rw-r--r--sys/dev/mpt/mpt_raid.h2
-rw-r--r--sys/dev/mpt/mpt_reg.h2
-rw-r--r--sys/dev/mpt/mpt_user.c2
-rw-r--r--sys/dev/mse/mse.c2
-rw-r--r--sys/dev/mse/mse_isa.c2
-rw-r--r--sys/dev/mse/msevar.h2
-rw-r--r--sys/dev/msk/if_msk.c2
-rw-r--r--sys/dev/msk/if_mskreg.h2
-rw-r--r--sys/dev/mvs/mvs.c2
-rw-r--r--sys/dev/mvs/mvs.h2
-rw-r--r--sys/dev/mvs/mvs_pci.c2
-rw-r--r--sys/dev/mvs/mvs_soc.c2
-rw-r--r--sys/dev/mwl/if_mwl.c2
-rw-r--r--sys/dev/mwl/if_mwl_pci.c2
-rw-r--r--sys/dev/mwl/if_mwlioctl.h2
-rw-r--r--sys/dev/mwl/if_mwlvar.h2
-rw-r--r--sys/dev/mwl/mwldiag.h2
-rw-r--r--sys/dev/mwl/mwlhal.c2
-rw-r--r--sys/dev/mwl/mwlhal.h2
-rw-r--r--sys/dev/mwl/mwlreg.h2
-rw-r--r--sys/dev/mxge/eth_z8e.h1
-rw-r--r--sys/dev/mxge/ethp_z8e.h1
-rw-r--r--sys/dev/mxge/if_mxge.c1
-rw-r--r--sys/dev/mxge/if_mxge_var.h1
-rw-r--r--sys/dev/mxge/mcp_gen_header.h1
-rw-r--r--sys/dev/mxge/mxge_mcp.h1
-rw-r--r--sys/dev/mxge/rss_eth_z8e.h1
-rw-r--r--sys/dev/mxge/rss_ethp_z8e.h1
-rw-r--r--sys/dev/my/if_my.c2
-rw-r--r--sys/dev/my/if_myreg.h2
-rw-r--r--sys/dev/nand/nand.c2
-rw-r--r--sys/dev/nand/nand.h2
-rw-r--r--sys/dev/nand/nand_bbt.c2
-rw-r--r--sys/dev/nand/nand_cdev.c2
-rw-r--r--sys/dev/nand/nand_dev.h2
-rw-r--r--sys/dev/nand/nand_ecc_pos.h2
-rw-r--r--sys/dev/nand/nand_generic.c2
-rw-r--r--sys/dev/nand/nand_geom.c2
-rw-r--r--sys/dev/nand/nand_id.c2
-rw-r--r--sys/dev/nand/nandbus.c2
-rw-r--r--sys/dev/nand/nandbus.h2
-rw-r--r--sys/dev/nand/nandsim.c2
-rw-r--r--sys/dev/nand/nandsim.h2
-rw-r--r--sys/dev/nand/nandsim_chip.c2
-rw-r--r--sys/dev/nand/nandsim_chip.h2
-rw-r--r--sys/dev/nand/nandsim_ctrl.c2
-rw-r--r--sys/dev/nand/nandsim_log.c2
-rw-r--r--sys/dev/nand/nandsim_log.h2
-rw-r--r--sys/dev/nand/nandsim_swap.c2
-rw-r--r--sys/dev/nand/nandsim_swap.h2
-rw-r--r--sys/dev/nand/nfc_at91.c2
-rw-r--r--sys/dev/nand/nfc_at91.h2
-rw-r--r--sys/dev/nand/nfc_fsl.c2
-rw-r--r--sys/dev/nand/nfc_fsl.h2
-rw-r--r--sys/dev/nand/nfc_mv.c2
-rw-r--r--sys/dev/ncv/ncr53c500.c2
-rw-r--r--sys/dev/ncv/ncr53c500_pccard.c2
-rw-r--r--sys/dev/ncv/ncr53c500hw.h2
-rw-r--r--sys/dev/ncv/ncr53c500hwtab.h2
-rw-r--r--sys/dev/ncv/ncr53c500reg.h2
-rw-r--r--sys/dev/ncv/ncr53c500var.h2
-rw-r--r--sys/dev/netmap/if_em_netmap.h4
-rw-r--r--sys/dev/netmap/if_igb_netmap.h4
-rw-r--r--sys/dev/netmap/if_lem_netmap.h4
-rw-r--r--sys/dev/netmap/if_re_netmap.h4
-rw-r--r--sys/dev/netmap/ixgbe_netmap.h4
-rw-r--r--sys/dev/netmap/netmap.c4
-rw-r--r--sys/dev/netmap/netmap_freebsd.c4
-rw-r--r--sys/dev/netmap/netmap_generic.c4
-rw-r--r--sys/dev/netmap/netmap_kern.h4
-rw-r--r--sys/dev/netmap/netmap_mbq.c4
-rw-r--r--sys/dev/netmap/netmap_mbq.h4
-rw-r--r--sys/dev/netmap/netmap_mem2.c4
-rw-r--r--sys/dev/netmap/netmap_mem2.h4
-rw-r--r--sys/dev/netmap/netmap_offloadings.c4
-rw-r--r--sys/dev/netmap/netmap_pipe.c4
-rw-r--r--sys/dev/netmap/netmap_vale.c4
-rw-r--r--sys/dev/nge/if_nge.c2
-rw-r--r--sys/dev/nge/if_ngereg.h2
-rw-r--r--sys/dev/nmdm/nmdm.c2
-rw-r--r--sys/dev/nsp/nsp.c2
-rw-r--r--sys/dev/nsp/nsp_pccard.c2
-rw-r--r--sys/dev/nsp/nspreg.h2
-rw-r--r--sys/dev/nsp/nspvar.h2
-rw-r--r--sys/dev/null/null.c2
-rw-r--r--sys/dev/nvd/nvd.c2
-rw-r--r--sys/dev/nvme/nvme.c2
-rw-r--r--sys/dev/nvme/nvme.h2
-rw-r--r--sys/dev/nvme/nvme_ctrlr.c2
-rw-r--r--sys/dev/nvme/nvme_ctrlr_cmd.c2
-rw-r--r--sys/dev/nvme/nvme_ns.c2
-rw-r--r--sys/dev/nvme/nvme_ns_cmd.c2
-rw-r--r--sys/dev/nvme/nvme_private.h2
-rw-r--r--sys/dev/nvme/nvme_qpair.c2
-rw-r--r--sys/dev/nvme/nvme_sysctl.c2
-rw-r--r--sys/dev/nvme/nvme_test.c2
-rw-r--r--sys/dev/nvme/nvme_util.c2
-rw-r--r--sys/dev/nvram/nvram.c2
-rw-r--r--sys/dev/nvram2env/nvram2env.c2
-rw-r--r--sys/dev/nxge/if_nxge.c2
-rw-r--r--sys/dev/nxge/if_nxge.h2
-rw-r--r--sys/dev/nxge/include/version.h2
-rw-r--r--sys/dev/nxge/include/xge-debug.h2
-rw-r--r--sys/dev/nxge/include/xge-defs.h2
-rw-r--r--sys/dev/nxge/include/xge-list.h2
-rw-r--r--sys/dev/nxge/include/xge-os-pal.h2
-rw-r--r--sys/dev/nxge/include/xge-queue.h2
-rw-r--r--sys/dev/nxge/include/xgehal-channel.h2
-rw-r--r--sys/dev/nxge/include/xgehal-config.h2
-rw-r--r--sys/dev/nxge/include/xgehal-device.h2
-rw-r--r--sys/dev/nxge/include/xgehal-driver.h2
-rw-r--r--sys/dev/nxge/include/xgehal-event.h2
-rw-r--r--sys/dev/nxge/include/xgehal-fifo.h2
-rw-r--r--sys/dev/nxge/include/xgehal-mgmt.h2
-rw-r--r--sys/dev/nxge/include/xgehal-mgmtaux.h2
-rw-r--r--sys/dev/nxge/include/xgehal-mm.h2
-rw-r--r--sys/dev/nxge/include/xgehal-regs.h2
-rw-r--r--sys/dev/nxge/include/xgehal-ring.h2
-rw-r--r--sys/dev/nxge/include/xgehal-stats.h2
-rw-r--r--sys/dev/nxge/include/xgehal-types.h2
-rw-r--r--sys/dev/nxge/include/xgehal.h2
-rw-r--r--sys/dev/nxge/xge-osdep.h2
-rw-r--r--sys/dev/nxge/xgehal/xge-queue.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-channel-fp.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-channel.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-config.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-device-fp.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-device.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-driver.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-fifo-fp.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-fifo.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-mgmt.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-mgmtaux.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-mm.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-ring-fp.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-ring.c2
-rw-r--r--sys/dev/nxge/xgehal/xgehal-stats.c2
-rw-r--r--sys/dev/nxge/xgell-version.h2
-rw-r--r--sys/dev/oce/oce_hw.c2
-rw-r--r--sys/dev/oce/oce_hw.h2
-rw-r--r--sys/dev/oce/oce_if.c2
-rw-r--r--sys/dev/oce/oce_if.h2
-rw-r--r--sys/dev/oce/oce_mbox.c2
-rw-r--r--sys/dev/oce/oce_queue.c2
-rw-r--r--sys/dev/oce/oce_sysctl.c2
-rw-r--r--sys/dev/oce/oce_util.c2
-rw-r--r--sys/dev/ofw/ofw_bus.h2
-rw-r--r--sys/dev/ofw/ofw_bus_subr.c2
-rw-r--r--sys/dev/ofw/ofw_bus_subr.h2
-rw-r--r--sys/dev/ofw/ofw_console.c2
-rw-r--r--sys/dev/ofw/ofw_disk.c2
-rw-r--r--sys/dev/ofw/ofw_fdt.c2
-rw-r--r--sys/dev/ofw/ofw_pci.h2
-rw-r--r--sys/dev/ofw/ofw_standard.c2
-rw-r--r--sys/dev/ofw/ofwvar.h2
-rw-r--r--sys/dev/ofw/openfirm.c2
-rw-r--r--sys/dev/ofw/openfirm.h2
-rw-r--r--sys/dev/ofw/openfirmio.c2
-rw-r--r--sys/dev/ofw/openfirmio.h2
-rw-r--r--sys/dev/ofw/openpromio.c2
-rw-r--r--sys/dev/ofw/openpromio.h2
-rw-r--r--sys/dev/pbio/pbio.c2
-rw-r--r--sys/dev/pbio/pbioio.h2
-rw-r--r--sys/dev/pccard/pccard.c2
-rw-r--r--sys/dev/pccard/pccard_cis.c2
-rw-r--r--sys/dev/pccard/pccard_cis.h2
-rw-r--r--sys/dev/pccard/pccard_cis_quirks.c2
-rw-r--r--sys/dev/pccard/pccard_device.c2
-rw-r--r--sys/dev/pccard/pccardreg.h2
-rw-r--r--sys/dev/pccard/pccardvar.h2
-rw-r--r--sys/dev/pccard/pccardvarp.h2
-rw-r--r--sys/dev/pccbb/pccbb.c2
-rw-r--r--sys/dev/pccbb/pccbb_isa.c2
-rw-r--r--sys/dev/pccbb/pccbb_pci.c2
-rw-r--r--sys/dev/pccbb/pccbbdevid.h2
-rw-r--r--sys/dev/pccbb/pccbbreg.h2
-rw-r--r--sys/dev/pccbb/pccbbvar.h2
-rw-r--r--sys/dev/pcf/envctrl.c2
-rw-r--r--sys/dev/pcf/pcf.c2
-rw-r--r--sys/dev/pcf/pcf_ebus.c2
-rw-r--r--sys/dev/pcf/pcf_isa.c2
-rw-r--r--sys/dev/pcf/pcfvar.h2
-rw-r--r--sys/dev/pci/fixup_pci.c2
-rw-r--r--sys/dev/pci/hostb_pci.c4
-rw-r--r--sys/dev/pci/ignore_pci.c2
-rw-r--r--sys/dev/pci/isa_pci.c2
-rw-r--r--sys/dev/pci/pci.c2
-rw-r--r--sys/dev/pci/pci_pci.c2
-rw-r--r--sys/dev/pci/pci_private.h2
-rw-r--r--sys/dev/pci/pci_subr.c2
-rw-r--r--sys/dev/pci/pci_user.c2
-rw-r--r--sys/dev/pci/pcib_private.h2
-rw-r--r--sys/dev/pci/pcireg.h2
-rw-r--r--sys/dev/pci/pcivar.h2
-rw-r--r--sys/dev/pci/vga_pci.c2
-rw-r--r--sys/dev/pcn/if_pcn.c2
-rw-r--r--sys/dev/pcn/if_pcnreg.h2
-rw-r--r--sys/dev/pdq/if_fpa.c2
-rw-r--r--sys/dev/pdq/pdq.c2
-rw-r--r--sys/dev/pdq/pdq_freebsd.h2
-rw-r--r--sys/dev/pdq/pdq_ifsubr.c2
-rw-r--r--sys/dev/pdq/pdqreg.h2
-rw-r--r--sys/dev/pdq/pdqvar.h2
-rw-r--r--sys/dev/powermac_nvram/powermac_nvram.c4
-rw-r--r--sys/dev/powermac_nvram/powermac_nvramvar.h4
-rw-r--r--sys/dev/ppbus/if_plip.c2
-rw-r--r--sys/dev/ppbus/immio.c2
-rw-r--r--sys/dev/ppbus/lpbb.c2
-rw-r--r--sys/dev/ppbus/lpt.c2
-rw-r--r--sys/dev/ppbus/lpt.h2
-rw-r--r--sys/dev/ppbus/pcfclock.c2
-rw-r--r--sys/dev/ppbus/ppb_1284.c2
-rw-r--r--sys/dev/ppbus/ppb_1284.h2
-rw-r--r--sys/dev/ppbus/ppb_base.c2
-rw-r--r--sys/dev/ppbus/ppb_msq.c2
-rw-r--r--sys/dev/ppbus/ppb_msq.h2
-rw-r--r--sys/dev/ppbus/ppbconf.c2
-rw-r--r--sys/dev/ppbus/ppbconf.h2
-rw-r--r--sys/dev/ppbus/ppbio.h2
-rw-r--r--sys/dev/ppbus/ppi.c2
-rw-r--r--sys/dev/ppbus/ppi.h2
-rw-r--r--sys/dev/ppbus/vpo.c2
-rw-r--r--sys/dev/ppbus/vpoio.c2
-rw-r--r--sys/dev/ppbus/vpoio.h2
-rw-r--r--sys/dev/ppc/ppc.c2
-rw-r--r--sys/dev/ppc/ppc_acpi.c2
-rw-r--r--sys/dev/ppc/ppc_isa.c2
-rw-r--r--sys/dev/ppc/ppc_pci.c2
-rw-r--r--sys/dev/ppc/ppc_puc.c2
-rw-r--r--sys/dev/ppc/ppcreg.h2
-rw-r--r--sys/dev/ppc/ppcvar.h2
-rw-r--r--sys/dev/pst/pst-iop.c2
-rw-r--r--sys/dev/pst/pst-iop.h2
-rw-r--r--sys/dev/pst/pst-pci.c2
-rw-r--r--sys/dev/pst/pst-raid.c2
-rw-r--r--sys/dev/pty/pty.c2
-rw-r--r--sys/dev/puc/puc.c2
-rw-r--r--sys/dev/puc/puc_bfe.h2
-rw-r--r--sys/dev/puc/puc_bus.h2
-rw-r--r--sys/dev/puc/puc_cfg.c2
-rw-r--r--sys/dev/puc/puc_cfg.h2
-rw-r--r--sys/dev/puc/puc_pccard.c2
-rw-r--r--sys/dev/puc/puc_pci.c2
-rw-r--r--sys/dev/puc/pucdata.c2
-rw-r--r--sys/dev/qlxgb/qla_dbg.c4
-rw-r--r--sys/dev/qlxgb/qla_dbg.h4
-rw-r--r--sys/dev/qlxgb/qla_def.h4
-rw-r--r--sys/dev/qlxgb/qla_glbl.h4
-rw-r--r--sys/dev/qlxgb/qla_hw.c4
-rw-r--r--sys/dev/qlxgb/qla_hw.h4
-rw-r--r--sys/dev/qlxgb/qla_inline.h4
-rw-r--r--sys/dev/qlxgb/qla_ioctl.c4
-rw-r--r--sys/dev/qlxgb/qla_ioctl.h4
-rw-r--r--sys/dev/qlxgb/qla_isr.c4
-rw-r--r--sys/dev/qlxgb/qla_misc.c4
-rw-r--r--sys/dev/qlxgb/qla_os.c4
-rw-r--r--sys/dev/qlxgb/qla_os.h4
-rw-r--r--sys/dev/qlxgb/qla_reg.h4
-rw-r--r--sys/dev/qlxgb/qla_ver.h4
-rw-r--r--sys/dev/qlxgbe/ql_dbg.c4
-rw-r--r--sys/dev/qlxgbe/ql_dbg.h4
-rw-r--r--sys/dev/qlxgbe/ql_def.h4
-rw-r--r--sys/dev/qlxgbe/ql_glbl.h4
-rw-r--r--sys/dev/qlxgbe/ql_hw.c4
-rw-r--r--sys/dev/qlxgbe/ql_hw.h4
-rw-r--r--sys/dev/qlxgbe/ql_inline.h4
-rw-r--r--sys/dev/qlxgbe/ql_ioctl.c4
-rw-r--r--sys/dev/qlxgbe/ql_ioctl.h4
-rw-r--r--sys/dev/qlxgbe/ql_isr.c4
-rw-r--r--sys/dev/qlxgbe/ql_misc.c4
-rw-r--r--sys/dev/qlxgbe/ql_os.c4
-rw-r--r--sys/dev/qlxgbe/ql_os.h4
-rw-r--r--sys/dev/qlxgbe/ql_reset.c4
-rw-r--r--sys/dev/qlxgbe/ql_tmplt.h4
-rw-r--r--sys/dev/qlxgbe/ql_ver.h4
-rw-r--r--sys/dev/qlxge/qls_dbg.c4
-rw-r--r--sys/dev/qlxge/qls_dbg.h4
-rw-r--r--sys/dev/qlxge/qls_def.h4
-rw-r--r--sys/dev/qlxge/qls_dump.c4
-rw-r--r--sys/dev/qlxge/qls_dump.h4
-rw-r--r--sys/dev/qlxge/qls_glbl.h4
-rw-r--r--sys/dev/qlxge/qls_hw.c4
-rw-r--r--sys/dev/qlxge/qls_hw.h4
-rw-r--r--sys/dev/qlxge/qls_inline.h4
-rw-r--r--sys/dev/qlxge/qls_ioctl.c4
-rw-r--r--sys/dev/qlxge/qls_ioctl.h4
-rw-r--r--sys/dev/qlxge/qls_isr.c6
-rw-r--r--sys/dev/qlxge/qls_os.c4
-rw-r--r--sys/dev/qlxge/qls_os.h4
-rw-r--r--sys/dev/qlxge/qls_ver.h4
-rw-r--r--sys/dev/quicc/quicc_bfe.h2
-rw-r--r--sys/dev/quicc/quicc_bfe_fdt.c2
-rw-r--r--sys/dev/quicc/quicc_bus.h2
-rw-r--r--sys/dev/quicc/quicc_core.c2
-rw-r--r--sys/dev/rc/rc.c2
-rw-r--r--sys/dev/rc/rcreg.h2
-rw-r--r--sys/dev/re/if_re.c2
-rw-r--r--sys/dev/rndtest/rndtest.c2
-rw-r--r--sys/dev/rndtest/rndtest.h2
-rw-r--r--sys/dev/rp/rp.c2
-rw-r--r--sys/dev/rp/rp_isa.c2
-rw-r--r--sys/dev/rp/rp_pci.c2
-rw-r--r--sys/dev/rp/rpreg.h2
-rw-r--r--sys/dev/rp/rpvar.h2
-rw-r--r--sys/dev/rt/if_rt.c2
-rw-r--r--sys/dev/rt/if_rtreg.h2
-rw-r--r--sys/dev/rt/if_rtvar.h2
-rw-r--r--sys/dev/safe/safe.c2
-rw-r--r--sys/dev/safe/safereg.h2
-rw-r--r--sys/dev/safe/safevar.h2
-rw-r--r--sys/dev/scc/scc_bfe.h2
-rw-r--r--sys/dev/scc/scc_bfe_ebus.c2
-rw-r--r--sys/dev/scc/scc_bfe_macio.c2
-rw-r--r--sys/dev/scc/scc_bfe_quicc.c2
-rw-r--r--sys/dev/scc/scc_bfe_sbus.c2
-rw-r--r--sys/dev/scc/scc_bus.h2
-rw-r--r--sys/dev/scc/scc_core.c2
-rw-r--r--sys/dev/scc/scc_dev_quicc.c2
-rw-r--r--sys/dev/scc/scc_dev_sab82532.c2
-rw-r--r--sys/dev/scc/scc_dev_z8530.c2
-rw-r--r--sys/dev/sdhci/sdhci.c2
-rw-r--r--sys/dev/sdhci/sdhci.h2
-rw-r--r--sys/dev/sdhci/sdhci_fdt.c2
-rw-r--r--sys/dev/sdhci/sdhci_pci.c2
-rw-r--r--sys/dev/sec/sec.c2
-rw-r--r--sys/dev/sec/sec.h2
-rw-r--r--sys/dev/sf/if_sf.c2
-rw-r--r--sys/dev/sf/if_sfreg.h2
-rw-r--r--sys/dev/sfxge/common/efsys.h2
-rw-r--r--sys/dev/sfxge/common/efx.h2
-rw-r--r--sys/dev/sfxge/common/efx_bootcfg.c2
-rw-r--r--sys/dev/sfxge/common/efx_ev.c2
-rw-r--r--sys/dev/sfxge/common/efx_filter.c2
-rw-r--r--sys/dev/sfxge/common/efx_impl.h2
-rw-r--r--sys/dev/sfxge/common/efx_intr.c2
-rw-r--r--sys/dev/sfxge/common/efx_mac.c2
-rw-r--r--sys/dev/sfxge/common/efx_mcdi.c2
-rw-r--r--sys/dev/sfxge/common/efx_mcdi.h2
-rw-r--r--sys/dev/sfxge/common/efx_mon.c2
-rw-r--r--sys/dev/sfxge/common/efx_nic.c2
-rw-r--r--sys/dev/sfxge/common/efx_nvram.c2
-rw-r--r--sys/dev/sfxge/common/efx_phy.c2
-rw-r--r--sys/dev/sfxge/common/efx_port.c2
-rw-r--r--sys/dev/sfxge/common/efx_regs.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_ef10.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_mcdi.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_pci.h2
-rw-r--r--sys/dev/sfxge/common/efx_rx.c2
-rw-r--r--sys/dev/sfxge/common/efx_sram.c2
-rw-r--r--sys/dev/sfxge/common/efx_tx.c2
-rw-r--r--sys/dev/sfxge/common/efx_types.h2
-rw-r--r--sys/dev/sfxge/common/efx_vpd.c2
-rw-r--r--sys/dev/sfxge/common/siena_flash.h2
-rw-r--r--sys/dev/sfxge/common/siena_impl.h2
-rw-r--r--sys/dev/sfxge/common/siena_mac.c2
-rw-r--r--sys/dev/sfxge/common/siena_nic.c2
-rw-r--r--sys/dev/sfxge/common/siena_nvram.c2
-rw-r--r--sys/dev/sfxge/common/siena_phy.c2
-rw-r--r--sys/dev/sfxge/common/siena_sram.c2
-rw-r--r--sys/dev/sfxge/common/siena_vpd.c2
-rw-r--r--sys/dev/sfxge/sfxge.c2
-rw-r--r--sys/dev/sfxge/sfxge.h2
-rw-r--r--sys/dev/sfxge/sfxge_dma.c2
-rw-r--r--sys/dev/sfxge/sfxge_ev.c2
-rw-r--r--sys/dev/sfxge/sfxge_intr.c2
-rw-r--r--sys/dev/sfxge/sfxge_mcdi.c2
-rw-r--r--sys/dev/sfxge/sfxge_port.c2
-rw-r--r--sys/dev/sfxge/sfxge_rx.c2
-rw-r--r--sys/dev/sfxge/sfxge_rx.h2
-rw-r--r--sys/dev/sfxge/sfxge_tx.c2
-rw-r--r--sys/dev/sfxge/sfxge_tx.h2
-rw-r--r--sys/dev/sge/if_sge.c2
-rw-r--r--sys/dev/sge/if_sgereg.h2
-rw-r--r--sys/dev/siba/siba_bwn.c2
-rw-r--r--sys/dev/siba/siba_core.c2
-rw-r--r--sys/dev/siba/siba_ids.h2
-rw-r--r--sys/dev/siba/sibareg.h2
-rw-r--r--sys/dev/siba/sibavar.h2
-rw-r--r--sys/dev/siis/siis.c2
-rw-r--r--sys/dev/siis/siis.h2
-rw-r--r--sys/dev/sio/sio.c2
-rw-r--r--sys/dev/sio/sio_isa.c2
-rw-r--r--sys/dev/sio/sio_pccard.c2
-rw-r--r--sys/dev/sio/sio_pci.c2
-rw-r--r--sys/dev/sio/sio_puc.c2
-rw-r--r--sys/dev/sio/sioreg.h2
-rw-r--r--sys/dev/sio/siovar.h2
-rw-r--r--sys/dev/sis/if_sis.c2
-rw-r--r--sys/dev/sis/if_sisreg.h2
-rw-r--r--sys/dev/sk/if_sk.c2
-rw-r--r--sys/dev/sk/if_skreg.h2
-rw-r--r--sys/dev/sk/xmaciireg.h2
-rw-r--r--sys/dev/smbus/smb.c2
-rw-r--r--sys/dev/smbus/smb.h2
-rw-r--r--sys/dev/smbus/smbconf.c2
-rw-r--r--sys/dev/smbus/smbconf.h2
-rw-r--r--sys/dev/smbus/smbus.c2
-rw-r--r--sys/dev/smbus/smbus.h2
-rw-r--r--sys/dev/smc/if_smc.c2
-rw-r--r--sys/dev/smc/if_smcreg.h2
-rw-r--r--sys/dev/smc/if_smcvar.h2
-rw-r--r--sys/dev/sn/if_sn.c2
-rw-r--r--sys/dev/sn/if_sn_isa.c2
-rw-r--r--sys/dev/sn/if_sn_pccard.c2
-rw-r--r--sys/dev/sn/if_snreg.h2
-rw-r--r--sys/dev/sn/if_snvar.h2
-rw-r--r--sys/dev/sn/ositech.h2
-rw-r--r--sys/dev/snp/snp.c2
-rw-r--r--sys/dev/sound/chip.h2
-rw-r--r--sys/dev/sound/clone.c2
-rw-r--r--sys/dev/sound/clone.h2
-rw-r--r--sys/dev/sound/driver.c2
-rw-r--r--sys/dev/sound/isa/ad1816.c2
-rw-r--r--sys/dev/sound/isa/ad1816.h2
-rw-r--r--sys/dev/sound/isa/ess.c2
-rw-r--r--sys/dev/sound/isa/gusc.c2
-rw-r--r--sys/dev/sound/isa/mss.c2
-rw-r--r--sys/dev/sound/isa/mss.h2
-rw-r--r--sys/dev/sound/isa/sb.h2
-rw-r--r--sys/dev/sound/isa/sb16.c2
-rw-r--r--sys/dev/sound/isa/sb8.c2
-rw-r--r--sys/dev/sound/isa/sbc.c2
-rw-r--r--sys/dev/sound/isa/sndbuf_dma.c2
-rw-r--r--sys/dev/sound/macio/aoa.c2
-rw-r--r--sys/dev/sound/macio/aoa.h2
-rw-r--r--sys/dev/sound/macio/davbus.c2
-rw-r--r--sys/dev/sound/macio/davbusreg.h2
-rw-r--r--sys/dev/sound/macio/i2s.c2
-rw-r--r--sys/dev/sound/macio/onyx.c2
-rw-r--r--sys/dev/sound/macio/snapper.c2
-rw-r--r--sys/dev/sound/macio/tumbler.c2
-rw-r--r--sys/dev/sound/midi/midi.c2
-rw-r--r--sys/dev/sound/midi/midi.h2
-rw-r--r--sys/dev/sound/midi/midiq.h2
-rw-r--r--sys/dev/sound/midi/mpu401.c2
-rw-r--r--sys/dev/sound/midi/mpu401.h2
-rw-r--r--sys/dev/sound/midi/sequencer.c2
-rw-r--r--sys/dev/sound/midi/sequencer.h2
-rw-r--r--sys/dev/sound/pci/allegro_code.h2
-rw-r--r--sys/dev/sound/pci/allegro_reg.h2
-rw-r--r--sys/dev/sound/pci/als4000.c2
-rw-r--r--sys/dev/sound/pci/als4000.h2
-rw-r--r--sys/dev/sound/pci/atiixp.c2
-rw-r--r--sys/dev/sound/pci/atiixp.h2
-rw-r--r--sys/dev/sound/pci/aureal.c2
-rw-r--r--sys/dev/sound/pci/aureal.h2
-rw-r--r--sys/dev/sound/pci/cmi.c2
-rw-r--r--sys/dev/sound/pci/cmireg.h2
-rw-r--r--sys/dev/sound/pci/cs4281.c2
-rw-r--r--sys/dev/sound/pci/cs4281.h2
-rw-r--r--sys/dev/sound/pci/cs461x_dsp.h2
-rw-r--r--sys/dev/sound/pci/csa.c2
-rw-r--r--sys/dev/sound/pci/csapcm.c2
-rw-r--r--sys/dev/sound/pci/csareg.h2
-rw-r--r--sys/dev/sound/pci/csavar.h2
-rw-r--r--sys/dev/sound/pci/ds1-fw.h2
-rw-r--r--sys/dev/sound/pci/ds1.c2
-rw-r--r--sys/dev/sound/pci/emu10k1.c2
-rw-r--r--sys/dev/sound/pci/emu10kx-midi.c2
-rw-r--r--sys/dev/sound/pci/emu10kx-pcm.c2
-rw-r--r--sys/dev/sound/pci/emu10kx.c2
-rw-r--r--sys/dev/sound/pci/emu10kx.h2
-rw-r--r--sys/dev/sound/pci/envy24.c2
-rw-r--r--sys/dev/sound/pci/envy24.h2
-rw-r--r--sys/dev/sound/pci/envy24ht.c2
-rw-r--r--sys/dev/sound/pci/envy24ht.h2
-rw-r--r--sys/dev/sound/pci/es137x.c2
-rw-r--r--sys/dev/sound/pci/es137x.h2
-rw-r--r--sys/dev/sound/pci/fm801.c2
-rw-r--r--sys/dev/sound/pci/hda/hda_reg.h2
-rw-r--r--sys/dev/sound/pci/hda/hdaa.c2
-rw-r--r--sys/dev/sound/pci/hda/hdaa.h4
-rw-r--r--sys/dev/sound/pci/hda/hdaa_patches.c2
-rw-r--r--sys/dev/sound/pci/hda/hdac.c2
-rw-r--r--sys/dev/sound/pci/hda/hdac.h2
-rw-r--r--sys/dev/sound/pci/hda/hdac_private.h2
-rw-r--r--sys/dev/sound/pci/hda/hdac_reg.h2
-rw-r--r--sys/dev/sound/pci/hda/hdacc.c2
-rw-r--r--sys/dev/sound/pci/hdspe-pcm.c197
-rw-r--r--sys/dev/sound/pci/hdspe.c43
-rw-r--r--sys/dev/sound/pci/hdspe.h2
-rw-r--r--sys/dev/sound/pci/ich.c2
-rw-r--r--sys/dev/sound/pci/ich.h2
-rw-r--r--sys/dev/sound/pci/maestro.c2
-rw-r--r--sys/dev/sound/pci/maestro3.c2
-rw-r--r--sys/dev/sound/pci/maestro_reg.h2
-rw-r--r--sys/dev/sound/pci/neomagic-coeff.h2
-rw-r--r--sys/dev/sound/pci/neomagic.c2
-rw-r--r--sys/dev/sound/pci/neomagic.h2
-rw-r--r--sys/dev/sound/pci/solo.c2
-rw-r--r--sys/dev/sound/pci/spicds.c2
-rw-r--r--sys/dev/sound/pci/spicds.h2
-rw-r--r--sys/dev/sound/pci/t4dwave.c2
-rw-r--r--sys/dev/sound/pci/t4dwave.h2
-rw-r--r--sys/dev/sound/pci/via8233.c2
-rw-r--r--sys/dev/sound/pci/via8233.h2
-rw-r--r--sys/dev/sound/pci/via82c686.c2
-rw-r--r--sys/dev/sound/pci/via82c686.h2
-rw-r--r--sys/dev/sound/pci/vibes.c2
-rw-r--r--sys/dev/sound/pci/vibes.h2
-rw-r--r--sys/dev/sound/pcm/ac97.c2
-rw-r--r--sys/dev/sound/pcm/ac97.h2
-rw-r--r--sys/dev/sound/pcm/ac97_patch.c2
-rw-r--r--sys/dev/sound/pcm/ac97_patch.h2
-rw-r--r--sys/dev/sound/pcm/buffer.c2
-rw-r--r--sys/dev/sound/pcm/buffer.h2
-rw-r--r--sys/dev/sound/pcm/channel.c2
-rw-r--r--sys/dev/sound/pcm/channel.h2
-rw-r--r--sys/dev/sound/pcm/dsp.c2
-rw-r--r--sys/dev/sound/pcm/dsp.h2
-rw-r--r--sys/dev/sound/pcm/feeder.c2
-rw-r--r--sys/dev/sound/pcm/feeder.h2
-rw-r--r--sys/dev/sound/pcm/feeder_chain.c2
-rw-r--r--sys/dev/sound/pcm/feeder_eq.c2
-rw-r--r--sys/dev/sound/pcm/feeder_format.c2
-rw-r--r--sys/dev/sound/pcm/feeder_matrix.c2
-rw-r--r--sys/dev/sound/pcm/feeder_mixer.c2
-rw-r--r--sys/dev/sound/pcm/feeder_rate.c2
-rw-r--r--sys/dev/sound/pcm/feeder_volume.c2
-rw-r--r--sys/dev/sound/pcm/g711.h2
-rw-r--r--sys/dev/sound/pcm/intpcm.h2
-rw-r--r--sys/dev/sound/pcm/matrix.h2
-rw-r--r--sys/dev/sound/pcm/matrix_map.h2
-rw-r--r--sys/dev/sound/pcm/mixer.c2
-rw-r--r--sys/dev/sound/pcm/mixer.h2
-rw-r--r--sys/dev/sound/pcm/pcm.h2
-rw-r--r--sys/dev/sound/pcm/sndstat.c2
-rw-r--r--sys/dev/sound/pcm/sndstat.h2
-rw-r--r--sys/dev/sound/pcm/sound.c2
-rw-r--r--sys/dev/sound/pcm/sound.h2
-rw-r--r--sys/dev/sound/pcm/vchan.c2
-rw-r--r--sys/dev/sound/pcm/vchan.h2
-rw-r--r--sys/dev/sound/sbus/apcdmareg.h2
-rw-r--r--sys/dev/sound/sbus/cs4231.c2
-rw-r--r--sys/dev/sound/sbus/cs4231.h2
-rw-r--r--sys/dev/sound/unit.c2
-rw-r--r--sys/dev/sound/unit.h2
-rw-r--r--sys/dev/sound/usb/uaudio.c2
-rw-r--r--sys/dev/sound/usb/uaudio.h2
-rw-r--r--sys/dev/sound/usb/uaudio_pcm.c2
-rw-r--r--sys/dev/sound/usb/uaudioreg.h2
-rw-r--r--sys/dev/sound/version.h2
-rw-r--r--sys/dev/spibus/ofw_spibus.c26
-rw-r--r--sys/dev/ste/if_ste.c2
-rw-r--r--sys/dev/ste/if_stereg.h2
-rw-r--r--sys/dev/stg/tmc18c30.c2
-rw-r--r--sys/dev/stg/tmc18c30_isa.c2
-rw-r--r--sys/dev/stg/tmc18c30_pccard.c2
-rw-r--r--sys/dev/stg/tmc18c30_pci.c2
-rw-r--r--sys/dev/stg/tmc18c30_subr.c2
-rw-r--r--sys/dev/stg/tmc18c30reg.h2
-rw-r--r--sys/dev/stg/tmc18c30var.h2
-rw-r--r--sys/dev/stge/if_stge.c2
-rw-r--r--sys/dev/stge/if_stgereg.h2
-rw-r--r--sys/dev/sym/sym_conf.h2
-rw-r--r--sys/dev/sym/sym_defs.h2
-rw-r--r--sys/dev/sym/sym_fw.h2
-rw-r--r--sys/dev/sym/sym_fw1.h2
-rw-r--r--sys/dev/sym/sym_fw2.h2
-rw-r--r--sys/dev/sym/sym_hipd.c2
-rw-r--r--sys/dev/syscons/apm/apm_saver.c2
-rw-r--r--sys/dev/syscons/blank/blank_saver.c2
-rw-r--r--sys/dev/syscons/daemon/daemon_saver.c2
-rw-r--r--sys/dev/syscons/dragon/dragon_saver.c2
-rw-r--r--sys/dev/syscons/fade/fade_saver.c2
-rw-r--r--sys/dev/syscons/fire/fire_saver.c2
-rw-r--r--sys/dev/syscons/green/green_saver.c2
-rw-r--r--sys/dev/syscons/logo/logo_saver.c2
-rw-r--r--sys/dev/syscons/rain/rain_saver.c2
-rw-r--r--sys/dev/syscons/scgfbrndr.c2
-rw-r--r--sys/dev/syscons/schistory.c2
-rw-r--r--sys/dev/syscons/scmouse.c2
-rw-r--r--sys/dev/syscons/scterm-teken.c2
-rw-r--r--sys/dev/syscons/scterm.c2
-rw-r--r--sys/dev/syscons/scvesactl.c2
-rw-r--r--sys/dev/syscons/scvgarndr.c2
-rw-r--r--sys/dev/syscons/scvidctl.c2
-rw-r--r--sys/dev/syscons/scvtb.c2
-rw-r--r--sys/dev/syscons/snake/snake_saver.c2
-rw-r--r--sys/dev/syscons/star/star_saver.c2
-rw-r--r--sys/dev/syscons/syscons.c2
-rw-r--r--sys/dev/syscons/syscons.h2
-rw-r--r--sys/dev/syscons/sysmouse.c2
-rw-r--r--sys/dev/syscons/warp/warp_saver.c2
-rw-r--r--sys/dev/tdfx/tdfx_io.h2
-rw-r--r--sys/dev/tdfx/tdfx_linux.c2
-rw-r--r--sys/dev/tdfx/tdfx_linux.h2
-rw-r--r--sys/dev/tdfx/tdfx_pci.c2
-rw-r--r--sys/dev/tdfx/tdfx_pci.h2
-rw-r--r--sys/dev/tdfx/tdfx_vars.h2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led.c2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led.h2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led_fdt.c2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led_nexus.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl.h2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_fdt.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_nexus.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_pixel.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_reg.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_syscons.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_text.c2
-rw-r--r--sys/dev/ti/if_ti.c2
-rw-r--r--sys/dev/ti/if_tireg.h2
-rw-r--r--sys/dev/tl/if_tl.c2
-rw-r--r--sys/dev/tl/if_tlreg.h2
-rw-r--r--sys/dev/trm/trm.c2
-rw-r--r--sys/dev/trm/trm.h2
-rw-r--r--sys/dev/tsec/if_tsec.c2
-rw-r--r--sys/dev/tsec/if_tsec.h2
-rw-r--r--sys/dev/tsec/if_tsec_fdt.c2
-rw-r--r--sys/dev/tsec/if_tsecreg.h2
-rw-r--r--sys/dev/twa/tw_cl.h4
-rw-r--r--sys/dev/twa/tw_cl_externs.h4
-rw-r--r--sys/dev/twa/tw_cl_fwif.h4
-rw-r--r--sys/dev/twa/tw_cl_init.c4
-rw-r--r--sys/dev/twa/tw_cl_intr.c4
-rw-r--r--sys/dev/twa/tw_cl_io.c4
-rw-r--r--sys/dev/twa/tw_cl_ioctl.h4
-rw-r--r--sys/dev/twa/tw_cl_misc.c4
-rw-r--r--sys/dev/twa/tw_cl_share.h4
-rw-r--r--sys/dev/twa/tw_osl.h4
-rw-r--r--sys/dev/twa/tw_osl_cam.c4
-rw-r--r--sys/dev/twa/tw_osl_externs.h4
-rw-r--r--sys/dev/twa/tw_osl_freebsd.c4
-rw-r--r--sys/dev/twa/tw_osl_includes.h4
-rw-r--r--sys/dev/twa/tw_osl_inline.h4
-rw-r--r--sys/dev/twa/tw_osl_ioctl.h4
-rw-r--r--sys/dev/twa/tw_osl_share.h4
-rw-r--r--sys/dev/twa/tw_osl_types.h4
-rw-r--r--sys/dev/twe/twe.c2
-rw-r--r--sys/dev/twe/twe_compat.h2
-rw-r--r--sys/dev/twe/twe_freebsd.c2
-rw-r--r--sys/dev/twe/twe_tables.h2
-rw-r--r--sys/dev/twe/tweio.h2
-rw-r--r--sys/dev/twe/twereg.h2
-rw-r--r--sys/dev/twe/twevar.h2
-rw-r--r--sys/dev/tws/tws.c4
-rw-r--r--sys/dev/tws/tws.h4
-rw-r--r--sys/dev/tws/tws_cam.c2
-rw-r--r--sys/dev/tws/tws_hdm.c4
-rw-r--r--sys/dev/tws/tws_hdm.h4
-rw-r--r--sys/dev/tws/tws_services.c4
-rw-r--r--sys/dev/tws/tws_services.h4
-rw-r--r--sys/dev/tws/tws_user.c4
-rw-r--r--sys/dev/tws/tws_user.h4
-rw-r--r--sys/dev/tx/if_tx.c2
-rw-r--r--sys/dev/tx/if_txreg.h2
-rw-r--r--sys/dev/tx/if_txvar.h2
-rw-r--r--sys/dev/txp/3c990img.h2
-rw-r--r--sys/dev/txp/if_txp.c2
-rw-r--r--sys/dev/txp/if_txpreg.h2
-rw-r--r--sys/dev/uart/uart.h2
-rw-r--r--sys/dev/uart/uart_bus.h2
-rw-r--r--sys/dev/uart/uart_bus_acpi.c2
-rw-r--r--sys/dev/uart/uart_bus_ebus.c2
-rw-r--r--sys/dev/uart/uart_bus_fdt.c2
-rw-r--r--sys/dev/uart/uart_bus_isa.c2
-rw-r--r--sys/dev/uart/uart_bus_pccard.c2
-rw-r--r--sys/dev/uart/uart_bus_pci.c2
-rw-r--r--sys/dev/uart/uart_bus_puc.c2
-rw-r--r--sys/dev/uart/uart_bus_scc.c2
-rw-r--r--sys/dev/uart/uart_core.c2
-rw-r--r--sys/dev/uart/uart_cpu.h2
-rw-r--r--sys/dev/uart/uart_cpu_fdt.c2
-rw-r--r--sys/dev/uart/uart_cpu_powerpc.c2
-rw-r--r--sys/dev/uart/uart_cpu_sparc64.c2
-rw-r--r--sys/dev/uart/uart_cpu_x86.c2
-rw-r--r--sys/dev/uart/uart_dbg.c2
-rw-r--r--sys/dev/uart/uart_dev_imx.c2
-rw-r--r--sys/dev/uart/uart_dev_lpc.c2
-rw-r--r--sys/dev/uart/uart_dev_ns8250.c2
-rw-r--r--sys/dev/uart/uart_dev_ns8250.h2
-rw-r--r--sys/dev/uart/uart_dev_pl011.c2
-rw-r--r--sys/dev/uart/uart_dev_quicc.c2
-rw-r--r--sys/dev/uart/uart_dev_sab82532.c2
-rw-r--r--sys/dev/uart/uart_dev_ti8250.c2
-rw-r--r--sys/dev/uart/uart_dev_z8530.c2
-rw-r--r--sys/dev/uart/uart_kbd_sun.c2
-rw-r--r--sys/dev/uart/uart_kbd_sun.h2
-rw-r--r--sys/dev/uart/uart_subr.c2
-rw-r--r--sys/dev/uart/uart_tty.c2
-rw-r--r--sys/dev/ubsec/ubsec.c2
-rw-r--r--sys/dev/ubsec/ubsecreg.h2
-rw-r--r--sys/dev/ubsec/ubsecvar.h2
-rw-r--r--sys/dev/usb/controller/at91dci.c2
-rw-r--r--sys/dev/usb/controller/at91dci.h2
-rw-r--r--sys/dev/usb/controller/at91dci_atmelarm.c2
-rw-r--r--sys/dev/usb/controller/at91dci_fdt.c2
-rw-r--r--sys/dev/usb/controller/atmegadci.c2
-rw-r--r--sys/dev/usb/controller/atmegadci.h2
-rw-r--r--sys/dev/usb/controller/atmegadci_atmelarm.c2
-rw-r--r--sys/dev/usb/controller/avr32dci.c2
-rw-r--r--sys/dev/usb/controller/avr32dci.h2
-rw-r--r--sys/dev/usb/controller/dwc_otg.c2
-rw-r--r--sys/dev/usb/controller/dwc_otg.h2
-rw-r--r--sys/dev/usb/controller/dwc_otg_fdt.c2
-rw-r--r--sys/dev/usb/controller/dwc_otgreg.h2
-rw-r--r--sys/dev/usb/controller/ehci.c2
-rw-r--r--sys/dev/usb/controller/ehci.h2
-rw-r--r--sys/dev/usb/controller/ehci_fsl.c2
-rw-r--r--sys/dev/usb/controller/ehci_imx.c2
-rw-r--r--sys/dev/usb/controller/ehci_ixp4xx.c2
-rw-r--r--sys/dev/usb/controller/ehci_mv.c2
-rw-r--r--sys/dev/usb/controller/ehci_pci.c2
-rw-r--r--sys/dev/usb/controller/ehcireg.h2
-rw-r--r--sys/dev/usb/controller/musb_otg.c2
-rw-r--r--sys/dev/usb/controller/musb_otg.h2
-rw-r--r--sys/dev/usb/controller/musb_otg_atmelarm.c2
-rw-r--r--sys/dev/usb/controller/ohci.c2
-rw-r--r--sys/dev/usb/controller/ohci.h2
-rw-r--r--sys/dev/usb/controller/ohci_pci.c2
-rw-r--r--sys/dev/usb/controller/ohci_s3c24x0.c2
-rw-r--r--sys/dev/usb/controller/ohcireg.h2
-rw-r--r--sys/dev/usb/controller/uhci.c2
-rw-r--r--sys/dev/usb/controller/uhci.h2
-rw-r--r--sys/dev/usb/controller/uhci_pci.c2
-rw-r--r--sys/dev/usb/controller/uhcireg.h2
-rw-r--r--sys/dev/usb/controller/usb_controller.c2
-rw-r--r--sys/dev/usb/controller/uss820dci.c2
-rw-r--r--sys/dev/usb/controller/uss820dci.h2
-rw-r--r--sys/dev/usb/controller/uss820dci_atmelarm.c2
-rw-r--r--sys/dev/usb/controller/xhci.c2
-rw-r--r--sys/dev/usb/controller/xhci.h2
-rw-r--r--sys/dev/usb/controller/xhci_pci.c2
-rw-r--r--sys/dev/usb/controller/xhcireg.h2
-rw-r--r--sys/dev/usb/gadget/g_audio.c2
-rw-r--r--sys/dev/usb/gadget/g_audio.h2
-rw-r--r--sys/dev/usb/gadget/g_keyboard.c2
-rw-r--r--sys/dev/usb/gadget/g_keyboard.h2
-rw-r--r--sys/dev/usb/gadget/g_modem.c2
-rw-r--r--sys/dev/usb/gadget/g_modem.h2
-rw-r--r--sys/dev/usb/gadget/g_mouse.c2
-rw-r--r--sys/dev/usb/gadget/g_mouse.h2
-rw-r--r--sys/dev/usb/input/atp.c2
-rw-r--r--sys/dev/usb/input/uep.c2
-rw-r--r--sys/dev/usb/input/uhid.c2
-rw-r--r--sys/dev/usb/input/ukbd.c2
-rw-r--r--sys/dev/usb/input/ums.c2
-rw-r--r--sys/dev/usb/input/usb_rdesc.h2
-rw-r--r--sys/dev/usb/input/wsp.c2
-rw-r--r--sys/dev/usb/misc/udbp.c2
-rw-r--r--sys/dev/usb/misc/ufm.c2
-rw-r--r--sys/dev/usb/net/if_aue.c2
-rw-r--r--sys/dev/usb/net/if_auereg.h2
-rw-r--r--sys/dev/usb/net/if_axe.c2
-rw-r--r--sys/dev/usb/net/if_axereg.h2
-rw-r--r--sys/dev/usb/net/if_axge.c2
-rw-r--r--sys/dev/usb/net/if_axgereg.h2
-rw-r--r--sys/dev/usb/net/if_cdce.c2
-rw-r--r--sys/dev/usb/net/if_cdcereg.h2
-rw-r--r--sys/dev/usb/net/if_cue.c2
-rw-r--r--sys/dev/usb/net/if_cuereg.h2
-rw-r--r--sys/dev/usb/net/if_ipheth.c2
-rw-r--r--sys/dev/usb/net/if_iphethvar.h2
-rw-r--r--sys/dev/usb/net/if_kue.c2
-rw-r--r--sys/dev/usb/net/if_kuefw.h2
-rw-r--r--sys/dev/usb/net/if_kuereg.h2
-rw-r--r--sys/dev/usb/net/if_mos.c2
-rw-r--r--sys/dev/usb/net/if_mosreg.h2
-rw-r--r--sys/dev/usb/net/if_rue.c2
-rw-r--r--sys/dev/usb/net/if_ruereg.h2
-rw-r--r--sys/dev/usb/net/if_smsc.c2
-rw-r--r--sys/dev/usb/net/if_smscreg.h2
-rw-r--r--sys/dev/usb/net/if_udav.c2
-rw-r--r--sys/dev/usb/net/if_udavreg.h2
-rw-r--r--sys/dev/usb/net/if_usie.c2
-rw-r--r--sys/dev/usb/net/if_usievar.h2
-rw-r--r--sys/dev/usb/net/ruephy.c2
-rw-r--r--sys/dev/usb/net/ruephyreg.h2
-rw-r--r--sys/dev/usb/net/uhso.c2
-rw-r--r--sys/dev/usb/net/usb_ethernet.c2
-rw-r--r--sys/dev/usb/net/usb_ethernet.h2
-rw-r--r--sys/dev/usb/quirk/usb_quirk.c2
-rw-r--r--sys/dev/usb/quirk/usb_quirk.h2
-rw-r--r--sys/dev/usb/serial/ubsa.c2
-rw-r--r--sys/dev/usb/serial/ubser.c2
-rw-r--r--sys/dev/usb/serial/uchcom.c2
-rw-r--r--sys/dev/usb/serial/ucycom.c2
-rw-r--r--sys/dev/usb/serial/ufoma.c2
-rw-r--r--sys/dev/usb/serial/uftdi.c2
-rw-r--r--sys/dev/usb/serial/ugensa.c4
-rw-r--r--sys/dev/usb/serial/uipaq.c4
-rw-r--r--sys/dev/usb/serial/ulpt.c2
-rw-r--r--sys/dev/usb/serial/umcs.c2
-rw-r--r--sys/dev/usb/serial/umcs.h2
-rw-r--r--sys/dev/usb/serial/umct.c2
-rw-r--r--sys/dev/usb/serial/umodem.c2
-rw-r--r--sys/dev/usb/serial/uplcom.c2
-rw-r--r--sys/dev/usb/serial/usb_serial.c2
-rw-r--r--sys/dev/usb/serial/usb_serial.h2
-rw-r--r--sys/dev/usb/serial/uvisor.c2
-rw-r--r--sys/dev/usb/serial/uvscom.c2
-rw-r--r--sys/dev/usb/storage/umass.c2
-rw-r--r--sys/dev/usb/storage/urio.c2
-rw-r--r--sys/dev/usb/storage/ustorage_fs.c2
-rw-r--r--sys/dev/usb/template/usb_template.c2
-rw-r--r--sys/dev/usb/template/usb_template.h2
-rw-r--r--sys/dev/usb/template/usb_template_audio.c2
-rw-r--r--sys/dev/usb/template/usb_template_cdce.c2
-rw-r--r--sys/dev/usb/template/usb_template_kbd.c2
-rw-r--r--sys/dev/usb/template/usb_template_modem.c2
-rw-r--r--sys/dev/usb/template/usb_template_mouse.c2
-rw-r--r--sys/dev/usb/template/usb_template_msc.c2
-rw-r--r--sys/dev/usb/template/usb_template_mtp.c2
-rw-r--r--sys/dev/usb/ufm_ioctl.h2
-rw-r--r--sys/dev/usb/usb.h2
-rw-r--r--sys/dev/usb/usb_bus.h2
-rw-r--r--sys/dev/usb/usb_busdma.c2
-rw-r--r--sys/dev/usb/usb_busdma.h2
-rw-r--r--sys/dev/usb/usb_cdc.h2
-rw-r--r--sys/dev/usb/usb_controller.h2
-rw-r--r--sys/dev/usb/usb_core.c2
-rw-r--r--sys/dev/usb/usb_core.h2
-rw-r--r--sys/dev/usb/usb_debug.c2
-rw-r--r--sys/dev/usb/usb_debug.h2
-rw-r--r--sys/dev/usb/usb_dev.c2
-rw-r--r--sys/dev/usb/usb_dev.h2
-rw-r--r--sys/dev/usb/usb_device.c2
-rw-r--r--sys/dev/usb/usb_device.h2
-rw-r--r--sys/dev/usb/usb_dynamic.c2
-rw-r--r--sys/dev/usb/usb_dynamic.h2
-rw-r--r--sys/dev/usb/usb_endian.h2
-rw-r--r--sys/dev/usb/usb_error.c2
-rw-r--r--sys/dev/usb/usb_freebsd.h2
-rw-r--r--sys/dev/usb/usb_freebsd_loader.h2
-rw-r--r--sys/dev/usb/usb_generic.c2
-rw-r--r--sys/dev/usb/usb_generic.h2
-rw-r--r--sys/dev/usb/usb_handle_request.c2
-rw-r--r--sys/dev/usb/usb_hid.c2
-rw-r--r--sys/dev/usb/usb_hub.c2
-rw-r--r--sys/dev/usb/usb_hub.h2
-rw-r--r--sys/dev/usb/usb_ioctl.h2
-rw-r--r--sys/dev/usb/usb_lookup.c2
-rw-r--r--sys/dev/usb/usb_mbuf.c2
-rw-r--r--sys/dev/usb/usb_mbuf.h2
-rw-r--r--sys/dev/usb/usb_msctest.c2
-rw-r--r--sys/dev/usb/usb_msctest.h2
-rw-r--r--sys/dev/usb/usb_parse.c2
-rw-r--r--sys/dev/usb/usb_pci.h2
-rw-r--r--sys/dev/usb/usb_pf.c2
-rw-r--r--sys/dev/usb/usb_pf.h2
-rw-r--r--sys/dev/usb/usb_process.c2
-rw-r--r--sys/dev/usb/usb_process.h2
-rw-r--r--sys/dev/usb/usb_request.c2
-rw-r--r--sys/dev/usb/usb_request.h2
-rw-r--r--sys/dev/usb/usb_transfer.c2
-rw-r--r--sys/dev/usb/usb_transfer.h2
-rw-r--r--sys/dev/usb/usb_util.c2
-rw-r--r--sys/dev/usb/usb_util.h2
-rw-r--r--sys/dev/usb/usbdi.h2
-rw-r--r--sys/dev/usb/usbdi_util.h2
-rw-r--r--sys/dev/usb/usbhid.h2
-rw-r--r--sys/dev/usb/wlan/if_uath.c2
-rw-r--r--sys/dev/usb/wlan/if_zydfw.h2
-rw-r--r--sys/dev/vge/if_vge.c2
-rw-r--r--sys/dev/vge/if_vgereg.h2
-rw-r--r--sys/dev/vge/if_vgevar.h2
-rw-r--r--sys/dev/viawd/viawd.c2
-rw-r--r--sys/dev/viawd/viawd.h2
-rw-r--r--sys/dev/virtio/balloon/virtio_balloon.c2
-rw-r--r--sys/dev/virtio/balloon/virtio_balloon.h2
-rw-r--r--sys/dev/virtio/block/virtio_blk.c2
-rw-r--r--sys/dev/virtio/block/virtio_blk.h2
-rw-r--r--sys/dev/virtio/network/if_vtnet.c2
-rw-r--r--sys/dev/virtio/network/if_vtnetvar.h2
-rw-r--r--sys/dev/virtio/network/virtio_net.h2
-rw-r--r--sys/dev/virtio/pci/virtio_pci.c2
-rw-r--r--sys/dev/virtio/pci/virtio_pci.h2
-rw-r--r--sys/dev/virtio/random/virtio_random.c2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsi.c2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsi.h2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsivar.h2
-rw-r--r--sys/dev/virtio/virtio.c2
-rw-r--r--sys/dev/virtio/virtio.h2
-rw-r--r--sys/dev/virtio/virtio_ring.h2
-rw-r--r--sys/dev/virtio/virtqueue.c2
-rw-r--r--sys/dev/virtio/virtqueue.h2
-rw-r--r--sys/dev/vkbd/vkbd.c2
-rw-r--r--sys/dev/vkbd/vkbd_var.h2
-rw-r--r--sys/dev/vr/if_vr.c2
-rw-r--r--sys/dev/vr/if_vrreg.h2
-rw-r--r--sys/dev/vt/colors/vt_termcolors.c2
-rw-r--r--sys/dev/vt/colors/vt_termcolors.h2
-rw-r--r--sys/dev/vt/font/vt_font_default.c2
-rw-r--r--sys/dev/vt/font/vt_mouse_cursor.c2
-rw-r--r--sys/dev/vt/hw/efifb/efifb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_early_fb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.h2
-rw-r--r--sys/dev/vt/hw/ofwfb/ofwfb.c2
-rw-r--r--sys/dev/vt/logo/logo_freebsd.c2
-rw-r--r--sys/dev/vt/vt.h2
-rw-r--r--sys/dev/vt/vt_buf.c2
-rw-r--r--sys/dev/vt/vt_consolectl.c2
-rw-r--r--sys/dev/vt/vt_core.c2
-rw-r--r--sys/dev/vt/vt_font.c2
-rw-r--r--sys/dev/vt/vt_sysmouse.c2
-rw-r--r--sys/dev/vte/if_vte.c2
-rw-r--r--sys/dev/vte/if_vtereg.h2
-rw-r--r--sys/dev/vte/if_vtevar.h2
-rw-r--r--sys/dev/vx/if_vx.c2
-rw-r--r--sys/dev/vx/if_vx_pci.c2
-rw-r--r--sys/dev/vx/if_vxreg.h2
-rw-r--r--sys/dev/vx/if_vxvar.h2
-rw-r--r--sys/dev/vxge/include/vxge-debug.h2
-rw-r--r--sys/dev/vxge/include/vxge-defs.h2
-rw-r--r--sys/dev/vxge/include/vxge-list.h2
-rw-r--r--sys/dev/vxge/include/vxge-os-debug.h2
-rw-r--r--sys/dev/vxge/include/vxge-os-pal.h2
-rw-r--r--sys/dev/vxge/include/vxge-queue.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-config.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-ll.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-mgmt.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-mgmtaux.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-stats.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-status.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-types.h2
-rw-r--r--sys/dev/vxge/include/vxgehal-version.h2
-rw-r--r--sys/dev/vxge/vxge-firmware.h2
-rw-r--r--sys/dev/vxge/vxge-osdep.h2
-rw-r--r--sys/dev/vxge/vxge.c2
-rw-r--r--sys/dev/vxge/vxge.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxge-queue.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-blockpool.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-blockpool.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-channel.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-channel.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-common-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-config-priv.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-config.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-debug.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-device.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-device.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-doorbells.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-doorbells.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-driver.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-driver.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-fifo.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-fifo.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-ifmsg.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-ifmsg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mgmt.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mm.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mm.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mrpcim.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-mrpcim.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-regdefs.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-regs.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-ring.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-ring.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-srpcim.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-srpcim.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-swapper.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-swapper.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-toc-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-virtualpath.c2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-virtualpath.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h2
-rw-r--r--sys/dev/vxge/vxgehal/vxgehal.h2
-rw-r--r--sys/dev/vxge/vxgell-version.h2
-rw-r--r--sys/dev/watchdog/watchdog.c2
-rw-r--r--sys/dev/wb/if_wb.c2
-rw-r--r--sys/dev/wb/if_wbreg.h2
-rw-r--r--sys/dev/wbwd/wbwd.c2
-rw-r--r--sys/dev/wi/if_wavelan_ieee.h2
-rw-r--r--sys/dev/wi/if_wi_macio.c2
-rw-r--r--sys/dev/wi/if_wi_pccard.c2
-rw-r--r--sys/dev/wi/if_wi_pci.c2
-rw-r--r--sys/dev/wi/if_wireg.h2
-rw-r--r--sys/dev/wi/if_wivar.h2
-rw-r--r--sys/dev/wtap/if_medium.c2
-rw-r--r--sys/dev/wtap/if_medium.h2
-rw-r--r--sys/dev/wtap/if_wtap.c2
-rw-r--r--sys/dev/wtap/if_wtap_module.c2
-rw-r--r--sys/dev/wtap/if_wtapioctl.h2
-rw-r--r--sys/dev/wtap/if_wtapvar.h2
-rw-r--r--sys/dev/wtap/plugins/visibility.c2
-rw-r--r--sys/dev/wtap/plugins/visibility.h2
-rw-r--r--sys/dev/wtap/plugins/visibility_ioctl.h2
-rw-r--r--sys/dev/wtap/plugins/wtap_plugin.h2
-rw-r--r--sys/dev/wtap/wtap_hal/hal.c2
-rw-r--r--sys/dev/wtap/wtap_hal/hal.h2
-rw-r--r--sys/dev/wtap/wtap_hal/handler.h2
-rw-r--r--sys/dev/xe/if_xe.c2
-rw-r--r--sys/dev/xe/if_xe_pccard.c2
-rw-r--r--sys/dev/xe/if_xereg.h2
-rw-r--r--sys/dev/xe/if_xevar.h2
-rw-r--r--sys/dev/xen/blkback/blkback.c2
-rw-r--r--sys/dev/xen/control/control.c2
-rw-r--r--sys/dev/xen/netback/netback.c2
-rw-r--r--sys/dev/xen/netback/netback_unit_tests.c2
-rw-r--r--sys/dev/xen/netfront/netfront.c2
-rw-r--r--sys/dev/xen/pcifront/pcifront.c4
-rw-r--r--sys/dev/xen/timer/timer.c2
-rw-r--r--sys/dev/xen/timer/timer.h2
-rw-r--r--sys/dev/xen/xenpci/xenpci.c4
-rw-r--r--sys/dev/xen/xenpci/xenpcivar.h4
-rw-r--r--sys/dev/xl/if_xl.c2
-rw-r--r--sys/dev/xl/if_xlreg.h2
-rw-r--r--sys/dev/xl/xlphy.c2
-rw-r--r--sys/fs/cd9660/cd9660_bmap.c2
-rw-r--r--sys/fs/cd9660/cd9660_lookup.c2
-rw-r--r--sys/fs/cd9660/cd9660_mount.h2
-rw-r--r--sys/fs/cd9660/cd9660_node.c2
-rw-r--r--sys/fs/cd9660/cd9660_node.h2
-rw-r--r--sys/fs/cd9660/cd9660_rrip.c2
-rw-r--r--sys/fs/cd9660/cd9660_rrip.h2
-rw-r--r--sys/fs/cd9660/cd9660_util.c2
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c2
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/fs/cd9660/iso.h2
-rw-r--r--sys/fs/cd9660/iso_rrip.h2
-rw-r--r--sys/fs/deadfs/dead_vnops.c2
-rw-r--r--sys/fs/ext2fs/ext2_alloc.c2
-rw-r--r--sys/fs/ext2fs/ext2_balloc.c2
-rw-r--r--sys/fs/ext2fs/ext2_bmap.c2
-rw-r--r--sys/fs/ext2fs/ext2_extern.h2
-rw-r--r--sys/fs/ext2fs/ext2_inode.c2
-rw-r--r--sys/fs/ext2fs/ext2_lookup.c2
-rw-r--r--sys/fs/ext2fs/ext2_mount.h2
-rw-r--r--sys/fs/ext2fs/ext2_subr.c2
-rw-r--r--sys/fs/ext2fs/ext2_vfsops.c2
-rw-r--r--sys/fs/ext2fs/ext2_vnops.c2
-rw-r--r--sys/fs/ext2fs/fs.h2
-rw-r--r--sys/fs/ext2fs/inode.h2
-rw-r--r--sys/fs/fdescfs/fdesc.h2
-rw-r--r--sys/fs/fdescfs/fdesc_vfsops.c2
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c2
-rw-r--r--sys/fs/fuse/fuse.h4
-rw-r--r--sys/fs/fuse/fuse_debug.h4
-rw-r--r--sys/fs/fuse/fuse_device.c4
-rw-r--r--sys/fs/fuse/fuse_file.c4
-rw-r--r--sys/fs/fuse/fuse_file.h4
-rw-r--r--sys/fs/fuse/fuse_internal.c4
-rw-r--r--sys/fs/fuse/fuse_internal.h4
-rw-r--r--sys/fs/fuse/fuse_io.c4
-rw-r--r--sys/fs/fuse/fuse_io.h4
-rw-r--r--sys/fs/fuse/fuse_ipc.c4
-rw-r--r--sys/fs/fuse/fuse_ipc.h4
-rw-r--r--sys/fs/fuse/fuse_kernel.h2
-rw-r--r--sys/fs/fuse/fuse_main.c4
-rw-r--r--sys/fs/fuse/fuse_node.c4
-rw-r--r--sys/fs/fuse/fuse_node.h4
-rw-r--r--sys/fs/fuse/fuse_param.h4
-rw-r--r--sys/fs/fuse/fuse_vfsops.c4
-rw-r--r--sys/fs/fuse/fuse_vnops.c4
-rw-r--r--sys/fs/nfs/nfs.h2
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c2
-rw-r--r--sys/fs/nfs/nfs_commonport.c2
-rw-r--r--sys/fs/nfs/nfs_commonsubs.c2
-rw-r--r--sys/fs/nfs/nfs_var.h2
-rw-r--r--sys/fs/nfs/nfsm_subs.h2
-rw-r--r--sys/fs/nfs/nfsport.h2
-rw-r--r--sys/fs/nfs/nfsproto.h2
-rw-r--r--sys/fs/nfs/nfsrvcache.h2
-rw-r--r--sys/fs/nfs/rpcv2.h2
-rw-r--r--sys/fs/nfs/xdr_subs.h2
-rw-r--r--sys/fs/nfsclient/nfs.h2
-rw-r--r--sys/fs/nfsclient/nfs_clbio.c2
-rw-r--r--sys/fs/nfsclient/nfs_clcomsubs.c2
-rw-r--r--sys/fs/nfsclient/nfs_clkrpc.c2
-rw-r--r--sys/fs/nfsclient/nfs_clnfsiod.c2
-rw-r--r--sys/fs/nfsclient/nfs_clnode.c2
-rw-r--r--sys/fs/nfsclient/nfs_clport.c2
-rw-r--r--sys/fs/nfsclient/nfs_clrpcops.c2
-rw-r--r--sys/fs/nfsclient/nfs_clsubs.c2
-rw-r--r--sys/fs/nfsclient/nfs_clvfsops.c2
-rw-r--r--sys/fs/nfsclient/nfs_clvnops.c2
-rw-r--r--sys/fs/nfsclient/nfsmount.h2
-rw-r--r--sys/fs/nfsclient/nfsnode.h2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdcache.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdkrpc.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdport.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdserv.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdsocket.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdsubs.c2
-rw-r--r--sys/fs/nullfs/null.h2
-rw-r--r--sys/fs/nullfs/null_subr.c2
-rw-r--r--sys/fs/nullfs/null_vfsops.c2
-rw-r--r--sys/fs/nullfs/null_vnops.c2
-rw-r--r--sys/fs/procfs/procfs.c2
-rw-r--r--sys/fs/procfs/procfs.h2
-rw-r--r--sys/fs/procfs/procfs_dbregs.c2
-rw-r--r--sys/fs/procfs/procfs_fpregs.c2
-rw-r--r--sys/fs/procfs/procfs_map.c2
-rw-r--r--sys/fs/procfs/procfs_mem.c2
-rw-r--r--sys/fs/procfs/procfs_note.c2
-rw-r--r--sys/fs/procfs/procfs_osrel.c2
-rw-r--r--sys/fs/procfs/procfs_regs.c2
-rw-r--r--sys/fs/procfs/procfs_rlimit.c2
-rw-r--r--sys/fs/procfs/procfs_status.c2
-rw-r--r--sys/fs/procfs/procfs_type.c2
-rw-r--r--sys/fs/unionfs/union.h2
-rw-r--r--sys/fs/unionfs/union_subr.c2
-rw-r--r--sys/fs/unionfs/union_vfsops.c2
-rw-r--r--sys/fs/unionfs/union_vnops.c2
-rw-r--r--sys/geom/vinum/geom_vinum_share.c2
-rw-r--r--sys/geom/vinum/geom_vinum_subr.c2
-rw-r--r--sys/geom/vinum/geom_vinum_var.h4
-rw-r--r--sys/i386/acpica/acpi_machdep.c2
-rw-r--r--sys/i386/bios/smapi.c2
-rw-r--r--sys/i386/i386/atomic.c2
-rw-r--r--sys/i386/i386/bios.c2
-rw-r--r--sys/i386/i386/bpf_jit_machdep.c2
-rw-r--r--sys/i386/i386/bpf_jit_machdep.h2
-rw-r--r--sys/i386/i386/elf_machdep.c2
-rw-r--r--sys/i386/i386/gdb_machdep.c2
-rw-r--r--sys/i386/i386/genassym.c2
-rw-r--r--sys/i386/i386/geode.c2
-rw-r--r--sys/i386/i386/in_cksum.c2
-rw-r--r--sys/i386/i386/initcpu.c2
-rw-r--r--sys/i386/i386/io.c2
-rw-r--r--sys/i386/i386/k6_mem.c2
-rw-r--r--sys/i386/i386/longrun.c2
-rw-r--r--sys/i386/i386/machdep.c2
-rw-r--r--sys/i386/i386/mem.c2
-rw-r--r--sys/i386/i386/minidump_machdep.c2
-rw-r--r--sys/i386/i386/mp_machdep.c2
-rw-r--r--sys/i386/i386/pmap.c2
-rw-r--r--sys/i386/i386/ptrace_machdep.c2
-rw-r--r--sys/i386/i386/sys_machdep.c2
-rw-r--r--sys/i386/i386/trap.c2
-rw-r--r--sys/i386/i386/uio_machdep.c2
-rw-r--r--sys/i386/i386/vm86.c2
-rw-r--r--sys/i386/i386/vm_machdep.c2
-rw-r--r--sys/i386/ibcs2/coff.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_dirent.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_errno.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_errno.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_fcntl.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_fcntl.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_ioctl.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_isc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_mount.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_msg.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_other.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_signal.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_signal.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_stat.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_stat.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_statfs.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_stropts.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_sysi86.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_sysvec.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_termios.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_time.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_types.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_unistd.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_ustat.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_util.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_util.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_utime.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_utsname.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c2
-rw-r--r--sys/i386/ibcs2/imgact_coff.c2
-rw-r--r--sys/i386/include/_bus.h2
-rw-r--r--sys/i386/include/asm.h2
-rw-r--r--sys/i386/include/asmacros.h2
-rw-r--r--sys/i386/include/atomic.h2
-rw-r--r--sys/i386/include/bootinfo.h2
-rw-r--r--sys/i386/include/bus_dma.h2
-rw-r--r--sys/i386/include/counter.h2
-rw-r--r--sys/i386/include/cpu.h2
-rw-r--r--sys/i386/include/cpufunc.h2
-rw-r--r--sys/i386/include/cputypes.h2
-rw-r--r--sys/i386/include/elan_mmcr.h2
-rw-r--r--sys/i386/include/exec.h2
-rw-r--r--sys/i386/include/floatingpoint.h2
-rw-r--r--sys/i386/include/gdb_machdep.h2
-rw-r--r--sys/i386/include/ieeefp.h2
-rw-r--r--sys/i386/include/if_wl_wavelan.h2
-rw-r--r--sys/i386/include/in_cksum.h2
-rw-r--r--sys/i386/include/intr_machdep.h2
-rw-r--r--sys/i386/include/ioctl_bt848.h2
-rw-r--r--sys/i386/include/ioctl_meteor.h2
-rw-r--r--sys/i386/include/iodev.h2
-rw-r--r--sys/i386/include/kdb.h2
-rw-r--r--sys/i386/include/limits.h2
-rw-r--r--sys/i386/include/md_var.h2
-rw-r--r--sys/i386/include/memdev.h2
-rw-r--r--sys/i386/include/minidump.h2
-rw-r--r--sys/i386/include/mp_watchdog.h2
-rw-r--r--sys/i386/include/npx.h2
-rw-r--r--sys/i386/include/param.h2
-rw-r--r--sys/i386/include/pc/bios.h2
-rw-r--r--sys/i386/include/pcaudioio.h2
-rw-r--r--sys/i386/include/pcb.h2
-rw-r--r--sys/i386/include/pcb_ext.h2
-rw-r--r--sys/i386/include/pcpu.h2
-rw-r--r--sys/i386/include/pmap.h2
-rw-r--r--sys/i386/include/pmc_mdep.h2
-rw-r--r--sys/i386/include/ppireg.h2
-rw-r--r--sys/i386/include/proc.h2
-rw-r--r--sys/i386/include/profile.h2
-rw-r--r--sys/i386/include/reloc.h2
-rw-r--r--sys/i386/include/runq.h2
-rw-r--r--sys/i386/include/segments.h2
-rw-r--r--sys/i386/include/sf_buf.h2
-rw-r--r--sys/i386/include/sigframe.h2
-rw-r--r--sys/i386/include/signal.h2
-rw-r--r--sys/i386/include/smapi.h2
-rw-r--r--sys/i386/include/timerreg.h2
-rw-r--r--sys/i386/include/tss.h2
-rw-r--r--sys/i386/include/ucontext.h2
-rw-r--r--sys/i386/include/varargs.h2
-rw-r--r--sys/i386/include/vm.h2
-rw-r--r--sys/i386/include/vm86.h2
-rw-r--r--sys/i386/include/vmparam.h2
-rw-r--r--sys/i386/isa/ccbque.h2
-rw-r--r--sys/i386/isa/elink.c2
-rw-r--r--sys/i386/isa/elink.h2
-rw-r--r--sys/i386/isa/pmtimer.c2
-rw-r--r--sys/i386/isa/prof_machdep.c2
-rw-r--r--sys/i386/linux/imgact_linux.c28
-rw-r--r--sys/i386/linux/linux.h29
-rw-r--r--sys/i386/linux/linux_dummy.c28
-rw-r--r--sys/i386/linux/linux_machdep.c28
-rw-r--r--sys/i386/linux/linux_ptrace.c28
-rw-r--r--sys/i386/linux/linux_sysvec.c28
-rw-r--r--sys/i386/pci/pci_cfgreg.c2
-rw-r--r--sys/i386/pci/pci_pir.c2
-rw-r--r--sys/isa/isareg.h2
-rw-r--r--sys/isa/pnpreg.h2
-rw-r--r--sys/isa/rtc.h2
-rw-r--r--sys/kern/init_main.c2
-rw-r--r--sys/kern/kern_acct.c2
-rw-r--r--sys/kern/kern_clock.c2
-rw-r--r--sys/kern/kern_cons.c2
-rw-r--r--sys/kern/kern_descrip.c2
-rw-r--r--sys/kern/kern_exit.c2
-rw-r--r--sys/kern/kern_fork.c2
-rw-r--r--sys/kern/kern_ktrace.c2
-rw-r--r--sys/kern/kern_lockf.c2
-rw-r--r--sys/kern/kern_malloc.c2
-rw-r--r--sys/kern/kern_mib.c2
-rw-r--r--sys/kern/kern_proc.c2
-rw-r--r--sys/kern/kern_prot.c2
-rw-r--r--sys/kern/kern_resource.c2
-rw-r--r--sys/kern/kern_rmlock.c2
-rw-r--r--sys/kern/kern_shutdown.c2
-rw-r--r--sys/kern/kern_sig.c2
-rw-r--r--sys/kern/kern_synch.c2
-rw-r--r--sys/kern/kern_sysctl.c2
-rw-r--r--sys/kern/kern_time.c2
-rw-r--r--sys/kern/kern_timeout.c2
-rw-r--r--sys/kern/kern_xxx.c2
-rw-r--r--sys/kern/ksched.c2
-rw-r--r--sys/kern/p1003_1b.c2
-rw-r--r--sys/kern/posix4_mib.c2
-rw-r--r--sys/kern/sched_4bsd.c2
-rw-r--r--sys/kern/subr_autoconf.c2
-rw-r--r--sys/kern/subr_blist.c2
-rw-r--r--sys/kern/subr_clock.c2
-rw-r--r--sys/kern/subr_hash.c2
-rw-r--r--sys/kern/subr_log.c2
-rw-r--r--sys/kern/subr_mchain.c2
-rw-r--r--sys/kern/subr_param.c2
-rw-r--r--sys/kern/subr_pcpu.c2
-rw-r--r--sys/kern/subr_prf.c2
-rw-r--r--sys/kern/subr_prof.c2
-rw-r--r--sys/kern/subr_rtc.c2
-rw-r--r--sys/kern/subr_scanf.c2
-rw-r--r--sys/kern/subr_sglist.c2
-rw-r--r--sys/kern/subr_syscall.c2
-rw-r--r--sys/kern/subr_trap.c2
-rw-r--r--sys/kern/subr_uio.c2
-rw-r--r--sys/kern/sys_generic.c2
-rw-r--r--sys/kern/sys_socket.c2
-rw-r--r--sys/kern/tty_compat.c2
-rw-r--r--sys/kern/tty_info.c2
-rw-r--r--sys/kern/uipc_domain.c2
-rw-r--r--sys/kern/uipc_mbuf.c2
-rw-r--r--sys/kern/uipc_mbuf2.c2
-rw-r--r--sys/kern/uipc_sockbuf.c2
-rw-r--r--sys/kern/uipc_socket.c2
-rw-r--r--sys/kern/uipc_syscalls.c2
-rw-r--r--sys/kern/uipc_usrreq.c2
-rw-r--r--sys/kern/vfs_cache.c2
-rw-r--r--sys/kern/vfs_cluster.c2
-rw-r--r--sys/kern/vfs_default.c2
-rw-r--r--sys/kern/vfs_export.c2
-rw-r--r--sys/kern/vfs_init.c2
-rw-r--r--sys/kern/vfs_lookup.c2
-rw-r--r--sys/kern/vfs_mount.c2
-rw-r--r--sys/kern/vfs_mountroot.c2
-rw-r--r--sys/kern/vfs_subr.c2
-rw-r--r--sys/kern/vfs_syscalls.c2
-rw-r--r--sys/kern/vfs_vnops.c2
-rw-r--r--sys/libkern/arm/muldi3.c2
-rw-r--r--sys/libkern/ashldi3.c2
-rw-r--r--sys/libkern/ashrdi3.c2
-rw-r--r--sys/libkern/bcmp.c2
-rw-r--r--sys/libkern/bsearch.c2
-rw-r--r--sys/libkern/cmpdi2.c2
-rw-r--r--sys/libkern/divdi3.c2
-rw-r--r--sys/libkern/ffs.c2
-rw-r--r--sys/libkern/ffsl.c2
-rw-r--r--sys/libkern/fls.c2
-rw-r--r--sys/libkern/flsl.c2
-rw-r--r--sys/libkern/flsll.c2
-rw-r--r--sys/libkern/fnmatch.c2
-rw-r--r--sys/libkern/lshrdi3.c2
-rw-r--r--sys/libkern/mcount.c2
-rw-r--r--sys/libkern/memchr.c2
-rw-r--r--sys/libkern/memcmp.c2
-rw-r--r--sys/libkern/moddi3.c2
-rw-r--r--sys/libkern/qdivrem.c2
-rw-r--r--sys/libkern/qsort.c2
-rw-r--r--sys/libkern/quad.h2
-rw-r--r--sys/libkern/random.c2
-rw-r--r--sys/libkern/scanc.c2
-rw-r--r--sys/libkern/strcasecmp.c2
-rw-r--r--sys/libkern/strcat.c2
-rw-r--r--sys/libkern/strchr.c2
-rw-r--r--sys/libkern/strcmp.c2
-rw-r--r--sys/libkern/strcpy.c2
-rw-r--r--sys/libkern/strncmp.c2
-rw-r--r--sys/libkern/strncpy.c2
-rw-r--r--sys/libkern/strrchr.c2
-rw-r--r--sys/libkern/strsep.c2
-rw-r--r--sys/libkern/strstr.c2
-rw-r--r--sys/libkern/strtol.c2
-rw-r--r--sys/libkern/strtoq.c2
-rw-r--r--sys/libkern/strtoul.c2
-rw-r--r--sys/libkern/strtouq.c2
-rw-r--r--sys/libkern/ucmpdi2.c2
-rw-r--r--sys/libkern/udivdi3.c2
-rw-r--r--sys/libkern/umoddi3.c2
-rw-r--r--sys/mips/adm5120/adm5120_machdep.c2
-rw-r--r--sys/mips/adm5120/adm5120reg.h2
-rw-r--r--sys/mips/adm5120/admpci.c2
-rw-r--r--sys/mips/adm5120/console.c2
-rw-r--r--sys/mips/adm5120/if_admsw.c2
-rw-r--r--sys/mips/adm5120/if_admswreg.h2
-rw-r--r--sys/mips/adm5120/if_admswvar.h2
-rw-r--r--sys/mips/adm5120/obio.c2
-rw-r--r--sys/mips/adm5120/obiovar.h2
-rw-r--r--sys/mips/adm5120/uart_bus_adm5120.c2
-rw-r--r--sys/mips/adm5120/uart_cpu_adm5120.c2
-rw-r--r--sys/mips/adm5120/uart_dev_adm5120.c2
-rw-r--r--sys/mips/adm5120/uart_dev_adm5120.h2
-rw-r--r--sys/mips/alchemy/alchemy_machdep.c2
-rw-r--r--sys/mips/alchemy/obio.c2
-rw-r--r--sys/mips/alchemy/uart_bus_alchemy.c2
-rw-r--r--sys/mips/alchemy/uart_cpu_alchemy.c2
-rw-r--r--sys/mips/atheros/apb.c2
-rw-r--r--sys/mips/atheros/apbvar.h2
-rw-r--r--sys/mips/atheros/ar71xx_bus_space_reversed.c2
-rw-r--r--sys/mips/atheros/ar71xx_chip.c2
-rw-r--r--sys/mips/atheros/ar71xx_chip.h2
-rw-r--r--sys/mips/atheros/ar71xx_cpudef.h2
-rw-r--r--sys/mips/atheros/ar71xx_ehci.c2
-rw-r--r--sys/mips/atheros/ar71xx_fixup.c2
-rw-r--r--sys/mips/atheros/ar71xx_fixup.h2
-rw-r--r--sys/mips/atheros/ar71xx_gpio.c2
-rw-r--r--sys/mips/atheros/ar71xx_gpiovar.h2
-rw-r--r--sys/mips/atheros/ar71xx_machdep.c2
-rw-r--r--sys/mips/atheros/ar71xx_ohci.c2
-rw-r--r--sys/mips/atheros/ar71xx_pci.c2
-rw-r--r--sys/mips/atheros/ar71xx_pci_bus_space.c2
-rw-r--r--sys/mips/atheros/ar71xx_setup.c2
-rw-r--r--sys/mips/atheros/ar71xx_setup.h2
-rw-r--r--sys/mips/atheros/ar71xx_spi.c2
-rw-r--r--sys/mips/atheros/ar71xx_wdog.c2
-rw-r--r--sys/mips/atheros/ar71xxreg.h2
-rw-r--r--sys/mips/atheros/ar724x_chip.c2
-rw-r--r--sys/mips/atheros/ar724x_chip.h2
-rw-r--r--sys/mips/atheros/ar724x_pci.c2
-rw-r--r--sys/mips/atheros/ar724xreg.h2
-rw-r--r--sys/mips/atheros/ar91xx_chip.c2
-rw-r--r--sys/mips/atheros/ar91xx_chip.h2
-rw-r--r--sys/mips/atheros/ar91xxreg.h2
-rw-r--r--sys/mips/atheros/ar933x_chip.c2
-rw-r--r--sys/mips/atheros/ar933x_chip.h2
-rw-r--r--sys/mips/atheros/ar933x_uart.h2
-rw-r--r--sys/mips/atheros/ar933xreg.h2
-rw-r--r--sys/mips/atheros/ar934x_chip.c2
-rw-r--r--sys/mips/atheros/ar934x_chip.h2
-rw-r--r--sys/mips/atheros/ar934xreg.h2
-rw-r--r--sys/mips/atheros/if_arge.c2
-rw-r--r--sys/mips/atheros/if_argevar.h2
-rw-r--r--sys/mips/atheros/pcf2123_rtc.c2
-rw-r--r--sys/mips/atheros/pcf2123reg.h2
-rw-r--r--sys/mips/atheros/uart_bus_ar71xx.c2
-rw-r--r--sys/mips/atheros/uart_bus_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_cpu_ar71xx.c2
-rw-r--r--sys/mips/atheros/uart_cpu_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_dev_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_dev_ar933x.h2
-rw-r--r--sys/mips/beri/beri_machdep.c2
-rw-r--r--sys/mips/beri/beri_pic.c741
-rw-r--r--sys/mips/cavium/ciu.c2
-rw-r--r--sys/mips/cavium/cryptocteon/cavium_crypto.c4
-rw-r--r--sys/mips/cavium/cvmx_config.h2
-rw-r--r--sys/mips/cavium/if_octm.c2
-rw-r--r--sys/mips/cavium/obio.c2
-rw-r--r--sys/mips/cavium/obiovar.h2
-rw-r--r--sys/mips/cavium/octe/cavium-ethernet.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-common.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-common.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-defines.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-headers.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-mdio.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-mdio.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-mem.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-mem.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-mv88e61xx.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-mv88e61xx.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-rgmii.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-rx.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-rx.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-sgmii.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-spi.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-tx.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-tx.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-util.h2
-rw-r--r--sys/mips/cavium/octe/ethernet-xaui.c2
-rw-r--r--sys/mips/cavium/octe/ethernet.c2
-rw-r--r--sys/mips/cavium/octe/mv88e61xxphy.c2
-rw-r--r--sys/mips/cavium/octe/mv88e61xxphyreg.h2
-rw-r--r--sys/mips/cavium/octe/octe.c2
-rw-r--r--sys/mips/cavium/octe/octebus.c2
-rw-r--r--sys/mips/cavium/octe/octebusvar.h2
-rw-r--r--sys/mips/cavium/octe/wrapper-cvmx-includes.h2
-rw-r--r--sys/mips/cavium/octeon_cop2.h2
-rw-r--r--sys/mips/cavium/octeon_ds1337.c2
-rw-r--r--sys/mips/cavium/octeon_ebt3000_cf.c2
-rw-r--r--sys/mips/cavium/octeon_gpio.c2
-rw-r--r--sys/mips/cavium/octeon_gpiovar.h2
-rw-r--r--sys/mips/cavium/octeon_irq.h2
-rw-r--r--sys/mips/cavium/octeon_machdep.c2
-rw-r--r--sys/mips/cavium/octeon_mp.c2
-rw-r--r--sys/mips/cavium/octeon_pci_console.c2
-rw-r--r--sys/mips/cavium/octeon_pcmap_regs.h2
-rw-r--r--sys/mips/cavium/octeon_pmc.c2
-rw-r--r--sys/mips/cavium/octeon_rnd.c2
-rw-r--r--sys/mips/cavium/octeon_rtc.c2
-rw-r--r--sys/mips/cavium/octeon_wdog.c2
-rw-r--r--sys/mips/cavium/octopci.c2
-rw-r--r--sys/mips/cavium/octopci_bus_space.c2
-rw-r--r--sys/mips/cavium/octopcireg.h2
-rw-r--r--sys/mips/cavium/octopcivar.h2
-rw-r--r--sys/mips/cavium/uart_bus_octeonusart.c2
-rw-r--r--sys/mips/cavium/uart_cpu_octeonusart.c2
-rw-r--r--sys/mips/cavium/uart_dev_oct16550.c2
-rw-r--r--sys/mips/cavium/usb/octusb.c2
-rw-r--r--sys/mips/cavium/usb/octusb.h2
-rw-r--r--sys/mips/cavium/usb/octusb_octeon.c2
-rw-r--r--sys/mips/gxemul/gxemul_machdep.c2
-rw-r--r--sys/mips/gxemul/mpreg.h2
-rw-r--r--sys/mips/idt/idt_machdep.c2
-rw-r--r--sys/mips/idt/idtpci.c2
-rw-r--r--sys/mips/idt/idtreg.h2
-rw-r--r--sys/mips/idt/if_kr.c2
-rw-r--r--sys/mips/idt/if_krreg.h2
-rw-r--r--sys/mips/idt/obio.c2
-rw-r--r--sys/mips/idt/obiovar.h2
-rw-r--r--sys/mips/idt/uart_bus_rc32434.c2
-rw-r--r--sys/mips/idt/uart_cpu_rc32434.c2
-rw-r--r--sys/mips/include/_align.h2
-rw-r--r--sys/mips/include/_bus.h2
-rw-r--r--sys/mips/include/_inttypes.h2
-rw-r--r--sys/mips/include/_limits.h2
-rw-r--r--sys/mips/include/_stdint.h2
-rw-r--r--sys/mips/include/_types.h2
-rw-r--r--sys/mips/include/asm.h2
-rw-r--r--sys/mips/include/atomic.h2
-rw-r--r--sys/mips/include/bootinfo.h2
-rw-r--r--sys/mips/include/bus.h2
-rw-r--r--sys/mips/include/bus_dma.h2
-rw-r--r--sys/mips/include/cache.h4
-rw-r--r--sys/mips/include/cache_mipsNN.h4
-rw-r--r--sys/mips/include/cache_r4k.h4
-rw-r--r--sys/mips/include/counter.h2
-rw-r--r--sys/mips/include/cpu.h2
-rw-r--r--sys/mips/include/cpufunc.h2
-rw-r--r--sys/mips/include/cpuinfo.h2
-rw-r--r--sys/mips/include/cpuregs.h2
-rw-r--r--sys/mips/include/db_machdep.h4
-rw-r--r--sys/mips/include/elf.h4
-rw-r--r--sys/mips/include/endian.h2
-rw-r--r--sys/mips/include/exec.h2
-rw-r--r--sys/mips/include/fdt.h2
-rw-r--r--sys/mips/include/float.h2
-rw-r--r--sys/mips/include/floatingpoint.h2
-rw-r--r--sys/mips/include/frame.h2
-rw-r--r--sys/mips/include/gdb_machdep.h2
-rw-r--r--sys/mips/include/hwfunc.h2
-rw-r--r--sys/mips/include/ieee.h2
-rw-r--r--sys/mips/include/in_cksum.h2
-rw-r--r--sys/mips/include/intr_machdep.h2
-rw-r--r--sys/mips/include/kdb.h2
-rw-r--r--sys/mips/include/limits.h2
-rw-r--r--sys/mips/include/md_var.h2
-rw-r--r--sys/mips/include/memdev.h2
-rw-r--r--sys/mips/include/metadata.h2
-rw-r--r--sys/mips/include/minidump.h2
-rw-r--r--sys/mips/include/mips_opcode.h2
-rw-r--r--sys/mips/include/octeon_cop2.h2
-rw-r--r--sys/mips/include/ofw_machdep.h2
-rw-r--r--sys/mips/include/param.h2
-rw-r--r--sys/mips/include/pcb.h2
-rw-r--r--sys/mips/include/pcpu.h2
-rw-r--r--sys/mips/include/pmap.h2
-rw-r--r--sys/mips/include/proc.h2
-rw-r--r--sys/mips/include/profile.h2
-rw-r--r--sys/mips/include/pte.h2
-rw-r--r--sys/mips/include/ptrace.h2
-rw-r--r--sys/mips/include/reg.h2
-rw-r--r--sys/mips/include/regdef.h2
-rw-r--r--sys/mips/include/regnum.h2
-rw-r--r--sys/mips/include/reloc.h2
-rw-r--r--sys/mips/include/runq.h2
-rw-r--r--sys/mips/include/sc_machdep.h2
-rw-r--r--sys/mips/include/sf_buf.h2
-rw-r--r--sys/mips/include/sigframe.h2
-rw-r--r--sys/mips/include/signal.h2
-rw-r--r--sys/mips/include/sysarch.h2
-rw-r--r--sys/mips/include/tlb.h2
-rw-r--r--sys/mips/include/tls.h2
-rw-r--r--sys/mips/include/trap.h2
-rw-r--r--sys/mips/include/ucontext.h2
-rw-r--r--sys/mips/include/varargs.h2
-rw-r--r--sys/mips/include/vdso.h2
-rw-r--r--sys/mips/include/vm.h2
-rw-r--r--sys/mips/include/vmparam.h2
-rw-r--r--sys/mips/malta/gt.c2
-rw-r--r--sys/mips/malta/gt_pci.c2
-rw-r--r--sys/mips/malta/gt_pci_bus_space.c2
-rw-r--r--sys/mips/malta/gt_pci_bus_space.h2
-rw-r--r--sys/mips/malta/gtreg.h2
-rw-r--r--sys/mips/malta/gtvar.h2
-rw-r--r--sys/mips/malta/malta_machdep.c2
-rw-r--r--sys/mips/malta/maltareg.h4
-rw-r--r--sys/mips/malta/obio.c2
-rw-r--r--sys/mips/malta/obiovar.h2
-rw-r--r--sys/mips/malta/uart_bus_maltausart.c2
-rw-r--r--sys/mips/malta/uart_cpu_maltausart.c2
-rw-r--r--sys/mips/malta/yamon.c2
-rw-r--r--sys/mips/malta/yamon.h2
-rw-r--r--sys/mips/mips/autoconf.c2
-rw-r--r--sys/mips/mips/bus_space_generic.c2
-rw-r--r--sys/mips/mips/busdma_machdep.c2
-rw-r--r--sys/mips/mips/cache.c2
-rw-r--r--sys/mips/mips/cache_mipsNN.c2
-rw-r--r--sys/mips/mips/cpu.c2
-rw-r--r--sys/mips/mips/db_disasm.c2
-rw-r--r--sys/mips/mips/db_interface.c2
-rw-r--r--sys/mips/mips/db_trace.c2
-rw-r--r--sys/mips/mips/dump_machdep.c2
-rw-r--r--sys/mips/mips/elf_machdep.c2
-rw-r--r--sys/mips/mips/elf_trampoline.c2
-rw-r--r--sys/mips/mips/freebsd32_machdep.c2
-rw-r--r--sys/mips/mips/gdb_machdep.c2
-rw-r--r--sys/mips/mips/genassym.c2
-rw-r--r--sys/mips/mips/in_cksum.c2
-rw-r--r--sys/mips/mips/intr_machdep.c2
-rw-r--r--sys/mips/mips/libkern_machdep.c2
-rw-r--r--sys/mips/mips/machdep.c4
-rw-r--r--sys/mips/mips/mem.c2
-rw-r--r--sys/mips/mips/minidump_machdep.c2
-rw-r--r--sys/mips/mips/mp_machdep.c2
-rw-r--r--sys/mips/mips/octeon_cop2.c2
-rw-r--r--sys/mips/mips/pm_machdep.c2
-rw-r--r--sys/mips/mips/pmap.c4
-rw-r--r--sys/mips/mips/ptrace_machdep.c2
-rw-r--r--sys/mips/mips/sc_machdep.c2
-rw-r--r--sys/mips/mips/stack_machdep.c2
-rw-r--r--sys/mips/mips/stdatomic.c2
-rw-r--r--sys/mips/mips/sys_machdep.c2
-rw-r--r--sys/mips/mips/tick.c2
-rw-r--r--sys/mips/mips/tlb.c2
-rw-r--r--sys/mips/mips/trap.c2
-rw-r--r--sys/mips/mips/uio_machdep.c2
-rw-r--r--sys/mips/mips/uma_machdep.c2
-rw-r--r--sys/mips/mips/vm_machdep.c2
-rw-r--r--sys/mips/nlm/board.c2
-rw-r--r--sys/mips/nlm/board.h2
-rw-r--r--sys/mips/nlm/board_cpld.c2
-rw-r--r--sys/mips/nlm/board_eeprom.c2
-rw-r--r--sys/mips/nlm/bus_space_rmi.c2
-rw-r--r--sys/mips/nlm/bus_space_rmi_pci.c2
-rw-r--r--sys/mips/nlm/clock.h2
-rw-r--r--sys/mips/nlm/cms.c2
-rw-r--r--sys/mips/nlm/dev/net/mdio.c2
-rw-r--r--sys/mips/nlm/dev/net/nae.c2
-rw-r--r--sys/mips/nlm/dev/net/sgmii.c2
-rw-r--r--sys/mips/nlm/dev/net/ucore/ucore.h2
-rw-r--r--sys/mips/nlm/dev/net/ucore/ucore_app.c2
-rw-r--r--sys/mips/nlm/dev/net/xaui.c2
-rw-r--r--sys/mips/nlm/dev/net/xlpge.c2
-rw-r--r--sys/mips/nlm/dev/net/xlpge.h2
-rw-r--r--sys/mips/nlm/dev/sec/nlmrsa.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmrsalib.h2
-rw-r--r--sys/mips/nlm/dev/sec/nlmsec.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmseclib.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmseclib.h2
-rw-r--r--sys/mips/nlm/dev/sec/rsa_ucode.h2
-rw-r--r--sys/mips/nlm/hal/bridge.h2
-rw-r--r--sys/mips/nlm/hal/cop2.h2
-rw-r--r--sys/mips/nlm/hal/cpucontrol.h2
-rw-r--r--sys/mips/nlm/hal/fmn.c2
-rw-r--r--sys/mips/nlm/hal/fmn.h2
-rw-r--r--sys/mips/nlm/hal/gbu.h2
-rw-r--r--sys/mips/nlm/hal/haldefs.h2
-rw-r--r--sys/mips/nlm/hal/interlaken.h2
-rw-r--r--sys/mips/nlm/hal/iomap.h2
-rw-r--r--sys/mips/nlm/hal/mdio.h2
-rw-r--r--sys/mips/nlm/hal/mips-extns.h2
-rw-r--r--sys/mips/nlm/hal/mmu.h2
-rw-r--r--sys/mips/nlm/hal/nae.h2
-rw-r--r--sys/mips/nlm/hal/nlm_hal.c2
-rw-r--r--sys/mips/nlm/hal/nlmsaelib.h2
-rw-r--r--sys/mips/nlm/hal/pcibus.h2
-rw-r--r--sys/mips/nlm/hal/pic.h2
-rw-r--r--sys/mips/nlm/hal/poe.h2
-rw-r--r--sys/mips/nlm/hal/sgmii.h2
-rw-r--r--sys/mips/nlm/hal/sys.h2
-rw-r--r--sys/mips/nlm/hal/uart.h2
-rw-r--r--sys/mips/nlm/hal/ucore_loader.h2
-rw-r--r--sys/mips/nlm/hal/usb.h2
-rw-r--r--sys/mips/nlm/hal/xaui.h2
-rw-r--r--sys/mips/nlm/interrupt.h2
-rw-r--r--sys/mips/nlm/intr_machdep.c2
-rw-r--r--sys/mips/nlm/msgring.h2
-rw-r--r--sys/mips/nlm/tick.c2
-rw-r--r--sys/mips/nlm/uart_cpu_xlp.c2
-rw-r--r--sys/mips/nlm/usb_init.c2
-rw-r--r--sys/mips/nlm/xlp.h2
-rw-r--r--sys/mips/nlm/xlp_machdep.c2
-rw-r--r--sys/mips/nlm/xlp_pci.c2
-rw-r--r--sys/mips/rmi/board.c2
-rw-r--r--sys/mips/rmi/board.h2
-rw-r--r--sys/mips/rmi/bus_space_rmi.c2
-rw-r--r--sys/mips/rmi/bus_space_rmi_pci.c2
-rw-r--r--sys/mips/rmi/dev/iic/at24co2n.c2
-rw-r--r--sys/mips/rmi/dev/iic/max6657.c2
-rw-r--r--sys/mips/rmi/dev/nlge/if_nlge.c2
-rw-r--r--sys/mips/rmi/dev/nlge/if_nlge.h2
-rw-r--r--sys/mips/rmi/dev/sec/desc.h2
-rw-r--r--sys/mips/rmi/dev/sec/rmilib.c2
-rw-r--r--sys/mips/rmi/dev/sec/rmilib.h2
-rw-r--r--sys/mips/rmi/dev/sec/rmisec.c2
-rw-r--r--sys/mips/rmi/dev/xlr/debug.h2
-rw-r--r--sys/mips/rmi/fmn.c2
-rw-r--r--sys/mips/rmi/interrupt.h2
-rw-r--r--sys/mips/rmi/intr_machdep.c2
-rw-r--r--sys/mips/rmi/iodi.c2
-rw-r--r--sys/mips/rmi/iomap.h2
-rw-r--r--sys/mips/rmi/msgring.h2
-rw-r--r--sys/mips/rmi/pcibus.h2
-rw-r--r--sys/mips/rmi/pic.h2
-rw-r--r--sys/mips/rmi/rmi_boot_info.h2
-rw-r--r--sys/mips/rmi/rmi_mips_exts.h2
-rw-r--r--sys/mips/rmi/tick.c2
-rw-r--r--sys/mips/rmi/uart_bus_xlr_iodi.c2
-rw-r--r--sys/mips/rmi/uart_cpu_mips_xlr.c2
-rw-r--r--sys/mips/rmi/xlr_i2c.c2
-rw-r--r--sys/mips/rmi/xlr_machdep.c2
-rw-r--r--sys/mips/rmi/xlr_pci.c2
-rw-r--r--sys/mips/rmi/xlr_pcmcia.c2
-rw-r--r--sys/mips/rmi/xls_ehci.c2
-rw-r--r--sys/mips/rt305x/obio.c2
-rw-r--r--sys/mips/rt305x/obiovar.h2
-rw-r--r--sys/mips/rt305x/rt305x_dotg.c2
-rw-r--r--sys/mips/rt305x/rt305x_gpio.c2
-rw-r--r--sys/mips/rt305x/rt305x_gpio.h2
-rw-r--r--sys/mips/rt305x/rt305x_gpiovar.h2
-rw-r--r--sys/mips/rt305x/rt305x_ic.c2
-rw-r--r--sys/mips/rt305x/rt305x_icvar.h2
-rw-r--r--sys/mips/rt305x/rt305x_machdep.c2
-rw-r--r--sys/mips/rt305x/rt305x_sysctl.c2
-rw-r--r--sys/mips/rt305x/rt305x_sysctlvar.h2
-rw-r--r--sys/mips/rt305x/rt305xreg.h2
-rw-r--r--sys/mips/rt305x/rt_swreg.h2
-rw-r--r--sys/mips/rt305x/uart_bus_rt305x.c2
-rw-r--r--sys/mips/rt305x/uart_cpu_rt305x.c2
-rw-r--r--sys/mips/rt305x/uart_dev_rt305x.c2
-rw-r--r--sys/mips/rt305x/uart_dev_rt305x.h2
-rw-r--r--sys/mips/sibyte/ata_zbbus.c2
-rw-r--r--sys/mips/sibyte/sb_bus_space.h2
-rw-r--r--sys/mips/sibyte/sb_machdep.c2
-rw-r--r--sys/mips/sibyte/sb_scd.c2
-rw-r--r--sys/mips/sibyte/sb_scd.h2
-rw-r--r--sys/mips/sibyte/sb_zbbus.c2
-rw-r--r--sys/mips/sibyte/sb_zbpci.c2
-rw-r--r--sys/net/bpf.c2
-rw-r--r--sys/net/bpf.h2
-rw-r--r--sys/net/bpf_buffer.c2
-rw-r--r--sys/net/bpf_filter.c2
-rw-r--r--sys/net/bpf_jitter.c2
-rw-r--r--sys/net/bpf_jitter.h2
-rw-r--r--sys/net/bpfdesc.h2
-rw-r--r--sys/net/fddi.h2
-rw-r--r--sys/net/if.c2
-rw-r--r--sys/net/if.h2
-rw-r--r--sys/net/if_arc.h2
-rw-r--r--sys/net/if_arcsubr.c2
-rw-r--r--sys/net/if_arp.h2
-rw-r--r--sys/net/if_clone.c2
-rw-r--r--sys/net/if_clone.h2
-rw-r--r--sys/net/if_disc.c2
-rw-r--r--sys/net/if_dl.h2
-rw-r--r--sys/net/if_edsc.c2
-rw-r--r--sys/net/if_ethersubr.c2
-rw-r--r--sys/net/if_fddisubr.c2
-rw-r--r--sys/net/if_fwsubr.c2
-rw-r--r--sys/net/if_gif.c2
-rw-r--r--sys/net/if_gif.h2
-rw-r--r--sys/net/if_llc.h2
-rw-r--r--sys/net/if_loop.c2
-rw-r--r--sys/net/if_stf.c2
-rw-r--r--sys/net/if_types.h2
-rw-r--r--sys/net/if_var.h2
-rw-r--r--sys/net/ifq.h2
-rw-r--r--sys/net/pfkeyv2.h2
-rw-r--r--sys/net/radix.c2
-rw-r--r--sys/net/radix.h2
-rw-r--r--sys/net/radix_mpath.c2
-rw-r--r--sys/net/radix_mpath.h2
-rw-r--r--sys/net/raw_cb.c2
-rw-r--r--sys/net/raw_cb.h2
-rw-r--r--sys/net/raw_usrreq.c2
-rw-r--r--sys/net/route.c2
-rw-r--r--sys/net/route.h2
-rw-r--r--sys/net/rtsock.c2
-rw-r--r--sys/net/slcompress.c2
-rw-r--r--sys/net/slcompress.h2
-rw-r--r--sys/netinet/icmp6.h2
-rw-r--r--sys/netinet/icmp_var.h2
-rw-r--r--sys/netinet/if_ether.c2
-rw-r--r--sys/netinet/if_ether.h2
-rw-r--r--sys/netinet/igmp.c2
-rw-r--r--sys/netinet/igmp.h2
-rw-r--r--sys/netinet/igmp_var.h4
-rw-r--r--sys/netinet/in.c2
-rw-r--r--sys/netinet/in.h2
-rw-r--r--sys/netinet/in_cksum.c2
-rw-r--r--sys/netinet/in_gif.c2
-rw-r--r--sys/netinet/in_pcb.c2
-rw-r--r--sys/netinet/in_pcb.h2
-rw-r--r--sys/netinet/in_proto.c2
-rw-r--r--sys/netinet/in_systm.h2
-rw-r--r--sys/netinet/in_var.h2
-rw-r--r--sys/netinet/ip.h2
-rw-r--r--sys/netinet/ip6.h2
-rw-r--r--sys/netinet/ip_divert.c2
-rw-r--r--sys/netinet/ip_ecn.c2
-rw-r--r--sys/netinet/ip_ecn.h2
-rw-r--r--sys/netinet/ip_encap.c2
-rw-r--r--sys/netinet/ip_encap.h2
-rw-r--r--sys/netinet/ip_icmp.c2
-rw-r--r--sys/netinet/ip_icmp.h2
-rw-r--r--sys/netinet/ip_input.c2
-rw-r--r--sys/netinet/ip_mroute.c2
-rw-r--r--sys/netinet/ip_mroute.h2
-rw-r--r--sys/netinet/ip_options.c2
-rw-r--r--sys/netinet/ip_options.h2
-rw-r--r--sys/netinet/ip_output.c2
-rw-r--r--sys/netinet/ip_var.h2
-rw-r--r--sys/netinet/pim.h2
-rw-r--r--sys/netinet/pim_var.h2
-rw-r--r--sys/netinet/raw_ip.c2
-rw-r--r--sys/netinet/sctp.h2
-rw-r--r--sys/netinet/sctp_asconf.c2
-rw-r--r--sys/netinet/sctp_asconf.h2
-rw-r--r--sys/netinet/sctp_auth.c2
-rw-r--r--sys/netinet/sctp_auth.h2
-rw-r--r--sys/netinet/sctp_bsd_addr.c2
-rw-r--r--sys/netinet/sctp_bsd_addr.h2
-rw-r--r--sys/netinet/sctp_cc_functions.c2
-rw-r--r--sys/netinet/sctp_constants.h2
-rw-r--r--sys/netinet/sctp_crc32.c2
-rw-r--r--sys/netinet/sctp_crc32.h2
-rw-r--r--sys/netinet/sctp_dtrace_declare.h2
-rw-r--r--sys/netinet/sctp_dtrace_define.h2
-rw-r--r--sys/netinet/sctp_header.h2
-rw-r--r--sys/netinet/sctp_indata.c2
-rw-r--r--sys/netinet/sctp_indata.h2
-rw-r--r--sys/netinet/sctp_input.c2
-rw-r--r--sys/netinet/sctp_input.h2
-rw-r--r--sys/netinet/sctp_lock_bsd.h2
-rw-r--r--sys/netinet/sctp_os.h2
-rw-r--r--sys/netinet/sctp_os_bsd.h2
-rw-r--r--sys/netinet/sctp_output.c2
-rw-r--r--sys/netinet/sctp_output.h2
-rw-r--r--sys/netinet/sctp_pcb.c2
-rw-r--r--sys/netinet/sctp_pcb.h2
-rw-r--r--sys/netinet/sctp_peeloff.c2
-rw-r--r--sys/netinet/sctp_peeloff.h2
-rw-r--r--sys/netinet/sctp_structs.h2
-rw-r--r--sys/netinet/sctp_sysctl.c2
-rw-r--r--sys/netinet/sctp_sysctl.h2
-rw-r--r--sys/netinet/sctp_timer.c2
-rw-r--r--sys/netinet/sctp_timer.h2
-rw-r--r--sys/netinet/sctp_uio.h2
-rw-r--r--sys/netinet/sctp_usrreq.c2
-rw-r--r--sys/netinet/sctp_var.h2
-rw-r--r--sys/netinet/sctputil.c2
-rw-r--r--sys/netinet/sctputil.h2
-rw-r--r--sys/netinet/tcp.h2
-rw-r--r--sys/netinet/tcp_debug.c2
-rw-r--r--sys/netinet/tcp_debug.h2
-rw-r--r--sys/netinet/tcp_fsm.h2
-rw-r--r--sys/netinet/tcp_input.c2
-rw-r--r--sys/netinet/tcp_output.c2
-rw-r--r--sys/netinet/tcp_reass.c2
-rw-r--r--sys/netinet/tcp_sack.c4
-rw-r--r--sys/netinet/tcp_seq.h2
-rw-r--r--sys/netinet/tcp_subr.c2
-rw-r--r--sys/netinet/tcp_syncache.h2
-rw-r--r--sys/netinet/tcp_timer.c2
-rw-r--r--sys/netinet/tcp_timer.h2
-rw-r--r--sys/netinet/tcp_timewait.c2
-rw-r--r--sys/netinet/tcp_usrreq.c2
-rw-r--r--sys/netinet/tcp_var.h2
-rw-r--r--sys/netinet/tcpip.h2
-rw-r--r--sys/netinet/udp.h2
-rw-r--r--sys/netinet/udp_usrreq.c2
-rw-r--r--sys/netinet/udp_var.h2
-rw-r--r--sys/netinet6/dest6.c2
-rw-r--r--sys/netinet6/frag6.c2
-rw-r--r--sys/netinet6/icmp6.c2
-rw-r--r--sys/netinet6/in6.c2
-rw-r--r--sys/netinet6/in6.h2
-rw-r--r--sys/netinet6/in6_cksum.c2
-rw-r--r--sys/netinet6/in6_gif.c2
-rw-r--r--sys/netinet6/in6_ifattach.c2
-rw-r--r--sys/netinet6/in6_ifattach.h2
-rw-r--r--sys/netinet6/in6_pcb.c2
-rw-r--r--sys/netinet6/in6_pcb.h2
-rw-r--r--sys/netinet6/in6_proto.c2
-rw-r--r--sys/netinet6/in6_rmx.c2
-rw-r--r--sys/netinet6/in6_src.c2
-rw-r--r--sys/netinet6/in6_var.h2
-rw-r--r--sys/netinet6/ip6_ecn.h2
-rw-r--r--sys/netinet6/ip6_forward.c2
-rw-r--r--sys/netinet6/ip6_id.c2
-rw-r--r--sys/netinet6/ip6_input.c2
-rw-r--r--sys/netinet6/ip6_mroute.c2
-rw-r--r--sys/netinet6/ip6_mroute.h2
-rw-r--r--sys/netinet6/ip6_output.c2
-rw-r--r--sys/netinet6/ip6_var.h2
-rw-r--r--sys/netinet6/ip6protosw.h2
-rw-r--r--sys/netinet6/mld6.c2
-rw-r--r--sys/netinet6/nd6.c2
-rw-r--r--sys/netinet6/nd6.h2
-rw-r--r--sys/netinet6/nd6_nbr.c2
-rw-r--r--sys/netinet6/nd6_rtr.c2
-rw-r--r--sys/netinet6/pim6.h2
-rw-r--r--sys/netinet6/pim6_var.h2
-rw-r--r--sys/netinet6/raw_ip6.c2
-rw-r--r--sys/netinet6/raw_ip6.h2
-rw-r--r--sys/netinet6/route6.c2
-rw-r--r--sys/netinet6/scope6.c2
-rw-r--r--sys/netinet6/scope6_var.h2
-rw-r--r--sys/netinet6/sctp6_usrreq.c2
-rw-r--r--sys/netinet6/sctp6_var.h2
-rw-r--r--sys/netinet6/tcp6_var.h2
-rw-r--r--sys/netinet6/udp6_usrreq.c2
-rw-r--r--sys/netinet6/udp6_var.h2
-rw-r--r--sys/netipsec/ah.h2
-rw-r--r--sys/netipsec/esp.h2
-rw-r--r--sys/netipsec/ipcomp.h2
-rw-r--r--sys/netipsec/ipcomp_var.h2
-rw-r--r--sys/netipsec/ipsec.c2
-rw-r--r--sys/netipsec/ipsec.h2
-rw-r--r--sys/netipsec/ipsec6.h2
-rw-r--r--sys/netipsec/key.c2
-rw-r--r--sys/netipsec/key.h2
-rw-r--r--sys/netipsec/key_debug.c2
-rw-r--r--sys/netipsec/key_debug.h2
-rw-r--r--sys/netipsec/key_var.h2
-rw-r--r--sys/netipsec/keydb.h2
-rw-r--r--sys/netipsec/keysock.c2
-rw-r--r--sys/netipsec/keysock.h2
-rw-r--r--sys/netpfil/pf/in4_cksum.c2
-rw-r--r--sys/netsmb/smb_crypt.c2
-rw-r--r--sys/nfs/bootp_subr.c2
-rw-r--r--sys/nfs/krpc_subr.c2
-rw-r--r--sys/nfs/nfs_common.h2
-rw-r--r--sys/nfs/nfs_diskless.c2
-rw-r--r--sys/nfs/nfs_nfssvc.c2
-rw-r--r--sys/nfs/nfsdiskless.h2
-rw-r--r--sys/nfs/nfsproto.h2
-rw-r--r--sys/nfs/nfssvc.h2
-rw-r--r--sys/nfs/xdr_subs.h2
-rw-r--r--sys/nfsclient/nfs.h2
-rw-r--r--sys/nfsclient/nfsargs.h2
-rw-r--r--sys/nfsclient/nfsm_subs.h2
-rw-r--r--sys/nfsclient/nfsmount.h2
-rw-r--r--sys/nfsclient/nfsnode.h2
-rw-r--r--sys/nfsclient/nfsstats.h2
-rw-r--r--sys/nfsserver/nfs.h2
-rw-r--r--sys/nfsserver/nfsm_subs.h2
-rw-r--r--sys/nfsserver/nfsrvcache.h2
-rw-r--r--sys/nfsserver/nfsrvstats.h2
-rw-r--r--sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c3
-rw-r--r--sys/powerpc/aim/mmu_oea.c2
-rw-r--r--sys/powerpc/aim/mmu_oea64.c2
-rw-r--r--sys/powerpc/aim/mmu_oea64.h2
-rw-r--r--sys/powerpc/aim/moea64_native.c2
-rw-r--r--sys/powerpc/aim/mp_cpudep.c2
-rw-r--r--sys/powerpc/aim/slb.c2
-rw-r--r--sys/powerpc/booke/machdep_e500.c2
-rw-r--r--sys/powerpc/booke/machdep_ppc4xx.c2
-rw-r--r--sys/powerpc/booke/mp_cpudep.c2
-rw-r--r--sys/powerpc/booke/platform_bare.c2
-rw-r--r--sys/powerpc/booke/pmap.c2
-rw-r--r--sys/powerpc/cpufreq/dfs.c2
-rw-r--r--sys/powerpc/cpufreq/pcr.c2
-rw-r--r--sys/powerpc/cpufreq/pmufreq.c2
-rw-r--r--sys/powerpc/fpu/fpu_add.c4
-rw-r--r--sys/powerpc/fpu/fpu_arith.h4
-rw-r--r--sys/powerpc/fpu/fpu_compare.c4
-rw-r--r--sys/powerpc/fpu/fpu_div.c4
-rw-r--r--sys/powerpc/fpu/fpu_emu.c4
-rw-r--r--sys/powerpc/fpu/fpu_emu.h4
-rw-r--r--sys/powerpc/fpu/fpu_explode.c4
-rw-r--r--sys/powerpc/fpu/fpu_extern.h2
-rw-r--r--sys/powerpc/fpu/fpu_implode.c4
-rw-r--r--sys/powerpc/fpu/fpu_instr.h4
-rw-r--r--sys/powerpc/fpu/fpu_mul.c2
-rw-r--r--sys/powerpc/fpu/fpu_sqrt.c4
-rw-r--r--sys/powerpc/fpu/fpu_subr.c2
-rw-r--r--sys/powerpc/include/_align.h2
-rw-r--r--sys/powerpc/include/_bus.h2
-rw-r--r--sys/powerpc/include/_inttypes.h2
-rw-r--r--sys/powerpc/include/_limits.h2
-rw-r--r--sys/powerpc/include/_stdint.h2
-rw-r--r--sys/powerpc/include/_types.h2
-rw-r--r--sys/powerpc/include/altivec.h2
-rw-r--r--sys/powerpc/include/asm.h2
-rw-r--r--sys/powerpc/include/atomic.h2
-rw-r--r--sys/powerpc/include/bat.h2
-rw-r--r--sys/powerpc/include/bus.h2
-rw-r--r--sys/powerpc/include/bus_dma.h2
-rw-r--r--sys/powerpc/include/counter.h2
-rw-r--r--sys/powerpc/include/cpu.h2
-rw-r--r--sys/powerpc/include/cpufunc.h2
-rw-r--r--sys/powerpc/include/dbdma.h2
-rw-r--r--sys/powerpc/include/elf.h2
-rw-r--r--sys/powerpc/include/endian.h2
-rw-r--r--sys/powerpc/include/exec.h2
-rw-r--r--sys/powerpc/include/float.h2
-rw-r--r--sys/powerpc/include/floatingpoint.h2
-rw-r--r--sys/powerpc/include/fpu.h2
-rw-r--r--sys/powerpc/include/frame.h2
-rw-r--r--sys/powerpc/include/gdb_machdep.h2
-rw-r--r--sys/powerpc/include/hid.h2
-rw-r--r--sys/powerpc/include/ieee.h2
-rw-r--r--sys/powerpc/include/in_cksum.h2
-rw-r--r--sys/powerpc/include/intr_machdep.h2
-rw-r--r--sys/powerpc/include/kdb.h2
-rw-r--r--sys/powerpc/include/limits.h2
-rw-r--r--sys/powerpc/include/machdep.h2
-rw-r--r--sys/powerpc/include/md_var.h2
-rw-r--r--sys/powerpc/include/memdev.h2
-rw-r--r--sys/powerpc/include/metadata.h2
-rw-r--r--sys/powerpc/include/mmuvar.h2
-rw-r--r--sys/powerpc/include/ofw_machdep.h2
-rw-r--r--sys/powerpc/include/openpicreg.h2
-rw-r--r--sys/powerpc/include/openpicvar.h2
-rw-r--r--sys/powerpc/include/param.h2
-rw-r--r--sys/powerpc/include/pcb.h2
-rw-r--r--sys/powerpc/include/pcpu.h2
-rw-r--r--sys/powerpc/include/pio.h2
-rw-r--r--sys/powerpc/include/platform.h2
-rw-r--r--sys/powerpc/include/platformvar.h2
-rw-r--r--sys/powerpc/include/pmap.h2
-rw-r--r--sys/powerpc/include/proc.h2
-rw-r--r--sys/powerpc/include/psl.h2
-rw-r--r--sys/powerpc/include/pte.h2
-rw-r--r--sys/powerpc/include/ptrace.h2
-rw-r--r--sys/powerpc/include/reloc.h2
-rw-r--r--sys/powerpc/include/rtas.h2
-rw-r--r--sys/powerpc/include/runq.h2
-rw-r--r--sys/powerpc/include/sc_machdep.h2
-rw-r--r--sys/powerpc/include/sigframe.h2
-rw-r--r--sys/powerpc/include/signal.h2
-rw-r--r--sys/powerpc/include/slb.h2
-rw-r--r--sys/powerpc/include/smp.h2
-rw-r--r--sys/powerpc/include/spr.h2
-rw-r--r--sys/powerpc/include/sr.h2
-rw-r--r--sys/powerpc/include/stdarg.h2
-rw-r--r--sys/powerpc/include/sysarch.h2
-rw-r--r--sys/powerpc/include/tlb.h2
-rw-r--r--sys/powerpc/include/trap.h2
-rw-r--r--sys/powerpc/include/ucontext.h2
-rw-r--r--sys/powerpc/include/varargs.h2
-rw-r--r--sys/powerpc/include/vdso.h2
-rw-r--r--sys/powerpc/include/vm.h2
-rw-r--r--sys/powerpc/include/vmparam.h2
-rw-r--r--sys/powerpc/mambo/mambo.c2
-rw-r--r--sys/powerpc/mambo/mambo_console.c2
-rw-r--r--sys/powerpc/mambo/mambo_disk.c2
-rw-r--r--sys/powerpc/mambo/mambocall.h2
-rw-r--r--sys/powerpc/mpc85xx/atpic.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_bus_fdt.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_core.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_reg.h2
-rw-r--r--sys/powerpc/mpc85xx/i2c.c2
-rw-r--r--sys/powerpc/mpc85xx/isa.c2
-rw-r--r--sys/powerpc/mpc85xx/lbc.c2
-rw-r--r--sys/powerpc/mpc85xx/lbc.h2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.c2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.h2
-rw-r--r--sys/powerpc/mpc85xx/pci_mpc85xx.c2
-rw-r--r--sys/powerpc/mpc85xx/platform_mpc85xx.c2
-rw-r--r--sys/powerpc/ofw/ofw_machdep.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcib_pci.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcibus.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcibus.h2
-rw-r--r--sys/powerpc/ofw/ofw_real.c2
-rw-r--r--sys/powerpc/ofw/ofw_syscons.c2
-rw-r--r--sys/powerpc/ofw/ofw_syscons.h2
-rw-r--r--sys/powerpc/ofw/openpic_ofw.c2
-rw-r--r--sys/powerpc/ofw/rtas.c2
-rw-r--r--sys/powerpc/powermac/ata_dbdma.c2
-rw-r--r--sys/powerpc/powermac/ata_dbdma.h2
-rw-r--r--sys/powerpc/powermac/ata_kauai.c2
-rw-r--r--sys/powerpc/powermac/ata_macio.c2
-rw-r--r--sys/powerpc/powermac/atibl.c2
-rw-r--r--sys/powerpc/powermac/cpcht.c2
-rw-r--r--sys/powerpc/powermac/cuda.c2
-rw-r--r--sys/powerpc/powermac/cudavar.h2
-rw-r--r--sys/powerpc/powermac/dbdma.c2
-rw-r--r--sys/powerpc/powermac/dbdmavar.h2
-rw-r--r--sys/powerpc/powermac/fcu.c2
-rw-r--r--sys/powerpc/powermac/grackle.c2
-rw-r--r--sys/powerpc/powermac/gracklevar.h2
-rw-r--r--sys/powerpc/powermac/hrowpic.c2
-rw-r--r--sys/powerpc/powermac/hrowpicvar.h2
-rw-r--r--sys/powerpc/powermac/kiic.c2
-rw-r--r--sys/powerpc/powermac/macgpio.c2
-rw-r--r--sys/powerpc/powermac/macgpiovar.h2
-rw-r--r--sys/powerpc/powermac/macio.c2
-rw-r--r--sys/powerpc/powermac/maciovar.h2
-rw-r--r--sys/powerpc/powermac/nvbl.c2
-rw-r--r--sys/powerpc/powermac/platform_powermac.c2
-rw-r--r--sys/powerpc/powermac/pmu.c2
-rw-r--r--sys/powerpc/powermac/pmuvar.h2
-rw-r--r--sys/powerpc/powermac/powermac_thermal.c2
-rw-r--r--sys/powerpc/powermac/powermac_thermal.h2
-rw-r--r--sys/powerpc/powermac/pswitch.c2
-rw-r--r--sys/powerpc/powermac/smu.c2
-rw-r--r--sys/powerpc/powermac/smusat.c2
-rw-r--r--sys/powerpc/powermac/uninorth.c2
-rw-r--r--sys/powerpc/powermac/uninorthpci.c2
-rw-r--r--sys/powerpc/powermac/uninorthvar.h2
-rw-r--r--sys/powerpc/powermac/vcoregpio.c2
-rw-r--r--sys/powerpc/powermac/viareg.h2
-rw-r--r--sys/powerpc/powerpc/altivec.c2
-rw-r--r--sys/powerpc/powerpc/autoconf.c2
-rw-r--r--sys/powerpc/powerpc/bcopy.c2
-rw-r--r--sys/powerpc/powerpc/bus_machdep.c2
-rw-r--r--sys/powerpc/powerpc/busdma_machdep.c2
-rw-r--r--sys/powerpc/powerpc/clock.c2
-rw-r--r--sys/powerpc/powerpc/copyinout.c2
-rw-r--r--sys/powerpc/powerpc/copystr.c2
-rw-r--r--sys/powerpc/powerpc/cpu.c2
-rw-r--r--sys/powerpc/powerpc/db_hwwatch.c2
-rw-r--r--sys/powerpc/powerpc/dump_machdep.c2
-rw-r--r--sys/powerpc/powerpc/elf32_machdep.c2
-rw-r--r--sys/powerpc/powerpc/elf64_machdep.c2
-rw-r--r--sys/powerpc/powerpc/exec_machdep.c2
-rw-r--r--sys/powerpc/powerpc/fpu.c2
-rw-r--r--sys/powerpc/powerpc/fuswintr.c2
-rw-r--r--sys/powerpc/powerpc/gdb_machdep.c2
-rw-r--r--sys/powerpc/powerpc/genassym.c2
-rw-r--r--sys/powerpc/powerpc/in_cksum.c2
-rw-r--r--sys/powerpc/powerpc/intr_machdep.c2
-rw-r--r--sys/powerpc/powerpc/mem.c2
-rw-r--r--sys/powerpc/powerpc/mp_machdep.c2
-rw-r--r--sys/powerpc/powerpc/openpic.c2
-rw-r--r--sys/powerpc/powerpc/platform.c2
-rw-r--r--sys/powerpc/powerpc/pmap_dispatch.c2
-rw-r--r--sys/powerpc/powerpc/sc_machdep.c2
-rw-r--r--sys/powerpc/powerpc/stack_machdep.c2
-rw-r--r--sys/powerpc/powerpc/suswintr.c2
-rw-r--r--sys/powerpc/powerpc/syncicache.c2
-rw-r--r--sys/powerpc/powerpc/sys_machdep.c2
-rw-r--r--sys/powerpc/powerpc/uio_machdep.c2
-rw-r--r--sys/powerpc/powerpc/vm_machdep.c2
-rw-r--r--sys/powerpc/ps3/ehci_ps3.c2
-rw-r--r--sys/powerpc/ps3/if_glc.c2
-rw-r--r--sys/powerpc/ps3/if_glcreg.h2
-rw-r--r--sys/powerpc/ps3/mmu_ps3.c2
-rw-r--r--sys/powerpc/ps3/ohci_ps3.c2
-rw-r--r--sys/powerpc/ps3/platform_ps3.c2
-rw-r--r--sys/powerpc/ps3/ps3_syscons.c2
-rw-r--r--sys/powerpc/ps3/ps3bus.c2
-rw-r--r--sys/powerpc/ps3/ps3bus.h2
-rw-r--r--sys/powerpc/ps3/ps3cdrom.c2
-rw-r--r--sys/powerpc/ps3/ps3disk.c2
-rw-r--r--sys/powerpc/ps3/ps3pic.c2
-rw-r--r--sys/powerpc/pseries/mmu_phyp.c4
-rw-r--r--sys/powerpc/pseries/phyp-hvcall.h2
-rw-r--r--sys/powerpc/pseries/phyp_console.c2
-rw-r--r--sys/powerpc/pseries/phyp_llan.c2
-rw-r--r--sys/powerpc/pseries/phyp_vscsi.c2
-rw-r--r--sys/powerpc/pseries/platform_chrp.c2
-rw-r--r--sys/powerpc/pseries/plpar_iommu.c2
-rw-r--r--sys/powerpc/pseries/plpar_iommu.h2
-rw-r--r--sys/powerpc/pseries/plpar_pcibus.c2
-rw-r--r--sys/powerpc/pseries/rtas_dev.c2
-rw-r--r--sys/powerpc/pseries/rtas_pci.c2
-rw-r--r--sys/powerpc/pseries/vdevice.c2
-rw-r--r--sys/powerpc/pseries/xics.c2
-rw-r--r--sys/powerpc/psim/ata_iobus.c2
-rw-r--r--sys/powerpc/psim/iobus.c2
-rw-r--r--sys/powerpc/psim/iobusvar.h2
-rw-r--r--sys/powerpc/psim/openpic_iobus.c2
-rw-r--r--sys/powerpc/psim/uart_iobus.c2
-rw-r--r--sys/riscv/riscv/in_cksum.c2
-rw-r--r--sys/riscv/riscv/pmap.c2
-rw-r--r--sys/rpc/auth.h2
-rw-r--r--sys/rpc/auth_none.c2
-rw-r--r--sys/rpc/auth_unix.c2
-rw-r--r--sys/rpc/authunix_prot.c2
-rw-r--r--sys/rpc/clnt.h2
-rw-r--r--sys/rpc/clnt_dg.c2
-rw-r--r--sys/rpc/clnt_vc.c2
-rw-r--r--sys/rpc/krpc.h2
-rw-r--r--sys/rpc/nettype.h2
-rw-r--r--sys/rpc/pmap_prot.h2
-rw-r--r--sys/rpc/rpc.h2
-rw-r--r--sys/rpc/rpc_callmsg.c2
-rw-r--r--sys/rpc/rpc_com.h2
-rw-r--r--sys/rpc/rpc_generic.c2
-rw-r--r--sys/rpc/rpc_msg.h2
-rw-r--r--sys/rpc/rpc_prot.c2
-rw-r--r--sys/rpc/rpcb_clnt.c2
-rw-r--r--sys/rpc/rpcb_clnt.h2
-rw-r--r--sys/rpc/rpcb_prot.c2
-rw-r--r--sys/rpc/rpcb_prot.h2
-rw-r--r--sys/rpc/rpcm_subs.h2
-rw-r--r--sys/rpc/rpcsec_gss/rpcsec_gss.c2
-rw-r--r--sys/rpc/rpcsec_gss/rpcsec_gss_int.h2
-rw-r--r--sys/rpc/rpcsec_gss/rpcsec_gss_prot.c2
-rw-r--r--sys/rpc/rpcsec_gss/svc_rpcsec_gss.c3
-rw-r--r--sys/rpc/svc.c2
-rw-r--r--sys/rpc/svc.h2
-rw-r--r--sys/rpc/svc_auth.c2
-rw-r--r--sys/rpc/svc_auth.h2
-rw-r--r--sys/rpc/svc_auth_unix.c2
-rw-r--r--sys/rpc/svc_dg.c2
-rw-r--r--sys/rpc/svc_generic.c2
-rw-r--r--sys/rpc/svc_vc.c2
-rw-r--r--sys/rpc/types.h2
-rw-r--r--sys/rpc/xdr.h2
-rw-r--r--sys/security/audit/audit.c2
-rw-r--r--sys/security/audit/audit.h2
-rw-r--r--sys/security/audit/audit_arg.c2
-rw-r--r--sys/security/audit/audit_bsm.c2
-rw-r--r--sys/security/audit/audit_bsm_klib.c4
-rw-r--r--sys/security/audit/audit_private.h2
-rw-r--r--sys/security/audit/audit_syscalls.c2
-rw-r--r--sys/security/audit/audit_worker.c2
-rw-r--r--sys/security/audit/bsm_domain.c2
-rw-r--r--sys/security/audit/bsm_errno.c2
-rw-r--r--sys/security/audit/bsm_fcntl.c2
-rw-r--r--sys/security/audit/bsm_socket_type.c2
-rw-r--r--sys/security/audit/bsm_token.c2
-rw-r--r--sys/sparc64/include/_types.h2
-rw-r--r--sys/sparc64/include/asm.h2
-rw-r--r--sys/sparc64/include/bus_common.h2
-rw-r--r--sys/sparc64/include/cache.h2
-rw-r--r--sys/sparc64/include/cpu.h2
-rw-r--r--sys/sparc64/include/endian.h2
-rw-r--r--sys/sparc64/include/float.h2
-rw-r--r--sys/sparc64/include/floatingpoint.h2
-rw-r--r--sys/sparc64/include/ieee.h2
-rw-r--r--sys/sparc64/include/in_cksum.h2
-rw-r--r--sys/sparc64/include/iommureg.h2
-rw-r--r--sys/sparc64/include/md_var.h2
-rw-r--r--sys/sparc64/include/pmap.h2
-rw-r--r--sys/sparc64/include/proc.h2
-rw-r--r--sys/sparc64/include/ptrace.h2
-rw-r--r--sys/sparc64/include/reg.h2
-rw-r--r--sys/sparc64/include/reloc.h2
-rw-r--r--sys/sparc64/include/setjmp.h2
-rw-r--r--sys/sparc64/include/signal.h2
-rw-r--r--sys/sparc64/include/sysarch.h2
-rw-r--r--sys/sparc64/include/varargs.h2
-rw-r--r--sys/sparc64/include/vmparam.h2
-rw-r--r--sys/sparc64/sparc64/cache.c2
-rw-r--r--sys/sparc64/sparc64/eeprom.c2
-rw-r--r--sys/sparc64/sparc64/in_cksum.c2
-rw-r--r--sys/sparc64/sparc64/intr_machdep.c2
-rw-r--r--sys/sparc64/sparc64/machdep.c2
-rw-r--r--sys/sparc64/sparc64/mem.c2
-rw-r--r--sys/sparc64/sparc64/pmap.c2
-rw-r--r--sys/sparc64/sparc64/trap.c2
-rw-r--r--sys/sparc64/sparc64/uio_machdep.c2
-rw-r--r--sys/sparc64/sparc64/vm_machdep.c2
-rw-r--r--sys/sys/_bitset.h2
-rw-r--r--sys/sys/_bus_dma.h2
-rw-r--r--sys/sys/_callout.h2
-rw-r--r--sys/sys/_cpuset.h2
-rw-r--r--sys/sys/_ffcounter.h2
-rw-r--r--sys/sys/_iovec.h2
-rw-r--r--sys/sys/_kstack_cache.h2
-rw-r--r--sys/sys/_lock.h2
-rw-r--r--sys/sys/_lockmgr.h2
-rw-r--r--sys/sys/_mutex.h2
-rw-r--r--sys/sys/_null.h2
-rw-r--r--sys/sys/_pctrie.h4
-rw-r--r--sys/sys/_pthreadtypes.h4
-rw-r--r--sys/sys/_rmlock.h2
-rw-r--r--sys/sys/_rwlock.h2
-rw-r--r--sys/sys/_semaphore.h2
-rw-r--r--sys/sys/_sigset.h2
-rw-r--r--sys/sys/_sockaddr_storage.h2
-rw-r--r--sys/sys/_stack.h4
-rw-r--r--sys/sys/_stdint.h2
-rw-r--r--sys/sys/_sx.h2
-rw-r--r--sys/sys/_task.h2
-rw-r--r--sys/sys/_termios.h2
-rw-r--r--sys/sys/_timespec.h2
-rw-r--r--sys/sys/_timeval.h2
-rw-r--r--sys/sys/_types.h2
-rw-r--r--sys/sys/_umtx.h2
-rw-r--r--sys/sys/_unrhdr.h2
-rw-r--r--sys/sys/aac_ioctl.h2
-rw-r--r--sys/sys/acct.h2
-rw-r--r--sys/sys/acl.h2
-rw-r--r--sys/sys/agpio.h2
-rw-r--r--sys/sys/aio.h2
-rw-r--r--sys/sys/alq.h2
-rw-r--r--sys/sys/assym.h2
-rw-r--r--sys/sys/ata.h2
-rw-r--r--sys/sys/bio.h2
-rw-r--r--sys/sys/bitset.h2
-rw-r--r--sys/sys/bitstring.h2
-rw-r--r--sys/sys/blist.h2
-rw-r--r--sys/sys/boot.h2
-rw-r--r--sys/sys/buf.h2
-rw-r--r--sys/sys/buf_ring.h2
-rw-r--r--sys/sys/bufobj.h2
-rw-r--r--sys/sys/bus.h2
-rw-r--r--sys/sys/bus_dma.h2
-rw-r--r--sys/sys/busdma_bufalloc.h2
-rw-r--r--sys/sys/callout.h2
-rw-r--r--sys/sys/capability.h2
-rw-r--r--sys/sys/caprights.h2
-rw-r--r--sys/sys/cdefs.h2
-rw-r--r--sys/sys/cdrio.h2
-rw-r--r--sys/sys/cfictl.h2
-rw-r--r--sys/sys/chio.h2
-rw-r--r--sys/sys/clock.h2
-rw-r--r--sys/sys/condvar.h2
-rw-r--r--sys/sys/conf.h2
-rw-r--r--sys/sys/cons.h2
-rw-r--r--sys/sys/consio.h2
-rw-r--r--sys/sys/copyright.h17
-rw-r--r--sys/sys/counter.h2
-rw-r--r--sys/sys/cpu.h2
-rw-r--r--sys/sys/cpuctl.h2
-rw-r--r--sys/sys/cpuset.h2
-rw-r--r--sys/sys/ctype.h2
-rw-r--r--sys/sys/devicestat.h2
-rw-r--r--sys/sys/digiio.h2
-rw-r--r--sys/sys/dir.h2
-rw-r--r--sys/sys/dirent.h2
-rw-r--r--sys/sys/disklabel.h2
-rw-r--r--sys/sys/diskmbr.h2
-rw-r--r--sys/sys/dkstat.h2
-rw-r--r--sys/sys/domain.h2
-rw-r--r--sys/sys/dtrace_bsd.h2
-rw-r--r--sys/sys/dvdio.h2
-rw-r--r--sys/sys/elf.h2
-rw-r--r--sys/sys/elf32.h2
-rw-r--r--sys/sys/elf64.h2
-rw-r--r--sys/sys/elf_common.h2
-rw-r--r--sys/sys/elf_generic.h2
-rw-r--r--sys/sys/endian.h2
-rw-r--r--sys/sys/errno.h2
-rw-r--r--sys/sys/eui64.h2
-rw-r--r--sys/sys/event.h2
-rw-r--r--sys/sys/eventhandler.h2
-rw-r--r--sys/sys/eventvar.h2
-rw-r--r--sys/sys/exec.h2
-rw-r--r--sys/sys/extattr.h2
-rw-r--r--sys/sys/fail.h2
-rw-r--r--sys/sys/fbio.h2
-rw-r--r--sys/sys/fcntl.h2
-rw-r--r--sys/sys/fdcio.h2
-rw-r--r--sys/sys/file.h2
-rw-r--r--sys/sys/filedesc.h2
-rw-r--r--sys/sys/filio.h2
-rw-r--r--sys/sys/firmware.h2
-rw-r--r--sys/sys/gmon.h2
-rw-r--r--sys/sys/gpio.h2
-rw-r--r--sys/sys/gpt.h2
-rw-r--r--sys/sys/hash.h2
-rw-r--r--sys/sys/hhook.h2
-rw-r--r--sys/sys/iconv.h2
-rw-r--r--sys/sys/imgact.h2
-rw-r--r--sys/sys/imgact_aout.h2
-rw-r--r--sys/sys/imgact_elf.h2
-rw-r--r--sys/sys/interrupt.h2
-rw-r--r--sys/sys/ioccom.h2
-rw-r--r--sys/sys/ioctl.h2
-rw-r--r--sys/sys/ioctl_compat.h2
-rw-r--r--sys/sys/ipc.h2
-rw-r--r--sys/sys/ipmi.h2
-rw-r--r--sys/sys/jail.h2
-rw-r--r--sys/sys/joystick.h2
-rw-r--r--sys/sys/kdb.h2
-rw-r--r--sys/sys/kenv.h2
-rw-r--r--sys/sys/kernel.h2
-rw-r--r--sys/sys/kerneldump.h2
-rw-r--r--sys/sys/khelp.h2
-rw-r--r--sys/sys/kobj.h2
-rw-r--r--sys/sys/ksem.h2
-rw-r--r--sys/sys/kthread.h2
-rw-r--r--sys/sys/ktr.h2
-rw-r--r--sys/sys/ktr_class.h2
-rw-r--r--sys/sys/ktrace.h2
-rw-r--r--sys/sys/libkern.h2
-rw-r--r--sys/sys/limits.h2
-rw-r--r--sys/sys/link_aout.h2
-rw-r--r--sys/sys/link_elf.h2
-rw-r--r--sys/sys/linker.h2
-rw-r--r--sys/sys/linker_set.h2
-rw-r--r--sys/sys/lock.h2
-rw-r--r--sys/sys/lock_profile.h2
-rw-r--r--sys/sys/lockf.h2
-rw-r--r--sys/sys/lockmgr.h2
-rw-r--r--sys/sys/lockstat.h2
-rw-r--r--sys/sys/loginclass.h2
-rw-r--r--sys/sys/mac.h2
-rw-r--r--sys/sys/malloc.h2
-rw-r--r--sys/sys/mbuf.h2
-rw-r--r--sys/sys/mchain.h2
-rw-r--r--sys/sys/mdioctl.h2
-rw-r--r--sys/sys/memdesc.h2
-rw-r--r--sys/sys/mman.h2
-rw-r--r--sys/sys/module.h2
-rw-r--r--sys/sys/module_khelp.h2
-rw-r--r--sys/sys/mount.h2
-rw-r--r--sys/sys/mpt_ioctl.h2
-rw-r--r--sys/sys/mqueue.h2
-rw-r--r--sys/sys/msg.h2
-rw-r--r--sys/sys/msgbuf.h2
-rw-r--r--sys/sys/mtio.h2
-rw-r--r--sys/sys/mutex.h2
-rw-r--r--sys/sys/namei.h2
-rw-r--r--sys/sys/nlist_aout.h2
-rw-r--r--sys/sys/osd.h2
-rw-r--r--sys/sys/param.h2
-rw-r--r--sys/sys/pciio.h2
-rw-r--r--sys/sys/pcpu.h2
-rw-r--r--sys/sys/pctrie.h4
-rw-r--r--sys/sys/pioctl.h2
-rw-r--r--sys/sys/pmc.h2
-rw-r--r--sys/sys/pmckern.h2
-rw-r--r--sys/sys/pmclog.h2
-rw-r--r--sys/sys/poll.h2
-rw-r--r--sys/sys/posix4.h2
-rw-r--r--sys/sys/power.h2
-rw-r--r--sys/sys/priority.h2
-rw-r--r--sys/sys/priv.h2
-rw-r--r--sys/sys/proc.h2
-rw-r--r--sys/sys/procctl.h2
-rw-r--r--sys/sys/procdesc.h2
-rw-r--r--sys/sys/procfs.h2
-rw-r--r--sys/sys/protosw.h2
-rw-r--r--sys/sys/ptio.h2
-rw-r--r--sys/sys/ptrace.h2
-rw-r--r--sys/sys/queue.h2
-rw-r--r--sys/sys/racct.h2
-rw-r--r--sys/sys/random.h23
-rw-r--r--sys/sys/rangelock.h2
-rw-r--r--sys/sys/rctl.h2
-rw-r--r--sys/sys/reboot.h2
-rw-r--r--sys/sys/refcount.h2
-rw-r--r--sys/sys/regression.h2
-rw-r--r--sys/sys/resource.h2
-rw-r--r--sys/sys/resourcevar.h2
-rw-r--r--sys/sys/rmlock.h2
-rw-r--r--sys/sys/rtprio.h2
-rw-r--r--sys/sys/runq.h2
-rw-r--r--sys/sys/rwlock.h2
-rw-r--r--sys/sys/sbuf.h2
-rw-r--r--sys/sys/sched.h2
-rw-r--r--sys/sys/sdt.h2
-rw-r--r--sys/sys/select.h2
-rw-r--r--sys/sys/selinfo.h2
-rw-r--r--sys/sys/sema.h2
-rw-r--r--sys/sys/serial.h2
-rw-r--r--sys/sys/sf_buf.h2
-rw-r--r--sys/sys/sglist.h2
-rw-r--r--sys/sys/shm.h2
-rw-r--r--sys/sys/sigio.h2
-rw-r--r--sys/sys/signal.h2
-rw-r--r--sys/sys/signalvar.h2
-rw-r--r--sys/sys/sleepqueue.h2
-rw-r--r--sys/sys/slicer.h2
-rw-r--r--sys/sys/snoop.h2
-rw-r--r--sys/sys/sockbuf.h2
-rw-r--r--sys/sys/socket.h2
-rw-r--r--sys/sys/socketvar.h2
-rw-r--r--sys/sys/sockio.h2
-rw-r--r--sys/sys/sockopt.h2
-rw-r--r--sys/sys/stack.h2
-rw-r--r--sys/sys/stat.h2
-rw-r--r--sys/sys/stdatomic.h2
-rw-r--r--sys/sys/stddef.h2
-rw-r--r--sys/sys/stdint.h2
-rw-r--r--sys/sys/sun_disklabel.h2
-rw-r--r--sys/sys/sx.h2
-rw-r--r--sys/sys/syscallsubr.h2
-rw-r--r--sys/sys/sysctl.h2
-rw-r--r--sys/sys/sysent.h2
-rw-r--r--sys/sys/syslimits.h2
-rw-r--r--sys/sys/syslog.h2
-rw-r--r--sys/sys/systm.h2
-rw-r--r--sys/sys/taskqueue.h2
-rw-r--r--sys/sys/terminal.h2
-rw-r--r--sys/sys/thr.h2
-rw-r--r--sys/sys/tiio.h2
-rw-r--r--sys/sys/time.h2
-rw-r--r--sys/sys/timeb.h2
-rw-r--r--sys/sys/timeet.h2
-rw-r--r--sys/sys/timeffc.h2
-rw-r--r--sys/sys/timers.h2
-rw-r--r--sys/sys/times.h2
-rw-r--r--sys/sys/timespec.h2
-rw-r--r--sys/sys/tree.h2
-rw-r--r--sys/sys/tty.h2
-rw-r--r--sys/sys/ttycom.h2
-rw-r--r--sys/sys/ttydefaults.h2
-rw-r--r--sys/sys/ttydevsw.h2
-rw-r--r--sys/sys/ttydisc.h2
-rw-r--r--sys/sys/ttyhook.h2
-rw-r--r--sys/sys/ttyqueue.h2
-rw-r--r--sys/sys/turnstile.h2
-rw-r--r--sys/sys/types.h2
-rw-r--r--sys/sys/ucontext.h2
-rw-r--r--sys/sys/ucred.h2
-rw-r--r--sys/sys/uio.h2
-rw-r--r--sys/sys/umtx.h2
-rw-r--r--sys/sys/un.h2
-rw-r--r--sys/sys/unistd.h2
-rw-r--r--sys/sys/unpcb.h2
-rw-r--r--sys/sys/user.h2
-rw-r--r--sys/sys/utsname.h2
-rw-r--r--sys/sys/uuid.h2
-rw-r--r--sys/sys/vdso.h2
-rw-r--r--sys/sys/vmem.h2
-rw-r--r--sys/sys/vmmeter.h2
-rw-r--r--sys/sys/vnode.h2
-rw-r--r--sys/sys/wait.h2
-rw-r--r--sys/sys/watchdog.h2
-rw-r--r--sys/tools/makeobjops.awk2
-rw-r--r--sys/tools/vnode_if.awk2
-rw-r--r--sys/ufs/ffs/ffs_alloc.c2
-rw-r--r--sys/ufs/ffs/ffs_balloc.c2
-rw-r--r--sys/ufs/ffs/ffs_extern.h2
-rw-r--r--sys/ufs/ffs/ffs_inode.c2
-rw-r--r--sys/ufs/ffs/ffs_subr.c2
-rw-r--r--sys/ufs/ffs/ffs_tables.c2
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c2
-rw-r--r--sys/ufs/ffs/ffs_vnops.c2
-rw-r--r--sys/ufs/ffs/fs.h2
-rw-r--r--sys/ufs/ufs/dir.h2
-rw-r--r--sys/ufs/ufs/inode.h2
-rw-r--r--sys/ufs/ufs/quota.h2
-rw-r--r--sys/ufs/ufs/ufs_bmap.c2
-rw-r--r--sys/ufs/ufs/ufs_extern.h2
-rw-r--r--sys/ufs/ufs/ufs_inode.c2
-rw-r--r--sys/ufs/ufs/ufs_lookup.c2
-rw-r--r--sys/ufs/ufs/ufs_quota.c2
-rw-r--r--sys/ufs/ufs/ufs_vfsops.c2
-rw-r--r--sys/ufs/ufs/ufs_vnops.c2
-rw-r--r--sys/ufs/ufs/ufsmount.h2
-rw-r--r--sys/vm/device_pager.c2
-rw-r--r--sys/vm/pmap.h2
-rw-r--r--sys/vm/swap_pager.c2
-rw-r--r--sys/vm/swap_pager.h2
-rw-r--r--sys/vm/vm.h2
-rw-r--r--sys/vm/vm_extern.h2
-rw-r--r--sys/vm/vm_fault.c2
-rw-r--r--sys/vm/vm_glue.c2
-rw-r--r--sys/vm/vm_init.c2
-rw-r--r--sys/vm/vm_kern.c2
-rw-r--r--sys/vm/vm_kern.h2
-rw-r--r--sys/vm/vm_map.c2
-rw-r--r--sys/vm/vm_map.h2
-rw-r--r--sys/vm/vm_meter.c2
-rw-r--r--sys/vm/vm_mmap.c2
-rw-r--r--sys/vm/vm_object.c2
-rw-r--r--sys/vm/vm_object.h2
-rw-r--r--sys/vm/vm_page.c2
-rw-r--r--sys/vm/vm_page.h2
-rw-r--r--sys/vm/vm_pageout.c2
-rw-r--r--sys/vm/vm_pageout.h2
-rw-r--r--sys/vm/vm_pager.c2
-rw-r--r--sys/vm/vm_pager.h2
-rw-r--r--sys/vm/vm_param.h2
-rw-r--r--sys/vm/vm_unix.c2
-rw-r--r--sys/vm/vnode_pager.c2
-rw-r--r--sys/vm/vnode_pager.h2
-rw-r--r--sys/x86/include/_align.h2
-rw-r--r--sys/x86/include/_limits.h2
-rw-r--r--sys/x86/include/_types.h2
-rw-r--r--sys/x86/include/endian.h2
-rw-r--r--sys/x86/include/float.h2
-rw-r--r--sys/x86/include/frame.h2
-rw-r--r--sys/x86/include/psl.h2
-rw-r--r--sys/x86/include/ptrace.h2
-rw-r--r--sys/x86/include/reg.h2
-rw-r--r--sys/x86/include/segments.h2
-rw-r--r--sys/x86/include/setjmp.h2
-rw-r--r--sys/x86/include/signal.h2
-rw-r--r--sys/x86/include/specialreg.h2
-rw-r--r--sys/x86/include/stdarg.h2
-rw-r--r--sys/x86/include/sysarch.h2
-rw-r--r--sys/x86/include/trap.h2
-rw-r--r--sys/x86/isa/clock.c2
-rw-r--r--sys/x86/isa/icu.h2
-rw-r--r--sys/x86/isa/isa_dma.c2
-rw-r--r--sys/x86/isa/nmi.c2
-rw-r--r--sys/x86/x86/delay.c2
-rw-r--r--sys/x86/x86/msi.c2
-rw-r--r--tools/regression/aio/aiop/aiop.c2
-rw-r--r--tools/regression/p1003_1b/fifo.c4
-rw-r--r--tools/regression/p1003_1b/memlock.c4
-rw-r--r--tools/regression/p1003_1b/p26.c4
-rw-r--r--tools/regression/p1003_1b/sched.c4
-rw-r--r--tools/regression/p1003_1b/yield.c4
-rw-r--r--tools/regression/posixsem/posixsem.c2
-rw-r--r--tools/regression/posixsem/test.c2
-rw-r--r--tools/regression/posixsem/test.h2
-rwxr-xr-xtools/test/hwpmc/pmctest.py2
-rw-r--r--tools/tools/cxgbtool/cxgbtool.c1
-rw-r--r--tools/tools/pirtool/pirtable.h2
-rw-r--r--tools/tools/pirtool/pirtool.c2
-rw-r--r--tools/tools/vxge/vxge_cmn.h2
-rw-r--r--tools/tools/vxge/vxge_info.c2
-rw-r--r--tools/tools/vxge/vxge_info.h2
-rw-r--r--tools/tools/vxge/vxge_log.c2
-rw-r--r--tools/tools/vxge/vxge_log.h2
-rw-r--r--usr.bin/apply/apply.c2
-rw-r--r--usr.bin/ar/ar.c2
-rw-r--r--usr.bin/banner/banner.c4
-rw-r--r--usr.bin/basename/basename.c2
-rw-r--r--usr.bin/biff/biff.c4
-rw-r--r--usr.bin/calendar/calendar.c2
-rw-r--r--usr.bin/calendar/calendar.h2
-rw-r--r--usr.bin/calendar/day.c2
-rw-r--r--usr.bin/calendar/io.c2
-rw-r--r--usr.bin/calendar/locale.c2
-rw-r--r--usr.bin/calendar/pathnames.h2
-rw-r--r--usr.bin/calendar/pom.c4
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c2
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/chpass.h4
-rw-r--r--usr.bin/chpass/edit.c2
-rw-r--r--usr.bin/chpass/field.c4
-rw-r--r--usr.bin/chpass/table.c2
-rw-r--r--usr.bin/chpass/util.c2
-rw-r--r--usr.bin/cksum/cksum.c2
-rw-r--r--usr.bin/cksum/crc.c2
-rw-r--r--usr.bin/cksum/extern.h2
-rw-r--r--usr.bin/cksum/print.c2
-rw-r--r--usr.bin/cksum/sum1.c2
-rw-r--r--usr.bin/cksum/sum2.c2
-rw-r--r--usr.bin/cmp/cmp.c2
-rw-r--r--usr.bin/cmp/extern.h2
-rw-r--r--usr.bin/cmp/misc.c2
-rw-r--r--usr.bin/cmp/regular.c2
-rw-r--r--usr.bin/cmp/special.c2
-rw-r--r--usr.bin/col/col.c2
-rw-r--r--usr.bin/colrm/colrm.c2
-rw-r--r--usr.bin/column/column.c4
-rw-r--r--usr.bin/comm/comm.c4
-rw-r--r--usr.bin/compress/compress.c2
-rw-r--r--usr.bin/compress/zopen.c2
-rw-r--r--usr.bin/ctags/C.c4
-rw-r--r--usr.bin/ctags/ctags.c4
-rw-r--r--usr.bin/ctags/ctags.h4
-rw-r--r--usr.bin/ctags/fortran.c4
-rw-r--r--usr.bin/ctags/lisp.c4
-rw-r--r--usr.bin/ctags/print.c4
-rw-r--r--usr.bin/ctags/tree.c4
-rw-r--r--usr.bin/ctags/yacc.c4
-rw-r--r--usr.bin/cut/cut.c2
-rw-r--r--usr.bin/dirname/dirname.c2
-rw-r--r--usr.bin/du/du.c4
-rw-r--r--usr.bin/env/env.c4
-rw-r--r--usr.bin/expand/expand.c4
-rw-r--r--usr.bin/false/false.c4
-rw-r--r--usr.bin/find/extern.h2
-rw-r--r--usr.bin/find/find.c2
-rw-r--r--usr.bin/find/find.h2
-rw-r--r--usr.bin/find/function.c2
-rw-r--r--usr.bin/find/ls.c4
-rw-r--r--usr.bin/find/main.c2
-rw-r--r--usr.bin/find/misc.c2
-rw-r--r--usr.bin/find/operator.c2
-rw-r--r--usr.bin/find/option.c2
-rw-r--r--usr.bin/finger/extern.h2
-rw-r--r--usr.bin/finger/finger.c4
-rw-r--r--usr.bin/finger/finger.h4
-rw-r--r--usr.bin/finger/lprint.c4
-rw-r--r--usr.bin/finger/net.c4
-rw-r--r--usr.bin/finger/sprint.c4
-rw-r--r--usr.bin/finger/util.c4
-rw-r--r--usr.bin/fold/fold.c2
-rw-r--r--usr.bin/from/from.c4
-rw-r--r--usr.bin/fstat/fstat.c2
-rw-r--r--usr.bin/gcore/extern.h2
-rw-r--r--usr.bin/gcore/gcore.c2
-rw-r--r--usr.bin/gprof/amd64.h2
-rw-r--r--usr.bin/gprof/aout.c2
-rw-r--r--usr.bin/gprof/arcs.c4
-rw-r--r--usr.bin/gprof/arm.h2
-rw-r--r--usr.bin/gprof/dfn.c4
-rw-r--r--usr.bin/gprof/elf.c2
-rw-r--r--usr.bin/gprof/gprof.c4
-rw-r--r--usr.bin/gprof/gprof.h4
-rw-r--r--usr.bin/gprof/hertz.c4
-rw-r--r--usr.bin/gprof/i386.h2
-rw-r--r--usr.bin/gprof/lookup.c4
-rw-r--r--usr.bin/gprof/mips.h2
-rw-r--r--usr.bin/gprof/pathnames.h4
-rw-r--r--usr.bin/gprof/powerpc.h2
-rw-r--r--usr.bin/gprof/printgprof.c4
-rw-r--r--usr.bin/gprof/printlist.c4
-rw-r--r--usr.bin/gprof/sparc64.h2
-rw-r--r--usr.bin/gzip/zuncompress.c2
-rw-r--r--usr.bin/head/head.c2
-rw-r--r--usr.bin/hexdump/conv.c4
-rw-r--r--usr.bin/hexdump/display.c4
-rw-r--r--usr.bin/hexdump/hexdump.c4
-rw-r--r--usr.bin/hexdump/hexdump.h4
-rw-r--r--usr.bin/hexdump/hexsyntax.c2
-rw-r--r--usr.bin/hexdump/odsyntax.c2
-rw-r--r--usr.bin/hexdump/parse.c4
-rw-r--r--usr.bin/id/id.c2
-rw-r--r--usr.bin/indent/args.c2
-rw-r--r--usr.bin/indent/indent.c2
-rw-r--r--usr.bin/indent/indent_codes.h2
-rw-r--r--usr.bin/indent/indent_globs.h2
-rw-r--r--usr.bin/indent/io.c2
-rw-r--r--usr.bin/indent/lexi.c2
-rw-r--r--usr.bin/indent/parse.c2
-rw-r--r--usr.bin/indent/pr_comment.c2
-rw-r--r--usr.bin/join/join.c2
-rw-r--r--usr.bin/jot/jot.c2
-rw-r--r--usr.bin/kdump/kdump.c2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/ktrace/ktrace.h2
-rw-r--r--usr.bin/ktrace/subr.c2
-rw-r--r--usr.bin/lam/lam.c2
-rw-r--r--usr.bin/last/last.c2
-rw-r--r--usr.bin/lastcomm/lastcomm.c2
-rw-r--r--usr.bin/lastcomm/pathnames.h2
-rw-r--r--usr.bin/leave/leave.c2
-rw-r--r--usr.bin/lex/initparse.c2
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c2
-rw-r--r--usr.bin/locate/code/locate.code.c2
-rw-r--r--usr.bin/locate/locate/fastfind.c2
-rw-r--r--usr.bin/locate/locate/locate.c2
-rw-r--r--usr.bin/locate/locate/locate.h2
-rw-r--r--usr.bin/locate/locate/util.c2
-rw-r--r--usr.bin/lock/lock.c4
-rw-r--r--usr.bin/logger/logger.c4
-rw-r--r--usr.bin/login/login.c2
-rw-r--r--usr.bin/login/login_audit.c4
-rw-r--r--usr.bin/login/pathnames.h2
-rw-r--r--usr.bin/logname/logname.c2
-rw-r--r--usr.bin/look/look.c2
-rw-r--r--usr.bin/look/pathnames.h2
-rw-r--r--usr.bin/lorder/lorder.sh2
-rw-r--r--usr.bin/m4/eval.c4
-rw-r--r--usr.bin/m4/extern.h2
-rw-r--r--usr.bin/m4/look.c4
-rw-r--r--usr.bin/m4/main.c2
-rw-r--r--usr.bin/m4/mdef.h4
-rw-r--r--usr.bin/m4/misc.c4
-rw-r--r--usr.bin/m4/pathnames.h4
-rw-r--r--usr.bin/m4/stdd.h2
-rw-r--r--usr.bin/mail/cmd1.c2
-rw-r--r--usr.bin/mail/cmd2.c4
-rw-r--r--usr.bin/mail/cmd3.c4
-rw-r--r--usr.bin/mail/cmdtab.c4
-rw-r--r--usr.bin/mail/collect.c4
-rw-r--r--usr.bin/mail/def.h4
-rw-r--r--usr.bin/mail/edit.c4
-rw-r--r--usr.bin/mail/extern.h2
-rw-r--r--usr.bin/mail/fio.c4
-rw-r--r--usr.bin/mail/getname.c4
-rw-r--r--usr.bin/mail/glob.h4
-rw-r--r--usr.bin/mail/head.c4
-rw-r--r--usr.bin/mail/lex.c4
-rw-r--r--usr.bin/mail/list.c4
-rw-r--r--usr.bin/mail/main.c4
-rw-r--r--usr.bin/mail/names.c4
-rw-r--r--usr.bin/mail/pathnames.h4
-rw-r--r--usr.bin/mail/popen.c4
-rw-r--r--usr.bin/mail/quit.c4
-rw-r--r--usr.bin/mail/rcv.h4
-rw-r--r--usr.bin/mail/send.c4
-rw-r--r--usr.bin/mail/strings.c4
-rw-r--r--usr.bin/mail/temp.c4
-rw-r--r--usr.bin/mail/tty.c4
-rw-r--r--usr.bin/mail/util.c4
-rw-r--r--usr.bin/mail/v7.local.c4
-rw-r--r--usr.bin/mail/vars.c4
-rw-r--r--usr.bin/mail/version.c4
-rw-r--r--usr.bin/mesg/mesg.c4
-rw-r--r--usr.bin/mkdep/mkdep.gcc.sh2
-rw-r--r--usr.bin/mkdep/mkdep.sh2
-rw-r--r--usr.bin/mkfifo/mkfifo.c4
-rw-r--r--usr.bin/mklocale/extern.h2
-rw-r--r--usr.bin/mklocale/ldef.h2
-rw-r--r--usr.bin/mklocale/lex.l2
-rw-r--r--usr.bin/mklocale/yacc.y2
-rw-r--r--usr.bin/mkstr/mkstr.c4
-rw-r--r--usr.bin/msgs/msgs.c2
-rw-r--r--usr.bin/msgs/pathnames.h4
-rw-r--r--usr.bin/mt/mt.c3
-rw-r--r--usr.bin/netstat/if.c2
-rw-r--r--usr.bin/netstat/inet6.c2
-rw-r--r--usr.bin/netstat/ipsec.c2
-rw-r--r--usr.bin/netstat/main.c2
-rw-r--r--usr.bin/netstat/mbuf.c2
-rw-r--r--usr.bin/netstat/mroute.c2
-rw-r--r--usr.bin/netstat/mroute6.c2
-rw-r--r--usr.bin/netstat/netstat.h2
-rw-r--r--usr.bin/netstat/pfkey.c2
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/netstat/sctp.c2
-rw-r--r--usr.bin/netstat/unix.c2
-rw-r--r--usr.bin/nice/nice.c4
-rw-r--r--usr.bin/nohup/nohup.c4
-rw-r--r--usr.bin/pagesize/pagesize.sh2
-rw-r--r--usr.bin/paste/paste.c4
-rw-r--r--usr.bin/patch/mkpath.c2
-rw-r--r--usr.bin/pr/egetopt.c2
-rw-r--r--usr.bin/pr/extern.h2
-rw-r--r--usr.bin/pr/pr.c2
-rw-r--r--usr.bin/pr/pr.h2
-rw-r--r--usr.bin/printenv/printenv.c2
-rw-r--r--usr.bin/printf/printf.c2
-rw-r--r--usr.bin/quota/quota.c2
-rw-r--r--usr.bin/renice/renice.c4
-rw-r--r--usr.bin/rev/rev.c2
-rw-r--r--usr.bin/rs/rs.c2
-rw-r--r--usr.bin/rup/rup.c2
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rusers/rusers.c2
-rw-r--r--usr.bin/rwall/rwall.c4
-rw-r--r--usr.bin/rwho/rwho.c2
-rw-r--r--usr.bin/script/script.c2
-rw-r--r--usr.bin/sed/compile.c2
-rw-r--r--usr.bin/sed/defs.h2
-rw-r--r--usr.bin/sed/extern.h2
-rw-r--r--usr.bin/sed/main.c2
-rw-r--r--usr.bin/sed/misc.c2
-rw-r--r--usr.bin/sed/process.c2
-rw-r--r--usr.bin/shar/shar.sh2
-rw-r--r--usr.bin/showmount/showmount.c4
-rw-r--r--usr.bin/split/split.c4
-rw-r--r--usr.bin/su/su.c4
-rw-r--r--usr.bin/systat/cmds.c2
-rw-r--r--usr.bin/systat/cmdtab.c2
-rw-r--r--usr.bin/systat/devs.c4
-rw-r--r--usr.bin/systat/extern.h2
-rw-r--r--usr.bin/systat/fetch.c2
-rw-r--r--usr.bin/systat/icmp.c2
-rw-r--r--usr.bin/systat/icmp6.c2
-rw-r--r--usr.bin/systat/iostat.c2
-rw-r--r--usr.bin/systat/ip.c2
-rw-r--r--usr.bin/systat/ip6.c2
-rw-r--r--usr.bin/systat/keyboard.c2
-rw-r--r--usr.bin/systat/main.c2
-rw-r--r--usr.bin/systat/netcmds.c2
-rw-r--r--usr.bin/systat/netstat.c2
-rw-r--r--usr.bin/systat/pigs.c2
-rw-r--r--usr.bin/systat/swap.c2
-rw-r--r--usr.bin/systat/systat.h2
-rw-r--r--usr.bin/systat/tcp.c2
-rw-r--r--usr.bin/systat/vmstat.c2
-rw-r--r--usr.bin/tail/extern.h2
-rw-r--r--usr.bin/tail/forward.c2
-rw-r--r--usr.bin/tail/misc.c2
-rw-r--r--usr.bin/tail/read.c2
-rw-r--r--usr.bin/tail/reverse.c2
-rw-r--r--usr.bin/tail/tail.c2
-rw-r--r--usr.bin/talk/ctl.c4
-rw-r--r--usr.bin/talk/ctl_transact.c4
-rw-r--r--usr.bin/talk/display.c4
-rw-r--r--usr.bin/talk/get_addrs.c4
-rw-r--r--usr.bin/talk/get_names.c4
-rw-r--r--usr.bin/talk/init_disp.c4
-rw-r--r--usr.bin/talk/invite.c4
-rw-r--r--usr.bin/talk/io.c4
-rw-r--r--usr.bin/talk/look_up.c4
-rw-r--r--usr.bin/talk/msgs.c4
-rw-r--r--usr.bin/talk/talk.c4
-rw-r--r--usr.bin/talk/talk.h4
-rw-r--r--usr.bin/talk/talk_ctl.h4
-rw-r--r--usr.bin/tcopy/tcopy.c4
-rw-r--r--usr.bin/tee/tee.c4
-rw-r--r--usr.bin/tftp/main.c4
-rw-r--r--usr.bin/tftp/tftp.c4
-rw-r--r--usr.bin/tftp/tftp.h4
-rw-r--r--usr.bin/time/time.c4
-rw-r--r--usr.bin/tip/libacu/biz22.c4
-rw-r--r--usr.bin/tip/libacu/biz31.c4
-rw-r--r--usr.bin/tip/libacu/courier.c4
-rw-r--r--usr.bin/tip/libacu/df.c4
-rw-r--r--usr.bin/tip/libacu/dn11.c4
-rw-r--r--usr.bin/tip/libacu/hayes.c4
-rw-r--r--usr.bin/tip/libacu/t3000.c4
-rw-r--r--usr.bin/tip/libacu/v3451.c4
-rw-r--r--usr.bin/tip/libacu/v831.c4
-rw-r--r--usr.bin/tip/libacu/ventel.c4
-rw-r--r--usr.bin/tip/tip/acu.c4
-rw-r--r--usr.bin/tip/tip/acutab.c4
-rw-r--r--usr.bin/tip/tip/cmds.c4
-rw-r--r--usr.bin/tip/tip/cmdtab.c4
-rw-r--r--usr.bin/tip/tip/cu.c4
-rw-r--r--usr.bin/tip/tip/hunt.c4
-rw-r--r--usr.bin/tip/tip/log.c4
-rw-r--r--usr.bin/tip/tip/partab.c4
-rw-r--r--usr.bin/tip/tip/pathnames.h4
-rw-r--r--usr.bin/tip/tip/remote.c4
-rw-r--r--usr.bin/tip/tip/tip.c4
-rw-r--r--usr.bin/tip/tip/tip.h4
-rw-r--r--usr.bin/tip/tip/tipout.c4
-rw-r--r--usr.bin/tip/tip/uucplock.c4
-rw-r--r--usr.bin/tip/tip/value.c4
-rw-r--r--usr.bin/tip/tip/vars.c4
-rw-r--r--usr.bin/touch/touch.c4
-rw-r--r--usr.bin/tput/clear.sh2
-rw-r--r--usr.bin/tput/tput.c2
-rw-r--r--usr.bin/tr/extern.h2
-rw-r--r--usr.bin/tr/str.c2
-rw-r--r--usr.bin/tr/tr.c4
-rw-r--r--usr.bin/true/true.c4
-rw-r--r--usr.bin/truss/amd64-freebsd.c4
-rw-r--r--usr.bin/truss/amd64-freebsd32.c4
-rw-r--r--usr.bin/truss/amd64-linux.c4
-rw-r--r--usr.bin/truss/amd64-linux32.c4
-rw-r--r--usr.bin/truss/arm-freebsd.c4
-rw-r--r--usr.bin/truss/extern.h4
-rw-r--r--usr.bin/truss/i386-freebsd.c4
-rw-r--r--usr.bin/truss/i386-linux.c4
-rw-r--r--usr.bin/truss/main.c2
-rw-r--r--usr.bin/truss/mips-freebsd.c4
-rw-r--r--usr.bin/truss/setup.c2
-rw-r--r--usr.bin/truss/sparc64-freebsd.c4
-rw-r--r--usr.bin/truss/syscalls.c4
-rw-r--r--usr.bin/tset/extern.h2
-rw-r--r--usr.bin/tset/map.c2
-rw-r--r--usr.bin/tset/misc.c2
-rw-r--r--usr.bin/tset/set.c2
-rw-r--r--usr.bin/tset/term.c2
-rw-r--r--usr.bin/tset/tset.c2
-rw-r--r--usr.bin/tset/wrterm.c2
-rw-r--r--usr.bin/tsort/tsort.c4
-rw-r--r--usr.bin/tty/tty.c4
-rw-r--r--usr.bin/ul/ul.c4
-rw-r--r--usr.bin/uname/uname.c2
-rw-r--r--usr.bin/unexpand/unexpand.c2
-rw-r--r--usr.bin/uniq/uniq.c4
-rw-r--r--usr.bin/uudecode/uudecode.c2
-rw-r--r--usr.bin/uuencode/uuencode.c2
-rw-r--r--usr.bin/vgrind/extern.h4
-rw-r--r--usr.bin/vgrind/pathnames.h4
-rw-r--r--usr.bin/vgrind/regexp.c4
-rw-r--r--usr.bin/vgrind/vfontedpr.c4
-rw-r--r--usr.bin/vgrind/vgrind.sh2
-rw-r--r--usr.bin/vmstat/vmstat.c4
-rw-r--r--usr.bin/w/extern.h2
-rw-r--r--usr.bin/w/pr_time.c2
-rw-r--r--usr.bin/w/proc_compare.c2
-rw-r--r--usr.bin/w/w.c2
-rw-r--r--usr.bin/wall/ttymsg.c4
-rw-r--r--usr.bin/wall/wall.c4
-rw-r--r--usr.bin/wc/wc.c4
-rw-r--r--usr.bin/what/what.c4
-rw-r--r--usr.bin/whois/whois.c2
-rw-r--r--usr.bin/write/write.c4
-rw-r--r--usr.bin/xargs/pathnames.h2
-rw-r--r--usr.bin/xargs/xargs.c2
-rw-r--r--usr.bin/xinstall/xinstall.c4
-rw-r--r--usr.bin/xstr/pathnames.h4
-rw-r--r--usr.bin/xstr/xstr.c4
-rw-r--r--usr.bin/yes/yes.c4
-rw-r--r--usr.sbin/accton/accton.c4
-rw-r--r--usr.sbin/ancontrol/ancontrol.c4
-rw-r--r--usr.sbin/arp/arp.c4
-rw-r--r--usr.sbin/chown/chown.c4
-rw-r--r--usr.sbin/chroot/chroot.c4
-rw-r--r--usr.sbin/config/config.h4
-rw-r--r--usr.sbin/config/config.y4
-rw-r--r--usr.sbin/config/lang.l2
-rw-r--r--usr.sbin/config/main.c4
-rw-r--r--usr.sbin/config/mkheaders.c4
-rw-r--r--usr.sbin/config/mkmakefile.c4
-rw-r--r--usr.sbin/config/mkoptions.c4
-rwxr-xr-xusr.sbin/crashinfo/crashinfo.sh2
-rw-r--r--usr.sbin/dconschat/dconschat.c4
-rw-r--r--usr.sbin/edquota/edquota.c4
-rw-r--r--usr.sbin/edquota/pathnames.h4
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.c4
-rw-r--r--usr.sbin/fwcontrol/fwdv.c4
-rw-r--r--usr.sbin/fwcontrol/fwmpegts.c4
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.c4
-rw-r--r--usr.sbin/ifmcstat/printb.c4
-rw-r--r--usr.sbin/inetd/inetd.c4
-rw-r--r--usr.sbin/inetd/inetd.h4
-rw-r--r--usr.sbin/inetd/pathnames.h4
-rw-r--r--usr.sbin/iostat/iostat.c4
-rw-r--r--usr.sbin/ip6addrctl/ip6addrctl.c4
-rw-r--r--usr.sbin/kgmon/kgmon.c4
-rw-r--r--usr.sbin/kldxref/ef.c4
-rw-r--r--usr.sbin/kldxref/ef_obj.c4
-rw-r--r--usr.sbin/kldxref/kldxref.c4
-rw-r--r--usr.sbin/lpr/common_source/common.c4
-rw-r--r--usr.sbin/lpr/common_source/displayq.c4
-rw-r--r--usr.sbin/lpr/common_source/lp.h4
-rw-r--r--usr.sbin/lpr/common_source/lp.local.h2
-rw-r--r--usr.sbin/lpr/common_source/net.c4
-rw-r--r--usr.sbin/lpr/common_source/pathnames.h4
-rw-r--r--usr.sbin/lpr/common_source/printcap.c4
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c4
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c4
-rw-r--r--usr.sbin/lpr/filters/lpf.c4
-rw-r--r--usr.sbin/lpr/lpc/cmds.c4
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c4
-rw-r--r--usr.sbin/lpr/lpc/extern.h4
-rw-r--r--usr.sbin/lpr/lpc/lpc.c4
-rw-r--r--usr.sbin/lpr/lpc/lpc.h4
-rw-r--r--usr.sbin/lpr/lpd/extern.h4
-rw-r--r--usr.sbin/lpr/lpd/lpd.c4
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c4
-rw-r--r--usr.sbin/lpr/lpd/modes.c2
-rw-r--r--usr.sbin/lpr/lpd/printjob.c4
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c4
-rw-r--r--usr.sbin/lpr/lpq/lpq.c4
-rw-r--r--usr.sbin/lpr/lpr/lpr.c4
-rw-r--r--usr.sbin/lpr/lprm/lprm.c4
-rw-r--r--usr.sbin/lpr/lptest/lptest.c4
-rw-r--r--usr.sbin/lpr/pac/pac.c4
-rw-r--r--usr.sbin/makefs/ffs.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_extern.h2
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c4
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c4
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c4
-rw-r--r--usr.sbin/makefs/ffs/ufs_inode.h4
-rw-r--r--usr.sbin/manctl/manctl.sh2
-rw-r--r--usr.sbin/mld6query/mld6.c4
-rw-r--r--usr.sbin/mountd/mountd.c4
-rw-r--r--usr.sbin/mountd/pathnames.h4
-rw-r--r--usr.sbin/mptutil/mpt_cam.c2
-rw-r--r--usr.sbin/mptutil/mpt_cmd.c2
-rw-r--r--usr.sbin/mptutil/mpt_config.c2
-rw-r--r--usr.sbin/mptutil/mpt_drive.c2
-rw-r--r--usr.sbin/mptutil/mpt_evt.c2
-rw-r--r--usr.sbin/mptutil/mpt_show.c2
-rw-r--r--usr.sbin/mptutil/mpt_volume.c2
-rw-r--r--usr.sbin/mptutil/mptutil.c2
-rw-r--r--usr.sbin/mptutil/mptutil.h2
-rw-r--r--usr.sbin/nandsim/nandsim_rcfile.c2
-rw-r--r--usr.sbin/nandsim/nandsim_rcfile.h4
-rw-r--r--usr.sbin/ndiscvt/inf-parse.y4
-rw-r--r--usr.sbin/ndiscvt/inf-token.l4
-rw-r--r--usr.sbin/ndiscvt/inf.c4
-rw-r--r--usr.sbin/ndiscvt/ndiscvt.c2
-rw-r--r--usr.sbin/ndiscvt/ndisgen.sh2
-rw-r--r--usr.sbin/ndiscvt/windrv_stub.c2
-rw-r--r--usr.sbin/ndp/ndp.c4
-rw-r--r--usr.sbin/nfsd/nfsd.c4
-rw-r--r--usr.sbin/pciconf/cap.c2
-rw-r--r--usr.sbin/pciconf/pciconf.h2
-rw-r--r--usr.sbin/ppp/slcompress.c2
-rw-r--r--usr.sbin/ppp/slcompress.h4
-rw-r--r--usr.sbin/pstat/pstat.c2
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c2
-rw-r--r--usr.sbin/quotaon/quotaon.c4
-rw-r--r--usr.sbin/repquota/repquota.c4
-rw-r--r--usr.sbin/rip6query/rip6query.c4
-rw-r--r--usr.sbin/rmt/rmt.c4
-rw-r--r--usr.sbin/route6d/misc/cksum.c4
-rw-r--r--usr.sbin/route6d/route6d.c4
-rw-r--r--usr.sbin/route6d/route6d.h4
-rw-r--r--usr.sbin/rpc.lockd/lock_proc.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.h4
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c4
-rw-r--r--usr.sbin/rpc.statd/file.c4
-rw-r--r--usr.sbin/rpc.statd/procs.c4
-rw-r--r--usr.sbin/rpc.statd/statd.c4
-rw-r--r--usr.sbin/rpc.statd/statd.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_extern.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbdelete.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbupdate.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_main.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_server.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_extern.h4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_main.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_server.c4
-rw-r--r--usr.sbin/rpcbind/check_bound.c2
-rw-r--r--usr.sbin/rpcbind/pmap_svc.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_stat.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc_4.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc_com.c2
-rw-r--r--usr.sbin/rpcbind/rpcbind.c2
-rw-r--r--usr.sbin/rpcbind/rpcbind.h2
-rw-r--r--usr.sbin/rpcbind/warmstart.c2
-rw-r--r--usr.sbin/rrenumd/lexer.l4
-rw-r--r--usr.sbin/rrenumd/parser.y4
-rw-r--r--usr.sbin/rrenumd/rrenumd.c4
-rw-r--r--usr.sbin/rrenumd/rrenumd.h4
-rw-r--r--usr.sbin/rtadvd/advcap.c4
-rw-r--r--usr.sbin/rtadvd/config.c4
-rw-r--r--usr.sbin/rtadvd/config.h4
-rw-r--r--usr.sbin/rtadvd/if.c4
-rw-r--r--usr.sbin/rtadvd/if.h4
-rw-r--r--usr.sbin/rtadvd/rrenum.c4
-rw-r--r--usr.sbin/rtadvd/rrenum.h4
-rw-r--r--usr.sbin/rtadvd/rtadvd.c4
-rw-r--r--usr.sbin/rtadvd/rtadvd.h4
-rw-r--r--usr.sbin/rtadvd/timer.c4
-rw-r--r--usr.sbin/rtadvd/timer.h4
-rw-r--r--usr.sbin/rtadvd/timer_subr.c4
-rw-r--r--usr.sbin/rtadvd/timer_subr.h4
-rw-r--r--usr.sbin/rtsold/dump.c4
-rw-r--r--usr.sbin/rtsold/if.c4
-rw-r--r--usr.sbin/rtsold/probe.c4
-rw-r--r--usr.sbin/rtsold/rtsock.c4
-rw-r--r--usr.sbin/rtsold/rtsol.c4
-rw-r--r--usr.sbin/rtsold/rtsold.c4
-rw-r--r--usr.sbin/rtsold/rtsold.h4
-rw-r--r--usr.sbin/rwhod/rwhod.c2
-rw-r--r--usr.sbin/setfib/setfib.c4
-rw-r--r--usr.sbin/syslogd/pathnames.h4
-rw-r--r--usr.sbin/syslogd/syslogd.c4
-rw-r--r--usr.sbin/timed/timed/acksend.c2
-rw-r--r--usr.sbin/timed/timed/byteorder.c2
-rw-r--r--usr.sbin/timed/timed/candidate.c2
-rw-r--r--usr.sbin/timed/timed/cksum.c2
-rw-r--r--usr.sbin/timed/timed/correct.c2
-rw-r--r--usr.sbin/timed/timed/extern.h2
-rw-r--r--usr.sbin/timed/timed/globals.h2
-rw-r--r--usr.sbin/timed/timed/master.c2
-rw-r--r--usr.sbin/timed/timed/measure.c2
-rw-r--r--usr.sbin/timed/timed/networkdelta.c2
-rw-r--r--usr.sbin/timed/timed/pathnames.h2
-rw-r--r--usr.sbin/timed/timed/readmsg.c2
-rw-r--r--usr.sbin/timed/timed/slave.c2
-rw-r--r--usr.sbin/timed/timed/timed.c2
-rw-r--r--usr.sbin/timed/timedc/cmds.c2
-rw-r--r--usr.sbin/timed/timedc/cmdtab.c4
-rw-r--r--usr.sbin/timed/timedc/extern.h2
-rw-r--r--usr.sbin/timed/timedc/timedc.c2
-rw-r--r--usr.sbin/timed/timedc/timedc.h2
-rw-r--r--usr.sbin/traceroute6/traceroute6.c4
-rw-r--r--usr.sbin/trpt/trpt.c4
-rw-r--r--usr.sbin/vipw/vipw.c4
-rw-r--r--usr.sbin/wpa/ndis_events/ndis_events.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.h2
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.c4
-rw-r--r--usr.sbin/ypbind/yp_ping.c2
-rw-r--r--usr.sbin/yppush/yppush_main.c4
-rw-r--r--usr.sbin/ypserv/yp_access.c4
-rw-r--r--usr.sbin/ypserv/yp_dblookup.c4
-rw-r--r--usr.sbin/ypserv/yp_dnslookup.c4
-rw-r--r--usr.sbin/ypserv/yp_error.c4
-rw-r--r--usr.sbin/ypserv/yp_extern.h4
-rw-r--r--usr.sbin/ypserv/yp_main.c4
-rw-r--r--usr.sbin/ypserv/yp_server.c4
-rw-r--r--usr.sbin/ypserv/yp_svc_udp.c4
6816 files changed, 1964 insertions, 15649 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 158a71cd61d3..7a80cf884448 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 0880393d204b..2029ac5d7703 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index ae0291b411d5..a6f625b11e68 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index ea945fb4a020..11e36333c827 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index 68b9389afb2a..f8c20daa893e 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index a858080812c6..11a35682c7f5 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/date/date.c b/bin/date/date.c
index 9dbdb1b688e8..c3919012bc18 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1987, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 3283b3f37ae8..91aeab2e07e1 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 7ca010edfffe..e506e6d0ec18 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 9da26765b2a6..40aff559de48 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index ebde38afd83c..2ffba1eaaa0b 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index af7500d93801..ce585dfe97f8 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 90ac2415ad54..94199e77c687 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ae07d926c461..196f804c2ebe 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 85d383ab43f3..25440ca12881 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index d39b4fc9c1ce..ea0f8d3d6430 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/dd/position.c b/bin/dd/position.c
index d2146a343529..50542955322d 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/df/df.c b/bin/df/df.c
index d79b39b77735..c8be0ede914f 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 29c151e32e08..da3e607c0e14 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 373416ed6403..68ff581f8475 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 468d72c408db..b59778be6723 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,7 +1,5 @@
/* cbc.c: This file contains the encryption routines for the ed line editor */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 8a9833ba36b5..85b692eccdc4 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 4ea1ab0c23c5..c0ee194d57d9 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index f036022a00da..ef8d5320c77a 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index aa7ef78589a5..a2e46ff24204 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 9c6179474fc7..e4b50596a23d 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index c1e1205913c0..91ef9ea4e15a 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index bf38fe84f855..e4867775b02b 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 90276362ce5b..12ca80276e53 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ls/util.c b/bin/ls/util.c
index b22b92dabce9..b75cbec5f4fb 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 384a0b3c6ee7..ea192092b19d 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 6346acebbedc..9a300e6f0e34 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 245909387800..57aa46d92e1c 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 19a204833734..bcab2fce24cb 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index bedb0e8b0930..40affa5c0f5e 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index f0249179e917..f6e52b49378e 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 10624071e12b..36d59ca7b12c 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 821ed2038697..f385a5988313 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index d33a06985206..1cac0d71918d 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 7ecc6f42841f..dc99e643b140 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 9842a1929469..f18227e40b6a 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 8e26ee9ce96e..9e07882a96b1 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 3c6d08131ae5..4538977754e4 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index a193d25c323c..0e2a1e8bf261 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 884cfde027c4..094b47eeb19b 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/options.h b/bin/pax/options.h
index 8a4cb90a6256..948e012671e8 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index c243e6151407..516519e208f0 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index 3332c5826fd2..0eedd679caae 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 19bc6f3e9097..4e97610e954a 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 9fcef2db80f2..c80ae7e0e11d 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index b666ac34c898..e9cc759e2403 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index f731e137a9cf..eed4641a17d5 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 5351648fb595..69273fe98827 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index dbaa0f5f8e0e..ba59f913e7ab 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 53197c7e0933..32bdd6e1ad0e 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 44457fdea0e0..df36360adfc6 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index a27e37f87911..b63da86eb8db 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index f916f8303336..4ef5b7ec3f52 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 8e24e0d90d2f..4db6b8d1d33f 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index d81453c274d8..c9478abdc3d9 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f9add123985c..f5e600b83959 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 1105832b022a..d11b52081853 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 07ca6352e451..80729bc97460 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 2b70797ba4da..613871af182e 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index d4fbbb443785..4baf3aa9e3be 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index bc7203b8e010..a2ae06bc723e 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 41ca1d062f62..8b9ab6b6ae5e 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 504ec1893a76..f81aaab04d6b 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index aaad9d88d553..a530ab78b2a5 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 9f9ae39957ce..457a4c7aefc8 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index 47e3c56b71c4..f88324c628bd 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 790cc987be31..08f234e5ee5f 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/main.h b/bin/sh/main.h
index e67b0f3343eb..3c48e330218a 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 3720a3fb4cd9..a04020f80c97 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index bb36193c1969..e8df7cb1c0b9 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 1d4cc890be03..c9dffa9ba36f 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index dc94987b0a0a..1667d7740671 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 0915288c80ec..1f81828e5a69 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index ace27099fb2e..e31276daf4b0 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 309dfc2239ea..19de78d9fd5d 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 96022ed8555d..919fc867e7cf 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 33b7b2435483..340d7e0b30ea 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 08a9f39e8844..8c83acf46e5b 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 637f4d1eb669..39b722fdba23 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/output.h b/bin/sh/output.h
index 560f97a2fc5c..51974d8d0450 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 788d60a10ab8..1297748600b8 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 1f49e34e7547..0c3cd88601ab 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 954ce23e55eb..0a7aa96fb601 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 3abacef1da61..ad44c4eddd8c 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index ec0dd8d63463..679efc7b1619 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 0722624eed35..db18ae9701b3 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 8a6bf3f9e819..4528fb19a41c 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index bcea9a3532f6..8bfebc19ec96 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index bada6b4419d5..a27283926997 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 88ef6f16337b..882db9efdc87 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/bin/sh/var.h b/bin/sh/var.h
index fb1264beecec..ede13cf44c7e 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/_ctype.h b/include/_ctype.h
index 96fbaeba00d6..8a43409e0aa0 100644
--- a/include/_ctype.h
+++ b/include/_ctype.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/a.out.h b/include/a.out.h
index d532d062cacf..23f80aa79f64 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/ar.h b/include/ar.h
index 01a57a57d785..aa5fac210289 100644
--- a/include/ar.h
+++ b/include/ar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h
index 5ba431529404..081c037ecb30 100644
--- a/include/arpa/ftp.h
+++ b/include/arpa/ftp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 854d720e5812..1078521c47fd 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* ++Copyright++ 1983, 1993
* -
* Copyright (c) 1983, 1993
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index f0e3482a8d24..ef47b204d56e 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -15,9 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index a9981494c050..eeea8eceda24 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -1,7 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 1983, 1989
+/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index 855b3d26f9cf..758e9b83451e 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index 50147137db15..20733ec69e1a 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/assert.h b/include/assert.h
index 702e231603e6..c880a782b963 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/bitstring.h b/include/bitstring.h
index b179880f1e42..6dc91d575c8e 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/include/complex.h b/include/complex.h
index 2ed38253dec1..4811255ae384 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2011 The FreeBSD Project.
* All rights reserved.
*
diff --git a/include/cpio.h b/include/cpio.h
index 9cbd44e16522..e1d27ce5d2d9 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/ctype.h b/include/ctype.h
index 13173139777b..0ca422c26337 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/db.h b/include/db.h
index 13fa91d68048..4d04db41e8eb 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/dirent.h b/include/dirent.h
index 0472a0168e01..1ab949ccb378 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 76a7fa02ed74..c5088431e651 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/elf-hints.h b/include/elf-hints.h
index 679cc34e249e..e009074a98e7 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 John D. Polstra.
* All rights reserved.
*
diff --git a/include/elf.h b/include/elf.h
index f230ae729fea..c094a1c78837 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
*
diff --git a/include/err.h b/include/err.h
index 7f0971b2a6df..b0e312160f87 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
index 1251c95d489d..307c844c388b 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 34485381abf7..e6403a54ed35 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/fstab.h b/include/fstab.h
index 364d132bc4c8..9b80f733cc41 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/fts.h b/include/fts.h
index 6f4674e4a76e..f453e2b86526 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/getopt.h b/include/getopt.h
index 789b4d1d434c..445194128c68 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/glob.h b/include/glob.h
index 80d78a219444..073805bc083b 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/grp.h b/include/grp.h
index 5ffc45de1d95..b10fd0f8ad36 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/hesiod.h b/include/hesiod.h
index 5879632e09bc..2c29294cc993 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -3,8 +3,6 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/iconv.h b/include/iconv.h
index 338ca1544d8a..51f060353f28 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -2,8 +2,6 @@
/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2003 Citrus Project,
* Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/include/inttypes.h b/include/inttypes.h
index adf74e5a3e9d..510939680f10 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/iso646.h b/include/iso646.h
index a2ab46abf4e0..a11101e525ce 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Alex Nash
* All rights reserved.
*
diff --git a/include/kenv.h b/include/kenv.h
index 0f5e8a92fa27..90af9298f366 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/langinfo.h b/include/langinfo.h
index 87273072a905..46e38c724715 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/libgen.h b/include/libgen.h
index f5a8f18edb0e..28c0067a27d2 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,9 +1,7 @@
/* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/include/limits.h b/include/limits.h
index 274c755d0e1c..a1e1b9820821 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/link.h b/include/link.h
index 60f6bd69add7..f95bbe8872a4 100644
--- a/include/link.h
+++ b/include/link.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/include/locale.h b/include/locale.h
index de8e03ade5c8..0edc3eab716d 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/malloc_np.h b/include/malloc_np.h
index 270bd0f9aec1..88919a448666 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
* All rights reserved.
*
diff --git a/include/memory.h b/include/memory.h
index dd0c63ac73b2..fb670d4fe1d4 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh
index cf7d55a43697..e9c6772724df 100755
--- a/include/mk-osreldate.sh
+++ b/include/mk-osreldate.sh
@@ -1,6 +1,4 @@
#!/bin/sh -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
-#
# Copyright (c) 2013 Garrett Cooper
# All rights reserved.
#
diff --git a/include/monetary.h b/include/monetary.h
index d7b381b82042..bca607a0478f 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/mpool.h b/include/mpool.h
index 2c6866020e7c..3f22ab788409 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/mqueue.h b/include/mqueue.h
index 987cf0bd4e23..e1c0f27ddcbb 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/include/ndbm.h b/include/ndbm.h
index 2188314746f5..db838031a172 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/netdb.h b/include/netdb.h
index 9d81d9439fb5..0d9cb4e6d872 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/nl_types.h b/include/nl_types.h
index bf88144aefd4..c9da68ea9ba3 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,8 +1,6 @@
/* $NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/nlist.h b/include/nlist.h
index 5ea6f5ea555e..a4965fd96952 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/nss.h b/include/nss.h
index 0cc155a0393c..1f4d078b1c3b 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/include/nsswitch.h b/include/nsswitch.h
index f7131292dd78..1a97cea81b7f 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/paths.h b/include/paths.h
index f8df80518c5c..709e96d008b1 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/printf.h b/include/printf.h
index 2a643f94c657..c12c3ebf4ec3 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/include/proc_service.h b/include/proc_service.h
index 3b12ff949460..c9e6f27b4ef7 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 65df37af6996..93552923f818 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index dab9bba56617..bf1604549c66 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index f598ec7a7ac3..49191a2cb707 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index f8b74b9c6981..3b2f0de6654e 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index de4243c576fe..d26b4a23980d 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/pthread.h b/include/pthread.h
index 24b2b5bb4a26..33267c1f6ebf 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
* Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
* All rights reserved.
diff --git a/include/pthread_np.h b/include/pthread_np.h
index 9c32540368b0..1a2dbe9581fb 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/include/pwd.h b/include/pwd.h
index 1548400b7eb8..2099e33891a4 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/ranlib.h b/include/ranlib.h
index cdba75f9f6f3..dd376b4d8a59 100644
--- a/include/ranlib.h
+++ b/include/ranlib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/regex.h b/include/regex.h
index 6b0838a9bd97..e8b185cac9a5 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Henry Spencer.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/include/resolv.h b/include/resolv.h
index 1f4a9bc8d6de..e3d4fd12a097 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1995-2003 Internet Software Consortium.
*
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index bf0d76c046c6..5503762bb22d 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index 3b860d8c7ac3..58b34d776d7a 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,8 +1,6 @@
/* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 29b09d507006..b6c5ae100e60 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 6d1fc315a18d..fa47e8ba9452 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 8d9ce1eccb09..66533e24a7e1 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,8 +1,6 @@
/* $NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index c16609bb6aac..6536a4bb16a5 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/des.h b/include/rpc/des.h
index 93698cce6cbc..9400ccdfacb2 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,8 +1,6 @@
/* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index ef938c5cc900..af33e9d670da 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -6,8 +6,6 @@
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 39c1f76970fb..3ded892865d0 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 465cb0c02623..e8314f6064c2 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index f69bad9ca1a7..d880c40d8492 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 791b3f486bc2..21eb5d1bf44c 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index b56b9026d93f..a5c7d9352bcc 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 561437c30943..e7a3dc8df1c5 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index dd331e2601f6..0996efc02bf9 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 136b617f58e8..6e8d0745a0b9 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index b642aacd6a57..455278723ac0 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 15c4ae4d00a6..c1650fa4ca79 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcsec_gss.h b/include/rpc/rpcsec_gss.h
index 2878ae04b70d..ccd346fd4564 100644
--- a/include/rpc/rpcsec_gss.h
+++ b/include/rpc/rpcsec_gss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 912d26ba4461..53b1815bd0b0 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index e9b6cd4be4f3..87b8efe74d95 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index d9f3012c4f06..313176ea8a66 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 912e2ec2df1f..311c8322f83d 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ad1672cd1db8..93f1ee493b46 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,8 +1,6 @@
/* $NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpcsvc/nis_tags.h b/include/rpcsvc/nis_tags.h
index 55920a0297fd..7ee630e6db24 100644
--- a/include/rpcsvc/nis_tags.h
+++ b/include/rpcsvc/nis_tags.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index dd73adfb276e..10d582891486 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index c0a0a46e1851..abde97c3efeb 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/include/runetype.h b/include/runetype.h
index 91f045c32a59..6aad915b5604 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/semaphore.h b/include/semaphore.h
index f330d5142058..110f7c865df0 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
*
* All rights reserved.
diff --git a/include/setjmp.h b/include/setjmp.h
index 1cc8b7762499..598e07a77bc4 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/signal.h b/include/signal.h
index 56d1b82e87a9..f9b6923c4345 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/spawn.h b/include/spawn.h
index 79753bba0510..7889d0e10246 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stab.h b/include/stab.h
index 9abff130ff7d..649bb421f8cb 100644
--- a/include/stab.h
+++ b/include/stab.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/stdalign.h b/include/stdalign.h
index 6f777fde3df5..2fb13aa3f849 100644
--- a/include/stdalign.h
+++ b/include/stdalign.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stdbool.h b/include/stdbool.h
index 267e1ad2a1a0..48070c18dfc0 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stddef.h b/include/stddef.h
index a52e6d312f84..4916e80756f5 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/stdio.h b/include/stdio.h
index e792bfc5ad7c..1ff9acafc568 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/stdlib.h b/include/stdlib.h
index 48ec9f234fc4..1e94672a94fa 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/stdnoreturn.h b/include/stdnoreturn.h
index e8fc7dca71b3..218a3a0ad111 100644
--- a/include/stdnoreturn.h
+++ b/include/stdnoreturn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/string.h b/include/string.h
index 3c5cceaeb857..21698c309534 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/stringlist.h b/include/stringlist.h
index b570e631b526..7222b31c36e3 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -1,8 +1,6 @@
/* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
*
diff --git a/include/strings.h b/include/strings.h
index 9df19e4ce9ce..2210df04f0d4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/sysexits.h b/include/sysexits.h
index 5e414f24ce8d..e52bb5be95b3 100644
--- a/include/sysexits.h
+++ b/include/sysexits.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/tar.h b/include/tar.h
index 3d54476520e6..f9da49a10d28 100644
--- a/include/tar.h
+++ b/include/tar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/termios.h b/include/termios.h
index ce31d447f60a..333ab1cd6cc5 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/tgmath.h b/include/tgmath.h
index bf7a61c5f320..7f4de6f3fa6e 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder.
* All rights reserved.
*
diff --git a/include/time.h b/include/time.h
index cacb7f2f26e4..54c7e490473c 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/timeconv.h b/include/timeconv.h
index 1298cc238e57..147db1509345 100644
--- a/include/timeconv.h
+++ b/include/timeconv.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/timers.h b/include/timers.h
index 20f95759e26b..73180f9c75e1 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -1,6 +1,4 @@
/* ==== timers.h ============================================================
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.
*
diff --git a/include/ttyent.h b/include/ttyent.h
index 4699d0033a1a..f2220ad73b94 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/uchar.h b/include/uchar.h
index a84a58b3a2dd..a3fd4fd0195e 100644
--- a/include/uchar.h
+++ b/include/uchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/ulimit.h b/include/ulimit.h
index 2579a5201518..ffc40671ea0f 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
*
diff --git a/include/unistd.h b/include/unistd.h
index 93fe2fdd8cc8..fc310646654d 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/utime.h b/include/utime.h
index ec1d28b93e31..619c5db627ba 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/utmpx.h b/include/utmpx.h
index b71d9638d81e..22707e4d3681 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/uuid.h b/include/uuid.h
index 8056acaf7157..79ab76b3b294 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/include/varargs.h b/include/varargs.h
index 930beca37231..51a9b595c54b 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alexander Kabaev
* All rights reserved.
*
diff --git a/include/wchar.h b/include/wchar.h
index 5951a2c7cc65..26d257ac8b4d 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/include/wctype.h b/include/wctype.h
index 5882615ce048..f176739e101f 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/include/wordexp.h b/include/wordexp.h
index bda6ff542fb7..b86e6f9e34b7 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/include/xlocale.h b/include/xlocale.h
index 647c43b315c9..cdeff3edddf8 100644
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h
index bf4da73f58bd..25a9c723c964 100644
--- a/include/xlocale/_ctype.h
+++ b/include/xlocale/_ctype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h
index 2617f5ef17d7..58e434ecf3d5 100644
--- a/include/xlocale/_inttypes.h
+++ b/include/xlocale/_inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_langinfo.h b/include/xlocale/_langinfo.h
index 0d44394dff23..e4f8c50a27a3 100644
--- a/include/xlocale/_langinfo.h
+++ b/include/xlocale/_langinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_locale.h b/include/xlocale/_locale.h
index d48ccf45566b..2b4387bb4845 100644
--- a/include/xlocale/_locale.h
+++ b/include/xlocale/_locale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_monetary.h b/include/xlocale/_monetary.h
index 3cfc86b1f1a7..3481278acf01 100644
--- a/include/xlocale/_monetary.h
+++ b/include/xlocale/_monetary.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_stdio.h b/include/xlocale/_stdio.h
index 2d4f6f5e2423..0aebdcf97bf8 100644
--- a/include/xlocale/_stdio.h
+++ b/include/xlocale/_stdio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_stdlib.h b/include/xlocale/_stdlib.h
index 4b7e27db6c5b..35a2580d4157 100644
--- a/include/xlocale/_stdlib.h
+++ b/include/xlocale/_stdlib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h
index 7fdad7562860..a7c146efc928 100644
--- a/include/xlocale/_string.h
+++ b/include/xlocale/_string.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_time.h b/include/xlocale/_time.h
index 4b47b1aea1ff..4493fdd449b5 100644
--- a/include/xlocale/_time.h
+++ b/include/xlocale/_time.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_uchar.h b/include/xlocale/_uchar.h
index 0c6ed09373f2..4256c874359d 100644
--- a/include/xlocale/_uchar.h
+++ b/include/xlocale/_uchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h
index 3a7261354f84..6b02d05c96d2 100644
--- a/include/xlocale/_wchar.h
+++ b/include/xlocale/_wchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c
index a6001b2d5851..c4f07e052ed7 100644
--- a/lib/csu/amd64/crt1.c
+++ b/lib/csu/amd64/crt1.c
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/lib/csu/arm/crt1.c b/lib/csu/arm/crt1.c
index c46c44be0702..5dec5e5f1da1 100644
--- a/lib/csu/arm/crt1.c
+++ b/lib/csu/arm/crt1.c
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index fcdb824cf749..04df686ba731 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2000 David E. O'Brien, John D. Polstra.
* All rights reserved.
*
diff --git a/lib/csu/common/ignore_init.c b/lib/csu/common/ignore_init.c
index 184bcbdf5447..89b3734ae079 100644
--- a/lib/csu/common/ignore_init.c
+++ b/lib/csu/common/ignore_init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/csu/common/notes.h b/lib/csu/common/notes.h
index aeb5203d8dc1..b2c53bf0351c 100644
--- a/lib/csu/common/notes.h
+++ b/lib/csu/common/notes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/csu/mips/crt1.c b/lib/csu/mips/crt1.c
index 0f7fe1433ed3..4030ce069c0e 100644
--- a/lib/csu/mips/crt1.c
+++ b/lib/csu/mips/crt1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
* Copyright (c) 1995 Christopher G. Demetriou
diff --git a/lib/csu/powerpc/crt1.c b/lib/csu/powerpc/crt1.c
index a8e6d684e20d..4e41bf7472aa 100644
--- a/lib/csu/powerpc/crt1.c
+++ b/lib/csu/powerpc/crt1.c
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
diff --git a/lib/csu/powerpc64/crt1.c b/lib/csu/powerpc64/crt1.c
index 698130148bc8..3ae52501c496 100644
--- a/lib/csu/powerpc64/crt1.c
+++ b/lib/csu/powerpc64/crt1.c
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
diff --git a/lib/csu/sparc64/crt1.c b/lib/csu/sparc64/crt1.c
index 4cef03f60efd..35132b8c72ac 100644
--- a/lib/csu/sparc64/crt1.c
+++ b/lib/csu/sparc64/crt1.c
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright (c) 1995, 1998 Berkeley Software Design, Inc.
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 99f50150605e..a5bb014e4bef 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
*
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index b9ab5cba990e..ad62a8739ab5 100644
--- a/lib/libbluetooth/bluetooth.c
+++ b/lib/libbluetooth/bluetooth.c
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libbluetooth/bluetooth.h b/lib/libbluetooth/bluetooth.h
index d03cfc37807f..451606bec414 100644
--- a/lib/libbluetooth/bluetooth.h
+++ b/lib/libbluetooth/bluetooth.h
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libbluetooth/dev.c b/lib/libbluetooth/dev.c
index b4c5e47ee392..a6295dd2b1f0 100644
--- a/lib/libbluetooth/dev.c
+++ b/lib/libbluetooth/dev.c
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libbluetooth/hci.c b/lib/libbluetooth/hci.c
index 9f0bdbe75969..651c0dda1fe7 100644
--- a/lib/libbluetooth/hci.c
+++ b/lib/libbluetooth/hci.c
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libbsdstat/bsdstat.c b/lib/libbsdstat/bsdstat.c
index 2e6eb25bfd8a..564020eee56a 100644
--- a/lib/libbsdstat/bsdstat.c
+++ b/lib/libbsdstat/bsdstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/lib/libbsdstat/bsdstat.h b/lib/libbsdstat/bsdstat.h
index 89e231a84983..ef972108d09e 100644
--- a/lib/libbsdstat/bsdstat.h
+++ b/lib/libbsdstat/bsdstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index b0fad0a94cb6..3d9108e062af 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/amd64/_fpmath.h b/lib/libc/amd64/_fpmath.h
index 8be7b7dbaf7d..c2a73848d6a1 100644
--- a/lib/libc/amd64/_fpmath.h
+++ b/lib/libc/amd64/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/amd64/gen/_set_tp.c b/lib/libc/amd64/gen/_set_tp.c
index 6e3a4c07499b..d5526fa51c01 100644
--- a/lib/libc/amd64/gen/_set_tp.c
+++ b/lib/libc/amd64/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/amd64/gen/getcontextx.c b/lib/libc/amd64/gen/getcontextx.c
index a109bfe738a6..749bfbda0c51 100644
--- a/lib/libc/amd64/gen/getcontextx.c
+++ b/lib/libc/amd64/gen/getcontextx.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/amd64/gen/makecontext.c b/lib/libc/amd64/gen/makecontext.c
index 720b48b6a97d..15f10b50ded4 100644
--- a/lib/libc/amd64/gen/makecontext.c
+++ b/lib/libc/amd64/gen/makecontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/lib/libc/amd64/gen/signalcontext.c b/lib/libc/amd64/gen/signalcontext.c
index a489a14b3012..1a2621aa7229 100644
--- a/lib/libc/amd64/gen/signalcontext.c
+++ b/lib/libc/amd64/gen/signalcontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/lib/libc/amd64/string/strcpy.c b/lib/libc/amd64/string/strcpy.c
index df1facefb105..11a24eb2cf3a 100644
--- a/lib/libc/amd64/string/strcpy.c
+++ b/lib/libc/amd64/string/strcpy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright 2011 George V. Neville-Neil. All rights reserved.
*
* The compilation of software known as FreeBSD is distributed under the
diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/amd64/sys/amd64_get_fsbase.c
index f2c9a1a0583e..afe1e7a81521 100644
--- a/lib/libc/amd64/sys/amd64_get_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_fsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/amd64/sys/amd64_get_gsbase.c
index 7c7b89eca6a5..2e4fa114b585 100644
--- a/lib/libc/amd64/sys/amd64_get_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_gsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/amd64/sys/amd64_set_fsbase.c
index ef6151d86741..be43b4f895b8 100644
--- a/lib/libc/amd64/sys/amd64_set_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_fsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/amd64/sys/amd64_set_gsbase.c
index 2f2bd30c38ab..da9b830a9691 100644
--- a/lib/libc/amd64/sys/amd64_set_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_gsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h
index 8a3225fa6df5..117308786ff3 100644
--- a/lib/libc/arm/SYS.h
+++ b/lib/libc/arm/SYS.h
@@ -1,8 +1,6 @@
/* $NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/arm/_fpmath.h b/lib/libc/arm/_fpmath.h
index f5ae2f95ad28..28bcb4b4ffde 100644
--- a/lib/libc/arm/_fpmath.h
+++ b/lib/libc/arm/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/arm/aeabi/aeabi_atexit.c b/lib/libc/arm/aeabi/aeabi_atexit.c
index a33ca8f78af4..8502595385df 100644
--- a/lib/libc/arm/aeabi/aeabi_atexit.c
+++ b/lib/libc/arm/aeabi/aeabi_atexit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
*
diff --git a/lib/libc/arm/aeabi/aeabi_double.c b/lib/libc/arm/aeabi/aeabi_double.c
index 0ec3e625c25c..a69e8a74b3cc 100644
--- a/lib/libc/arm/aeabi/aeabi_double.c
+++ b/lib/libc/arm/aeabi/aeabi_double.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
*
diff --git a/lib/libc/arm/aeabi/aeabi_float.c b/lib/libc/arm/aeabi/aeabi_float.c
index 62f78495e844..2e93594c2105 100644
--- a/lib/libc/arm/aeabi/aeabi_float.c
+++ b/lib/libc/arm/aeabi/aeabi_float.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
*
diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
index 78b77c351cdb..c07cbbde275b 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011 Andrew Turner
* All rights reserved.
*
diff --git a/lib/libc/arm/gen/_set_tp.c b/lib/libc/arm/gen/_set_tp.c
index d0801d7444ba..2332f599a919 100644
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c
index 4dabe6743c9f..9def8c8dfbcb 100644
--- a/lib/libc/arm/gen/arm_initfini.c
+++ b/lib/libc/arm/gen/arm_initfini.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* Copyright (c) 2013 Andrew Turner
* All rights reserved.
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index 6730a6746289..8bb15025aead 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -1,8 +1,6 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/arm/gen/flt_rounds.c b/lib/libc/arm/gen/flt_rounds.c
index 17ca3fb9aa90..86509d233231 100644
--- a/lib/libc/arm/gen/flt_rounds.c
+++ b/lib/libc/arm/gen/flt_rounds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ian Lepore <freebsd@damnhippie.dyndns.org>
* All rights reserved.
*
diff --git a/lib/libc/arm/gen/getcontextx.c b/lib/libc/arm/gen/getcontextx.c
index 38a9a8abfe11..3092e2818e92 100644
--- a/lib/libc/arm/gen/getcontextx.c
+++ b/lib/libc/arm/gen/getcontextx.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2017 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index 421cf0dd3ed2..4b0f92d78f77 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -1,8 +1,6 @@
/* $NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index 7d17733c3c2c..bb9a54dbe115 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
*
diff --git a/lib/libc/arm/sys/__vdso_gettc.c b/lib/libc/arm/sys/__vdso_gettc.c
index eff19118185b..9f8631df5806 100644
--- a/lib/libc/arm/sys/__vdso_gettc.c
+++ b/lib/libc/arm/sys/__vdso_gettc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015 The FreeBSD Foundation
*
* This software was developed by Konstantin Belousov
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 51877c1b9072..983ff928bc0b 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
index a2a6533de58d..6c33850014de 100644
--- a/lib/libc/compat-43/gethostid.c
+++ b/lib/libc/compat-43/gethostid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index cf5dc2b11a74..98fceaff2a48 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index 517110a0aa97..a8e36ae2b795 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
index a398eb8f29e1..95c833343ba9 100644
--- a/lib/libc/compat-43/sethostid.c
+++ b/lib/libc/compat-43/sethostid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 0e716b24fc36..39713d2966eb 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index 1d3f30e39b69..f006c76b6993 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index 938e7548f03e..33c9db13da34 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 6f0d89158e96..08484765397f 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 467d3d42139c..f1e7c8ddef06 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index f24316cd82c2..ba4a38bf853c 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index 50c8740e98f9..dc8b83dbefa4 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index 9e300eb46f18..aa191b692291 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
index 7f52396909d2..77fae309ae66 100644
--- a/lib/libc/db/btree/bt_get.c
+++ b/lib/libc/db/btree/bt_get.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 9be2072dcaf1..640a6699a4d8 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
index defe9e1d55be..266d59990cac 100644
--- a/lib/libc/db/btree/bt_overflow.c
+++ b/lib/libc/db/btree/bt_overflow.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index 5cdb10e1974d..ab5e359742ca 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index c11d1fe974ae..d4bc3aa3b09d 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index 56a0c21bd628..15ef1fa81af2 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index b9c695beab4d..19289512a3cb 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index fa5bee0ee6de..fc7ddedac0df 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index e574e4d0b389..92b76baa30f4 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 8b84dd1db1f0..a1766dc3dce4 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index 2704b0fc1027..0abd594cacc8 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
index bb4a21c088b7..b01ae08f37fd 100644
--- a/lib/libc/db/db/db.c
+++ b/lib/libc/db/db/db.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index 7f5e55eae4c8..c75c0ac66fc4 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 0c00fe9b519e..c7dc4e78b595 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index a8e0b75865f6..663ecdd10f8f 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 03f8d8663342..c1914a521833 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index f8e18d0712e4..5c62a2c36eaf 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index d1fac6dbcf87..db32a75b7286 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index 942c326d3801..0586aa728ec3 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index ff591a03ac53..ec2d184fe23b 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index accd8bbb81b0..1a02d005e8c3 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 6770d2c7f184..6959fe87eeb7 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/mpool/mpool-compat.c b/lib/libc/db/mpool/mpool-compat.c
index e335b422d071..9df76ff0b5d2 100644
--- a/lib/libc/db/mpool/mpool-compat.c
+++ b/lib/libc/db/mpool/mpool-compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Xin LI <delphij@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index e36e1e917616..c3a19e06a636 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index ac587870e6d5..53916bd4861a 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index 29f2629485f2..2d1ff846c4b0 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index 17a4d917410b..d799da282ceb 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
index de62041a0a4c..b543d478b8f0 100644
--- a/lib/libc/db/recno/rec_get.c
+++ b/lib/libc/db/recno/rec_get.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index 016fedb1e7fd..8fce730f2799 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 1d5468a61575..68e6e854521b 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index 9213f0f9f894..8115e0f7db27 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index 0e110bcf6d5e..42d98d7bbe50 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index cc6228eeda56..39285a545a51 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
index 4a784b882716..5c561703637a 100644
--- a/lib/libc/db/recno/recno.h
+++ b/lib/libc/db/recno/recno.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index 0d2a676e9c67..ec17b580d169 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index c9d85f1b8188..7de3a5c6de80 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c
index 0cdea701e974..1c5a13093c74 100644
--- a/lib/libc/db/test/hash.tests/driver2.c
+++ b/lib/libc/db/test/hash.tests/driver2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c
index af83b2bb1303..6ba3c07a8aa5 100644
--- a/lib/libc/db/test/hash.tests/tcreat3.c
+++ b/lib/libc/db/test/hash.tests/tcreat3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c
index eac47cade9f9..1d7e424f7acc 100644
--- a/lib/libc/db/test/hash.tests/tdel.c
+++ b/lib/libc/db/test/hash.tests/tdel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c
index c87fc1ffc5d0..02f6832ba423 100644
--- a/lib/libc/db/test/hash.tests/thash4.c
+++ b/lib/libc/db/test/hash.tests/thash4.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c
index 8be75759e137..fdcaab3100d1 100644
--- a/lib/libc/db/test/hash.tests/tread2.c
+++ b/lib/libc/db/test/hash.tests/tread2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c
index ccde8895fd9d..3aac7d57488b 100644
--- a/lib/libc/db/test/hash.tests/tseq.c
+++ b/lib/libc/db/test/hash.tests/tseq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c
index ee1a34dfcdb2..fb8ee3328e06 100644
--- a/lib/libc/db/test/hash.tests/tverify.c
+++ b/lib/libc/db/test/hash.tests/tverify.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index f1cf62977dd2..6f8ccacda373 100644
--- a/lib/libc/gdtoa/_hdtoa.c
+++ b/lib/libc/gdtoa/_hdtoa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gdtoa/_hldtoa.c b/lib/libc/gdtoa/_hldtoa.c
index 409c83adb285..97394eaa30c1 100644
--- a/lib/libc/gdtoa/_hldtoa.c
+++ b/lib/libc/gdtoa/_hldtoa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 0047f9d3e168..00d76013f887 100644
--- a/lib/libc/gdtoa/_ldtoa.c
+++ b/lib/libc/gdtoa/_ldtoa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gdtoa/machdep_ldisQ.c b/lib/libc/gdtoa/machdep_ldisQ.c
index 23657ee19746..7b5c7afbc108 100644
--- a/lib/libc/gdtoa/machdep_ldisQ.c
+++ b/lib/libc/gdtoa/machdep_ldisQ.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gdtoa/machdep_ldisd.c b/lib/libc/gdtoa/machdep_ldisd.c
index 456d782a2a8a..d5c732998023 100644
--- a/lib/libc/gdtoa/machdep_ldisd.c
+++ b/lib/libc/gdtoa/machdep_ldisd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
index ad918a03d52f..b8e2a05790cc 100644
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ b/lib/libc/gdtoa/machdep_ldisx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gen/__getosreldate.c b/lib/libc/gen/__getosreldate.c
index 801cbee31488..980f9ef1fc58 100644
--- a/lib/libc/gen/__getosreldate.c
+++ b/lib/libc/gen/__getosreldate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index c94f60249e89..6f7d92a1708a 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/_once_stub.c b/lib/libc/gen/_once_stub.c
index 302f8536aec3..c45565a79cbd 100644
--- a/lib/libc/gen/_once_stub.c
+++ b/lib/libc/gen/_once_stub.c
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
index 89325a39b48a..fcf7ff04fedd 100644
--- a/lib/libc/gen/_pthread_stubs.c
+++ b/lib/libc/gen/_pthread_stubs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index 5d7ee3b2d2be..e08db88947f0 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index 5778ad53f03f..c0b6aded38bf 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 5f761adbfc4c..439a9e138e87 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index b65ad1c00480..ccbc7a4bd0d6 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/auxv.c b/lib/libc/gen/auxv.c
index d80d0acb035f..3767ac0a263c 100644
--- a/lib/libc/gen/auxv.c
+++ b/lib/libc/gen/auxv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010, 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
diff --git a/lib/libc/gen/cap_sandboxed.c b/lib/libc/gen/cap_sandboxed.c
index fd16c4845dce..ec2d4db334a7 100644
--- a/lib/libc/gen/cap_sandboxed.c
+++ b/lib/libc/gen/cap_sandboxed.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index 74265b2ceab9..435e0f827432 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/clock_getcpuclockid.c b/lib/libc/gen/clock_getcpuclockid.c
index fe951392d3c6..f26035f421fa 100644
--- a/lib/libc/gen/clock_getcpuclockid.c
+++ b/lib/libc/gen/clock_getcpuclockid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2012 David Xu <davidxu@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 0136a8ac64bf..88ded37be51f 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index a7e44d43a516..2f9a061696c8 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 20c4eed34d40..ab1a79901225 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index eda960f80a51..8af1cb2f3d30 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index 05f49c81a40d..15c6f4af7583 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index 4307173ffcdd..120c284449cd 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c
index 14fd3c8fc823..e29bfdccb7e3 100644
--- a/lib/libc/gen/dirfd.c
+++ b/lib/libc/gen/dirfd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Gleb Kurtsou <gleb@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index c1c19c2852fb..8780573d1c5d 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index 74123863afa9..393b02a88f02 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
*
diff --git a/lib/libc/gen/dup3.c b/lib/libc/gen/dup3.c
index c091f3427738..ff3431af461b 100644
--- a/lib/libc/gen/dup3.c
+++ b/lib/libc/gen/dup3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Jukka A. Ukkonen
* All rights reserved.
*
diff --git a/lib/libc/gen/elf_utils.c b/lib/libc/gen/elf_utils.c
index 06c91e057487..80ab013849b7 100644
--- a/lib/libc/gen/elf_utils.c
+++ b/lib/libc/gen/elf_utils.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010 Konstantin Belousov <kib@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index df411d6619c5..5c11667245ec 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index 632fa88edf65..f8fe9684a26a 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 4ee9b6475655..02e0351badc2 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Peter Wemm <peter@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 4411c319ffb2..e20ff42d3c90 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/fdevname.c b/lib/libc/gen/fdevname.c
index 217448fe2f59..d60da70d84e6 100644
--- a/lib/libc/gen/fdevname.c
+++ b/lib/libc/gen/fdevname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/feature_present.c b/lib/libc/gen/feature_present.c
index 3615d50f2349..a230c8a8be03 100644
--- a/lib/libc/gen/feature_present.c
+++ b/lib/libc/gen/feature_present.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index a772f50e51c8..7929f1f4b231 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -1,8 +1,6 @@
/* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
index c5246561e0aa..d2c67a6cb014 100644
--- a/lib/libc/gen/fmtmsg.c
+++ b/lib/libc/gen/fmtmsg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index d992587f1905..73ea55943960 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index 998656938936..444b5513ddf4 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index e65332a0bdde..53483da88568 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index a3c3f64e757a..c21ceb388904 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 04f8d05ee7de..2fad66e64ee1 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c
index 05cdd1050553..c34a281cfe3c 100644
--- a/lib/libc/gen/fts-compat.c
+++ b/lib/libc/gen/fts-compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/fts-compat.h b/lib/libc/gen/fts-compat.h
index 159f6a9fe66d..d8fe6895f11c 100644
--- a/lib/libc/gen/fts-compat.h
+++ b/lib/libc/gen/fts-compat.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 99ecffb4438c..8f3dd6da27db 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/gen-private.h b/lib/libc/gen/gen-private.h
index 64ad0217e2e0..d1fab5f31462 100644
--- a/lib/libc/gen/gen-private.h
+++ b/lib/libc/gen/gen-private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 5302a49cbbb0..aa23247f90b8 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index 0fb6d7eb3622..bbf5b1e89686 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index d69d89832b7a..f2f3777ab14e 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 204a2d1524d9..6884897fe22c 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1991, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index 51eb0c46c09c..5a388576f142 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 6a2d8590c7b1..0a2f044e1223 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index 7e55db975ebc..9eb55f9865cf 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index db802b78ec6b..dc2b372a8ea5 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index b51328b5bf14..9c06d0a4d986 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index 67c8aa2fe70e..7ab4cba88a48 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 875f11a67f4f..692d8f1de0bf 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 7ec3a25a4859..d71928e5a189 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 9f5ddc7b9a35..b4bf545ed31e 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index 90ed2ceda520..bf592300f4a8 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getpagesizes.c b/lib/libc/gen/getpagesizes.c
index b138f6a49158..534fe9e1fefe 100644
--- a/lib/libc/gen/getpagesizes.c
+++ b/lib/libc/gen/getpagesizes.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
index 530ae0e6100e..f0423aed325d 100644
--- a/lib/libc/gen/getpeereid.c
+++ b/lib/libc/gen/getpeereid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
*
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 0797ece86a93..a35a28835004 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index df52dda07858..266f6316e2c3 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index ff0d9426eb46..42ecfb1dd18e 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index e0d993221e7e..1679aa43d097 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 82dfd815a21b..c90c5eeb8474 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 4a3c074cf5a7..40419d960fee 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index bbfea7100314..d6a644c2c004 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index 81872c1423e0..02b0ffdfeeaa 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index ec62762c641a..0eb8b9f13ccb 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index e17d915e0ad3..72c2868b5e90 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/gen/libc_dlopen.c b/lib/libc/gen/libc_dlopen.c
index 7230c1797d83..2b1aa9e9d43d 100644
--- a/lib/libc/gen/libc_dlopen.c
+++ b/lib/libc/gen/libc_dlopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Xin Li <delphij@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 20f016dd1694..c64a34747b5d 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -1,7 +1,5 @@
/* $NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index fbcbad4bd60f..ba9524b5c6c0 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 80a5b7d6e260..f5631771de6b 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 7223fcb62f4f..bf4dea3ffc83 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index 9116d84c708d..8e7a638783f4 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 50037145dc2a..e469ab6f96c7 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
index c8875b4de763..2838c5c0aacd 100644
--- a/lib/libc/gen/posix_spawn.c
+++ b/lib/libc/gen/posix_spawn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index 020a7865f444..d1c70c600643 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c
index 45a9d3e95e59..4982c0276fbf 100644
--- a/lib/libc/gen/pututxline.c
+++ b/lib/libc/gen/pututxline.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index fa5182f5dcfe..24e822597bfd 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index 2c55498c1653..468096c55e70 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index 4dd6ca9aa2f7..4bc895eb409a 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index c77f9acfc590..b5162ed1e0e6 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 4caf637291da..2421c472541a 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 33a82d1c8948..55667003f1e7 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index 2b2c7eff8b6a..699de4626c10 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
index a04926a950fe..71cd0517743d 100644
--- a/lib/libc/gen/sem.c
+++ b/lib/libc/gen/sem.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
* Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
* All rights reserved.
diff --git a/lib/libc/gen/sem_new.c b/lib/libc/gen/sem_new.c
index 409f4ce76608..3bf898192fcf 100644
--- a/lib/libc/gen/sem_new.c
+++ b/lib/libc/gen/sem_new.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
* All rights reserved.
*
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index 44a2745a5452..0e418f6d058e 100644
--- a/lib/libc/gen/semctl.c
+++ b/lib/libc/gen/semctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index fae7ac2f199c..cba67a759a7d 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index cbf237c9651d..466ff577b29b 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index 1f0c48f4e127..90fa4aa45af0 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index f246c7bb1d1e..25ff803a60e7 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index f3eb6a19331b..d99b77233786 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index bd8f38bafd94..d4abfaa8ea0f 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index 913a1f4d2a8f..70e7f1712cea 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index e1f623d83e9e..cbcbfec48720 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index e17f33bf87ec..6c33c3543a52 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index f79b892169d1..236af17516d6 100644
--- a/lib/libc/gen/stringlist.c
+++ b/lib/libc/gen/stringlist.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
+/*
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
*
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index 1bbade8344f9..dba9cd24fb65 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 450df3cfd989..d666c0913193 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 91acdf3c9164..b83b439f6501 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
index f01be37a0d77..afca95dc3a6c 100644
--- a/lib/libc/gen/sysctlnametomib.c
+++ b/lib/libc/gen/sysctlnametomib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright 2001 The FreeBSD Project. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index e6ea1ed79d82..2a1793a667ad 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 98302e7ef854..0c4ffd6ceea0 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/telldir.h b/lib/libc/gen/telldir.h
index 04483b7f74a7..84ec9d30e9c2 100644
--- a/lib/libc/gen/telldir.h
+++ b/lib/libc/gen/telldir.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index 824e8f951e32..f8b7354f3162 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index b140366f866a..214dfce1bb8e 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 2232b0a551c8..936511e1e439 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index 1031dca77f73..9b50e79dea0c 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 9fe3a4ba4611..714d6093c7aa 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index f213ac42b244..6628e3b44b2b 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index 7c65cfabba06..397e3ad466c4 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index 1baf204529fa..6a1dca791533 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
index c9602491cc20..2c090c0a7ef3 100644
--- a/lib/libc/gen/ulimit.c
+++ b/lib/libc/gen/ulimit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index 3b84a0408256..499f761ae48b 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/unvis-compat.c b/lib/libc/gen/unvis-compat.c
index 2249f847621e..5fa5ca9ee053 100644
--- a/lib/libc/gen/unvis-compat.c
+++ b/lib/libc/gen/unvis-compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* All rights reserved.
*
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index f580e7676cfd..90be6d455c91 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index e425f570f57f..0250a7ad8c33 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/utxdb.c b/lib/libc/gen/utxdb.c
index f8dea105702c..66671290dc4b 100644
--- a/lib/libc/gen/utxdb.c
+++ b/lib/libc/gen/utxdb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/utxdb.h b/lib/libc/gen/utxdb.h
index 912dd0fa113e..d9ebc93e73f2 100644
--- a/lib/libc/gen/utxdb.h
+++ b/lib/libc/gen/utxdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index f66e35f7cdbf..a5b0f75eb694 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index 6f2f2ddd89c2..7cede6e321b3 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 7dc11551c3d7..b50e3dd14b50 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/waitid.c b/lib/libc/gen/waitid.c
index b9a8c577150a..8bdd6521aa31 100644
--- a/lib/libc/gen/waitid.c
+++ b/lib/libc/gen/waitid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Jukka A. Ukkonen
* All rights reserved.
*
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 3602bca6faec..5dc4fa820ea2 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
index 0322c1176d69..dda6ababa1ca 100644
--- a/lib/libc/gen/wordexp.c
+++ b/lib/libc/gen/wordexp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 3e63a42ca975..6ca8f79267b6 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 18dff6603c02..02f3efd84b3d 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 25f8c1a0e0ab..9a4856a4d3e2 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/i386/_fpmath.h b/lib/libc/i386/_fpmath.h
index 874439c34b76..4f1f5f4a5a16 100644
--- a/lib/libc/i386/_fpmath.h
+++ b/lib/libc/i386/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/i386/gen/_set_tp.c b/lib/libc/i386/gen/_set_tp.c
index 2da48988eb37..8a6c9295f5f2 100644
--- a/lib/libc/i386/gen/_set_tp.c
+++ b/lib/libc/i386/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/i386/gen/getcontextx.c b/lib/libc/i386/gen/getcontextx.c
index aedf3f021a7f..3c6dd33ef10f 100644
--- a/lib/libc/i386/gen/getcontextx.c
+++ b/lib/libc/i386/gen/getcontextx.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
index d48aeb8dc089..167cb12893dc 100644
--- a/lib/libc/i386/gen/makecontext.c
+++ b/lib/libc/i386/gen/makecontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
index 35487093a869..877b6556a3f2 100644
--- a/lib/libc/i386/gen/signalcontext.c
+++ b/lib/libc/i386/gen/signalcontext.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jonathan Mini <mini@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
index 885ed7ddc398..721c1b8cc46c 100644
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ b/lib/libc/i386/sys/i386_clr_watch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright 2000 Brian S. Dean <bsd@bsdhome.com>
* All Rights Reserved.
*
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
index 973dea2c31ee..24c47648e431 100644
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ b/lib/libc/i386/sys/i386_get_fsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
index 908a15eed24c..f524f310e02c 100644
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ b/lib/libc/i386/sys/i386_get_gsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index 1bdabb2794f0..7bc27f812654 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 78dd16cb77b3..73d76670bb8b 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993 John Brezak
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
index daa14591fce6..6b5544641749 100644
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ b/lib/libc/i386/sys/i386_set_fsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
index ffb435244b44..aaf2312d2882 100644
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ b/lib/libc/i386/sys/i386_set_gsbase.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index a18336841b83..258e2af417b0 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index 7abcc33deb6c..0bb109aee970 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993 John Brezak
* All rights reserved.
*
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
index 181df83ea2a8..cc1b8ed03b7c 100644
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ b/lib/libc/i386/sys/i386_set_watch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright 2000 Brian S. Dean <bsd@bsdhome.com>
* All Rights Reserved.
*
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index 90d90242d4a0..c007608e6220 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
*
diff --git a/lib/libc/iconv/__iconv.c b/lib/libc/iconv/__iconv.c
index 9fd0567087a2..85170b74540a 100644
--- a/lib/libc/iconv/__iconv.c
+++ b/lib/libc/iconv/__iconv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/__iconv_free_list.c b/lib/libc/iconv/__iconv_free_list.c
index 0f2b92355e32..de9701e9924d 100644
--- a/lib/libc/iconv/__iconv_free_list.c
+++ b/lib/libc/iconv/__iconv_free_list.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/__iconv_get_list.c b/lib/libc/iconv/__iconv_get_list.c
index cb80ed78ef48..437d413d98a5 100644
--- a/lib/libc/iconv/__iconv_get_list.c
+++ b/lib/libc/iconv/__iconv_get_list.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h
index dee7bab733e8..d2d9d84fd97d 100644
--- a/lib/libc/iconv/_strtol.h
+++ b/lib/libc/iconv/_strtol.h
@@ -2,8 +2,6 @@
/* $NetBSD: _strtol.h,v 1.2 2009/05/20 22:03:29 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h
index 2dd3e92ba302..64e0d466b364 100644
--- a/lib/libc/iconv/_strtoul.h
+++ b/lib/libc/iconv/_strtoul.h
@@ -2,8 +2,6 @@
/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c
index 0fcff0e2d1b8..ca0b706d5dc5 100644
--- a/lib/libc/iconv/bsd_iconv.c
+++ b/lib/libc/iconv/bsd_iconv.c
@@ -2,8 +2,6 @@
/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2003 Citrus Project,
* Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>,
* All rights reserved.
diff --git a/lib/libc/iconv/citrus_aliasname_local.h b/lib/libc/iconv/citrus_aliasname_local.h
index 0dc883a54c92..687362b12bbd 100644
--- a/lib/libc/iconv/citrus_aliasname_local.h
+++ b/lib/libc/iconv/citrus_aliasname_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2008 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_bcs.c b/lib/libc/iconv/citrus_bcs.c
index b8484a0d793e..e86fb37034cb 100644
--- a/lib/libc/iconv/citrus_bcs.c
+++ b/lib/libc/iconv/citrus_bcs.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_bcs.h b/lib/libc/iconv/citrus_bcs.h
index 3bf6f72e988e..3b1f53766579 100644
--- a/lib/libc/iconv/citrus_bcs.h
+++ b/lib/libc/iconv/citrus_bcs.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_bcs.h,v 1.6 2009/01/11 02:46:24 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_bcs_strtol.c b/lib/libc/iconv/citrus_bcs_strtol.c
index fda263b6479f..ac874a3549c7 100644
--- a/lib/libc/iconv/citrus_bcs_strtol.c
+++ b/lib/libc/iconv/citrus_bcs_strtol.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2005 The DragonFly Project. All rights reserved.
* Copyright (c) 2003, 2008 Citrus Project,
* All rights reserved.
diff --git a/lib/libc/iconv/citrus_bcs_strtoul.c b/lib/libc/iconv/citrus_bcs_strtoul.c
index 981aa5ad1b8c..b33334a91fdd 100644
--- a/lib/libc/iconv/citrus_bcs_strtoul.c
+++ b/lib/libc/iconv/citrus_bcs_strtoul.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2005 The DragonFly Project. All rights reserved.
* Copyright (c) 2003, 2008 Citrus Project,
* All rights reserved.
diff --git a/lib/libc/iconv/citrus_csmapper.c b/lib/libc/iconv/citrus_csmapper.c
index 90d52cba2ce3..353adc9bb056 100644
--- a/lib/libc/iconv/citrus_csmapper.c
+++ b/lib/libc/iconv/citrus_csmapper.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_csmapper.h b/lib/libc/iconv/citrus_csmapper.h
index cdc7b0e3375e..cb1c4f1f7439 100644
--- a/lib/libc/iconv/citrus_csmapper.h
+++ b/lib/libc/iconv/citrus_csmapper.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_csmapper.h,v 1.3 2013/06/24 17:28:35 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db.c b/lib/libc/iconv/citrus_db.c
index 09df5bfaf07f..2de848b98938 100644
--- a/lib/libc/iconv/citrus_db.c
+++ b/lib/libc/iconv/citrus_db.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db.h b/lib/libc/iconv/citrus_db.h
index fd46675a5d0b..27e16f345cd5 100644
--- a/lib/libc/iconv/citrus_db.h
+++ b/lib/libc/iconv/citrus_db.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c
index fd3375d6b2e0..691fe4e84351 100644
--- a/lib/libc/iconv/citrus_db_factory.c
+++ b/lib/libc/iconv/citrus_db_factory.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db_factory.h b/lib/libc/iconv/citrus_db_factory.h
index c542046532c1..b98b19c9e7f0 100644
--- a/lib/libc/iconv/citrus_db_factory.h
+++ b/lib/libc/iconv/citrus_db_factory.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db_factory.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db_file.h b/lib/libc/iconv/citrus_db_file.h
index 7eea27694746..aed07e8d1ea0 100644
--- a/lib/libc/iconv/citrus_db_file.h
+++ b/lib/libc/iconv/citrus_db_file.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db_file.h,v 1.4 2008/02/10 05:58:22 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db_hash.c b/lib/libc/iconv/citrus_db_hash.c
index 1033c3fe8867..2c599ff8ca77 100644
--- a/lib/libc/iconv/citrus_db_hash.c
+++ b/lib/libc/iconv/citrus_db_hash.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_db_hash.h b/lib/libc/iconv/citrus_db_hash.h
index ca2caa5282af..549af2631b39 100644
--- a/lib/libc/iconv/citrus_db_hash.h
+++ b/lib/libc/iconv/citrus_db_hash.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_db_hash.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_esdb.c b/lib/libc/iconv/citrus_esdb.c
index a07d5d09e72f..4a07ecafce78 100644
--- a/lib/libc/iconv/citrus_esdb.c
+++ b/lib/libc/iconv/citrus_esdb.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_esdb.h b/lib/libc/iconv/citrus_esdb.h
index a2fb8041554d..f82a3989a43c 100644
--- a/lib/libc/iconv/citrus_esdb.h
+++ b/lib/libc/iconv/citrus_esdb.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_esdb.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_esdb_file.h b/lib/libc/iconv/citrus_esdb_file.h
index 518d35587326..98609d1ecd42 100644
--- a/lib/libc/iconv/citrus_esdb_file.h
+++ b/lib/libc/iconv/citrus_esdb_file.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_esdb_file.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_fix_grouping.h b/lib/libc/iconv/citrus_fix_grouping.h
index 31f9c23f42de..fbb1788e776b 100644
--- a/lib/libc/iconv/citrus_fix_grouping.h
+++ b/lib/libc/iconv/citrus_fix_grouping.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_fix_grouping.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2008 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_hash.c b/lib/libc/iconv/citrus_hash.c
index aff6d55bcfbd..4db1bda47305 100644
--- a/lib/libc/iconv/citrus_hash.c
+++ b/lib/libc/iconv/citrus_hash.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_hash.h b/lib/libc/iconv/citrus_hash.h
index 62f2ae23b872..c3e73118571f 100644
--- a/lib/libc/iconv/citrus_hash.h
+++ b/lib/libc/iconv/citrus_hash.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_hash.h,v 1.3 2004/01/02 21:49:35 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c
index fbabf6524399..59940631f53b 100644
--- a/lib/libc/iconv/citrus_iconv.c
+++ b/lib/libc/iconv/citrus_iconv.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_iconv.h b/lib/libc/iconv/citrus_iconv.h
index 8fe630af6c2d..99604e92063d 100644
--- a/lib/libc/iconv/citrus_iconv.h
+++ b/lib/libc/iconv/citrus_iconv.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_iconv_local.h b/lib/libc/iconv/citrus_iconv_local.h
index bd02d085d1ca..5392da1ddf20 100644
--- a/lib/libc/iconv/citrus_iconv_local.h
+++ b/lib/libc/iconv/citrus_iconv_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lock.h b/lib/libc/iconv/citrus_lock.h
index 3daaf1c31dd0..395064453b67 100644
--- a/lib/libc/iconv/citrus_lock.h
+++ b/lib/libc/iconv/citrus_lock.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lookup.c b/lib/libc/iconv/citrus_lookup.c
index 51a82951376c..bb9934a4847f 100644
--- a/lib/libc/iconv/citrus_lookup.c
+++ b/lib/libc/iconv/citrus_lookup.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lookup.h b/lib/libc/iconv/citrus_lookup.h
index 88a0d4e7ef51..e7a7150a73a4 100644
--- a/lib/libc/iconv/citrus_lookup.h
+++ b/lib/libc/iconv/citrus_lookup.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_lookup.h,v 1.2 2004/07/21 14:16:34 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lookup_factory.c b/lib/libc/iconv/citrus_lookup_factory.c
index 85d20dfe8cfe..ec5a5d6b78ca 100644
--- a/lib/libc/iconv/citrus_lookup_factory.c
+++ b/lib/libc/iconv/citrus_lookup_factory.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lookup_factory.h b/lib/libc/iconv/citrus_lookup_factory.h
index e716184a8d17..9016de5507e1 100644
--- a/lib/libc/iconv/citrus_lookup_factory.h
+++ b/lib/libc/iconv/citrus_lookup_factory.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_lookup_factory.h,v 1.1 2003/06/25 09:51:35 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_lookup_file.h b/lib/libc/iconv/citrus_lookup_file.h
index a2ada5fc7d5c..43944b3d9815 100644
--- a/lib/libc/iconv/citrus_lookup_file.h
+++ b/lib/libc/iconv/citrus_lookup_file.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_lookup_file.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_mapper.c b/lib/libc/iconv/citrus_mapper.c
index cbc0a58c35c9..ea65ae95bc7a 100644
--- a/lib/libc/iconv/citrus_mapper.c
+++ b/lib/libc/iconv/citrus_mapper.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_mapper.h b/lib/libc/iconv/citrus_mapper.h
index 7e9056c761e9..429b2a1a0ce9 100644
--- a/lib/libc/iconv/citrus_mapper.h
+++ b/lib/libc/iconv/citrus_mapper.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper.h,v 1.3 2003/07/12 15:39:19 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_mapper_local.h b/lib/libc/iconv/citrus_mapper_local.h
index cfdb3be868e2..8d29e63a4a96 100644
--- a/lib/libc/iconv/citrus_mapper_local.h
+++ b/lib/libc/iconv/citrus_mapper_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_local.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_memstream.c b/lib/libc/iconv/citrus_memstream.c
index 51092cb792b7..f99a19d8ba57 100644
--- a/lib/libc/iconv/citrus_memstream.c
+++ b/lib/libc/iconv/citrus_memstream.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_memstream.h b/lib/libc/iconv/citrus_memstream.h
index 4c398a8c7a5b..cd5ef134f2cc 100644
--- a/lib/libc/iconv/citrus_memstream.h
+++ b/lib/libc/iconv/citrus_memstream.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_memstream.h,v 1.3 2005/05/14 17:55:42 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_mmap.c b/lib/libc/iconv/citrus_mmap.c
index e058f3d2cdc3..83dd70b03fb6 100644
--- a/lib/libc/iconv/citrus_mmap.c
+++ b/lib/libc/iconv/citrus_mmap.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_mmap.h b/lib/libc/iconv/citrus_mmap.h
index 83520646f378..590e7fbe202d 100644
--- a/lib/libc/iconv/citrus_mmap.h
+++ b/lib/libc/iconv/citrus_mmap.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mmap.h,v 1.1 2003/06/25 09:51:38 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_module.c b/lib/libc/iconv/citrus_module.c
index 64ef0271ea18..32b7e6e834ad 100644
--- a/lib/libc/iconv/citrus_module.c
+++ b/lib/libc/iconv/citrus_module.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_module.h b/lib/libc/iconv/citrus_module.h
index 0bcb53e2efa5..b004b87efb38 100644
--- a/lib/libc/iconv/citrus_module.h
+++ b/lib/libc/iconv/citrus_module.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_module.h,v 1.1 2002/03/17 22:14:20 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_namespace.h b/lib/libc/iconv/citrus_namespace.h
index 4244c70d701e..6e9ffe0509f8 100644
--- a/lib/libc/iconv/citrus_namespace.h
+++ b/lib/libc/iconv/citrus_namespace.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_namespace.h,v 1.8 2009/01/11 02:46:24 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_none.c b/lib/libc/iconv/citrus_none.c
index 64b5968c9f87..56e157ad040b 100644
--- a/lib/libc/iconv/citrus_none.c
+++ b/lib/libc/iconv/citrus_none.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_none.c,v 1.22 2017/07/13 16:00:30 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2002 Citrus Project,
* Copyright (c) 2010 Gabor Kovesdan <gabor@FreeBSD.org>,
* All rights reserved.
diff --git a/lib/libc/iconv/citrus_none.h b/lib/libc/iconv/citrus_none.h
index a0ebd61f296e..20d27910ebcf 100644
--- a/lib/libc/iconv/citrus_none.h
+++ b/lib/libc/iconv/citrus_none.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_none.h,v 1.3 2003/06/25 09:51:38 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_pivot_factory.c b/lib/libc/iconv/citrus_pivot_factory.c
index c307a9d5aa32..0f279b10cf71 100644
--- a/lib/libc/iconv/citrus_pivot_factory.c
+++ b/lib/libc/iconv/citrus_pivot_factory.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_pivot_factory.h b/lib/libc/iconv/citrus_pivot_factory.h
index adbfc8c77524..76f0f707c9ac 100644
--- a/lib/libc/iconv/citrus_pivot_factory.h
+++ b/lib/libc/iconv/citrus_pivot_factory.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_pivot_factory.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_pivot_file.h b/lib/libc/iconv/citrus_pivot_file.h
index b2b4f2408dba..454e93a9d29f 100644
--- a/lib/libc/iconv/citrus_pivot_file.h
+++ b/lib/libc/iconv/citrus_pivot_file.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_pivot_file.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_prop.c b/lib/libc/iconv/citrus_prop.c
index 7ac39bbee6e5..642e4230986a 100644
--- a/lib/libc/iconv/citrus_prop.c
+++ b/lib/libc/iconv/citrus_prop.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_prop.c,v 1.4 2011/03/30 08:22:01 jruoho Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_prop.h b/lib/libc/iconv/citrus_prop.h
index f09c833b8da6..48fc066295c6 100644
--- a/lib/libc/iconv/citrus_prop.h
+++ b/lib/libc/iconv/citrus_prop.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_region.h b/lib/libc/iconv/citrus_region.h
index 0a78eec2b85c..8cecb409bec3 100644
--- a/lib/libc/iconv/citrus_region.h
+++ b/lib/libc/iconv/citrus_region.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_region.h,v 1.7 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_stdenc.c b/lib/libc/iconv/citrus_stdenc.c
index 2bc79a11d333..cef530e2a69e 100644
--- a/lib/libc/iconv/citrus_stdenc.c
+++ b/lib/libc/iconv/citrus_stdenc.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_stdenc.h b/lib/libc/iconv/citrus_stdenc.h
index a643b77a27aa..50f4dffa4e16 100644
--- a/lib/libc/iconv/citrus_stdenc.h
+++ b/lib/libc/iconv/citrus_stdenc.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_stdenc_local.h b/lib/libc/iconv/citrus_stdenc_local.h
index 2af3b8a992b7..141abffea9b9 100644
--- a/lib/libc/iconv/citrus_stdenc_local.h
+++ b/lib/libc/iconv/citrus_stdenc_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_stdenc_template.h b/lib/libc/iconv/citrus_stdenc_template.h
index 06fca844392f..9a05fa789fa6 100644
--- a/lib/libc/iconv/citrus_stdenc_template.h
+++ b/lib/libc/iconv/citrus_stdenc_template.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/citrus_types.h b/lib/libc/iconv/citrus_types.h
index 2e4be11dd4cd..5f9c4e30d40b 100644
--- a/lib/libc/iconv/citrus_types.h
+++ b/lib/libc/iconv/citrus_types.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv-internal.h b/lib/libc/iconv/iconv-internal.h
index 731b6856ca22..214a8adf97ef 100644
--- a/lib/libc/iconv/iconv-internal.h
+++ b/lib/libc/iconv/iconv-internal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c
index 57c614029df0..4bd962009e65 100644
--- a/lib/libc/iconv/iconv.c
+++ b/lib/libc/iconv/iconv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_canonicalize.c b/lib/libc/iconv/iconv_canonicalize.c
index 7c3e6f0fdbae..702a4168f295 100644
--- a/lib/libc/iconv/iconv_canonicalize.c
+++ b/lib/libc/iconv/iconv_canonicalize.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_close.c b/lib/libc/iconv/iconv_close.c
index f7d0231afcd8..1adbb8c6eb69 100644
--- a/lib/libc/iconv/iconv_close.c
+++ b/lib/libc/iconv/iconv_close.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_compat.c b/lib/libc/iconv/iconv_compat.c
index 2a6a120aa2cd..ded249956db9 100644
--- a/lib/libc/iconv/iconv_compat.c
+++ b/lib/libc/iconv/iconv_compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_open.c b/lib/libc/iconv/iconv_open.c
index a386f13007b1..f14925c446eb 100644
--- a/lib/libc/iconv/iconv_open.c
+++ b/lib/libc/iconv/iconv_open.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_open_into.c b/lib/libc/iconv/iconv_open_into.c
index 9db00c3e7710..8a1278bad066 100644
--- a/lib/libc/iconv/iconv_open_into.c
+++ b/lib/libc/iconv/iconv_open_into.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconv_set_relocation_prefix.c b/lib/libc/iconv/iconv_set_relocation_prefix.c
index 969381c12984..7615c942ebaa 100644
--- a/lib/libc/iconv/iconv_set_relocation_prefix.c
+++ b/lib/libc/iconv/iconv_set_relocation_prefix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconvctl.c b/lib/libc/iconv/iconvctl.c
index d6357f637752..50c108cfd219 100644
--- a/lib/libc/iconv/iconvctl.c
+++ b/lib/libc/iconv/iconvctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/iconv/iconvlist.c b/lib/libc/iconv/iconvlist.c
index dbd0a1eddf99..418b4a75970c 100644
--- a/lib/libc/iconv/iconvlist.c
+++ b/lib/libc/iconv/iconvlist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libc/include/compat.h b/lib/libc/include/compat.h
index 204428991a08..d0abfdf70fdb 100644
--- a/lib/libc/include/compat.h
+++ b/lib/libc/include/compat.h
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/lib/libc/include/errlst.h b/lib/libc/include/errlst.h
index 3834524fb87b..4e9e29fc3345 100644
--- a/lib/libc/include/errlst.h
+++ b/lib/libc/include/errlst.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Jilles Tjoelker
* All rights reserved.
*
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
index ce935eb403e2..c566e9fe08f4 100644
--- a/lib/libc/include/fpmath.h
+++ b/lib/libc/include/fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2002 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index 542391f3b273..1535dd7812d9 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index efc9322ca37c..f15edee437a7 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/include/nscache.h b/lib/libc/include/nscache.h
index 8e79fa8eab6d..015c4ec74ffe 100644
--- a/lib/libc/include/nscache.h
+++ b/lib/libc/include/nscache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
*
diff --git a/lib/libc/include/nscachedcli.h b/lib/libc/include/nscachedcli.h
index 4feed2b14208..b0f79bd9d05c 100644
--- a/lib/libc/include/nscachedcli.h
+++ b/lib/libc/include/nscachedcli.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
*
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
index 16b27c04ac1c..13ab367d06b5 100644
--- a/lib/libc/include/nss_tls.h
+++ b/lib/libc/include/nss_tls.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
index 690f4ef1b9aa..004a18bea266 100644
--- a/lib/libc/include/reentrant.h
+++ b/lib/libc/include/reentrant.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,98 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index c81ef76d21c1..c29f3f5e15ac 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index bf11147245d3..7df4961c8aa3 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index f67c93f9d3b7..2f97175826ad 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c
index 2598a0192c6b..274253f4a310 100644
--- a/lib/libc/inet/inet_lnaof.c
+++ b/lib/libc/inet/inet_lnaof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c
index 41ac53d67da6..bce0aa1c127f 100644
--- a/lib/libc/inet/inet_makeaddr.c
+++ b/lib/libc/inet/inet_makeaddr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c
index bf03e4513770..2335772b68dc 100644
--- a/lib/libc/inet/inet_netof.c
+++ b/lib/libc/inet/inet_netof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c
index c6b5d8a854e4..b5b9190ac184 100644
--- a/lib/libc/inet/inet_network.c
+++ b/lib/libc/inet/inet_network.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
index d78f681b3d8e..d8afd0d57c34 100644
--- a/lib/libc/inet/inet_ntoa.c
+++ b/lib/libc/inet/inet_ntoa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/ascii.c b/lib/libc/locale/ascii.c
index eb3dcc410dcf..a70d71a7b88c 100644
--- a/lib/libc/locale/ascii.c
+++ b/lib/libc/locale/ascii.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index a695da477d58..72507bc857e1 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/c16rtomb.c b/lib/libc/locale/c16rtomb.c
index 6f86b0074667..8bad98267b69 100644
--- a/lib/libc/locale/c16rtomb.c
+++ b/lib/libc/locale/c16rtomb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/c32rtomb.c b/lib/libc/locale/c32rtomb.c
index 31d7a280deda..c5f008fdea69 100644
--- a/lib/libc/locale/c32rtomb.c
+++ b/lib/libc/locale/c32rtomb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h
index d0dadac6c312..d6e7ce0ae3ac 100644
--- a/lib/libc/locale/cXXrtomb_iconv.h
+++ b/lib/libc/locale/cXXrtomb_iconv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index 3d7c190221db..fcbce98b451e 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 4abb1f936ae2..c8968c69f5a6 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index b444ea0652ac..ce71a714f42f 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/lib/libc/locale/ctype.c b/lib/libc/locale/ctype.c
index 8a88b8d6512e..f0ec3f6d8b0f 100644
--- a/lib/libc/locale/ctype.c
+++ b/lib/libc/locale/ctype.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index f5b5fd473068..2fe40462e9be 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index d6e74eb80b70..2e5bc047d592 100644
--- a/lib/libc/locale/fix_grouping.c
+++ b/lib/libc/locale/fix_grouping.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index b4f80678d840..d87b6f78d5d9 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index 07a6c4764bb3..032a3e2fff98 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
index c6878e883248..c3d16f664a26 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index fe0f18d1559b..8f93f1919bfb 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index b01c4bc4458b..dad0621bebd5 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index ed794337e115..ccf5e7f81fb9 100644
--- a/lib/libc/locale/ldpart.c
+++ b/lib/libc/locale/ldpart.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h
index 8985b324ae03..45f7339fe8fb 100644
--- a/lib/libc/locale/ldpart.h
+++ b/lib/libc/locale/ldpart.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
index 9c442dc3d7a1..a0664d074ecd 100644
--- a/lib/libc/locale/lmessages.c
+++ b/lib/libc/locale/lmessages.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lmessages.h b/lib/libc/locale/lmessages.h
index 0e8278f4a650..ea9c57e28943 100644
--- a/lib/libc/locale/lmessages.h
+++ b/lib/libc/locale/lmessages.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
index 99800ae69922..84eccdb6ab32 100644
--- a/lib/libc/locale/lmonetary.c
+++ b/lib/libc/locale/lmonetary.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lmonetary.h b/lib/libc/locale/lmonetary.h
index 69facf9f88dd..b606862f54af 100644
--- a/lib/libc/locale/lmonetary.h
+++ b/lib/libc/locale/lmonetary.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
index 046d1f1817dc..a2468f4e28b5 100644
--- a/lib/libc/locale/lnumeric.c
+++ b/lib/libc/locale/lnumeric.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/lnumeric.h b/lib/libc/locale/lnumeric.h
index 43ff16127862..5088dd444b5f 100644
--- a/lib/libc/locale/lnumeric.h
+++ b/lib/libc/locale/lnumeric.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index 20f962783f1a..4b19160c35dd 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index e972298f5b40..1bacf3eb837b 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
index cffe3ba92bc8..acb1c21940b8 100644
--- a/lib/libc/locale/mblocal.h
+++ b/lib/libc/locale/mblocal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2004 Tim J. Robbins.
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index f84fce7b61b0..9ce0bc067642 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mbrtoc16.c b/lib/libc/locale/mbrtoc16.c
index 497f1cd028d0..a47514c3d93b 100644
--- a/lib/libc/locale/mbrtoc16.c
+++ b/lib/libc/locale/mbrtoc16.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/mbrtoc32.c b/lib/libc/locale/mbrtoc32.c
index d1d8102e16f9..ee9e47d6a3e5 100644
--- a/lib/libc/locale/mbrtoc32.c
+++ b/lib/libc/locale/mbrtoc32.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h
index 262818ee79d5..9eb6f6831eb6 100644
--- a/lib/libc/locale/mbrtocXX_iconv.h
+++ b/lib/libc/locale/mbrtocXX_iconv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index 4171886c8efa..8f1aebd5762a 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index a7df81911b26..be44fe5e31c0 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
index 59574386b0af..9e6baad4b131 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins.
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index aefbee1c2d09..9032b94fffba 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index 3226d22ea254..6905d2e6604e 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index df1b204187e9..376d6cfa5d6d 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index 1585886cea31..c7da4b5e8c0f 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index 3ef73ddec7b6..9fc8ce05ecee 100644
--- a/lib/libc/locale/nextwctype.c
+++ b/lib/libc/locale/nextwctype.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index b51b0425515b..7f19a575f208 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001, 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index db1e6e37caa4..4e5a61d99540 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
index e4c366a00afb..4d90eb8dcf8b 100644
--- a/lib/libc/locale/rpmatch.c
+++ b/lib/libc/locale/rpmatch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index 72952eeaacf4..00ef19b781fa 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1993
diff --git a/lib/libc/locale/runefile.h b/lib/libc/locale/runefile.h
index 18a603c03e31..ce1e47e5f92d 100644
--- a/lib/libc/locale/runefile.h
+++ b/lib/libc/locale/runefile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Ruslan Ermilov
* All rights reserved.
*
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index 8645f3cf3d2c..a0da47b5de98 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 6409537b8a05..c7e1e9ffc4e7 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 - 2002 FreeBSD Project
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
index c199cdf62daf..33b4b6e9aeea 100644
--- a/lib/libc/locale/setlocale.h
+++ b/lib/libc/locale/setlocale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 284d5468c612..2e57dc3c914d 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 2db0b8e311cd..80b19f5ced5e 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index ff0e97b67b35..c74791da370c 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 0f19f71d3e7c..2c5ec86de434 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 13f957989fa2..e096b8783947 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index 1afa8f77acc9..32d4df2af64c 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
index 772c96c2f9f4..c4f6b2ee4e5f 100644
--- a/lib/libc/locale/wcsftime.c
+++ b/lib/libc/locale/wcsftime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
index 8d90445aacf1..ce77ebbffc4c 100644
--- a/lib/libc/locale/wcsnrtombs.c
+++ b/lib/libc/locale/wcsnrtombs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins.
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index ca9875799a3d..f6d1ca07f523 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
index 42d8acdafcdb..c6ae1417c1de 100644
--- a/lib/libc/locale/wcstod.c
+++ b/lib/libc/locale/wcstod.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
index 34117557ee0f..99ce0fe4af2c 100644
--- a/lib/libc/locale/wcstof.c
+++ b/lib/libc/locale/wcstof.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
index 356f75da1cda..ce066a53462b 100644
--- a/lib/libc/locale/wcstoimax.c
+++ b/lib/libc/locale/wcstoimax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
index 28d6d06d33b9..2b21d126c700 100644
--- a/lib/libc/locale/wcstol.c
+++ b/lib/libc/locale/wcstol.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
index c31f84118a2f..89c92d95d4f3 100644
--- a/lib/libc/locale/wcstold.c
+++ b/lib/libc/locale/wcstold.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
index ba320d70bae3..f246502bb2fa 100644
--- a/lib/libc/locale/wcstoll.c
+++ b/lib/libc/locale/wcstoll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index a34b58ecdb05..8d4ae1c0b4e1 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
index 432707cd612a..54e6b4fb9111 100644
--- a/lib/libc/locale/wcstoul.c
+++ b/lib/libc/locale/wcstoul.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
index e279c5602d57..c56ee770f032 100644
--- a/lib/libc/locale/wcstoull.c
+++ b/lib/libc/locale/wcstoull.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
index d9d1dac89cf5..397c1e37410f 100644
--- a/lib/libc/locale/wcstoumax.c
+++ b/lib/libc/locale/wcstoumax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index b43761c48d45..96e8b730a903 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index 151d67997548..da3d2635a967 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
index 36cb25e45549..0831146b0103 100644
--- a/lib/libc/locale/wctrans.c
+++ b/lib/libc/locale/wctrans.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index dd8f218306b2..e20712175154 100644
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c
index 592a823eabd5..9e74217f6d8e 100644
--- a/lib/libc/locale/wcwidth.c
+++ b/lib/libc/locale/wcwidth.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c
index c93f20c68f1a..f9b7db107aec 100644
--- a/lib/libc/locale/xlocale.c
+++ b/lib/libc/locale/xlocale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libc/locale/xlocale_private.h b/lib/libc/locale/xlocale_private.h
index 52f906932407..77b9ff4ee44f 100644
--- a/lib/libc/locale/xlocale_private.h
+++ b/lib/libc/locale/xlocale_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libc/mips/SYS.h b/lib/libc/mips/SYS.h
index 99d3b470fa92..ceb68121b07d 100644
--- a/lib/libc/mips/SYS.h
+++ b/lib/libc/mips/SYS.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Jonathan Stone
* All rights reserved.
*
diff --git a/lib/libc/mips/_fpmath.h b/lib/libc/mips/_fpmath.h
index cece2fa81cb6..f006a583bc7c 100644
--- a/lib/libc/mips/_fpmath.h
+++ b/lib/libc/mips/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/mips/gen/_set_tp.c b/lib/libc/mips/gen/_set_tp.c
index d20a55149a53..a1a30c54b597 100644
--- a/lib/libc/mips/gen/_set_tp.c
+++ b/lib/libc/mips/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/mips/gen/fabs.c b/lib/libc/mips/gen/fabs.c
index 6730a6746289..8bb15025aead 100644
--- a/lib/libc/mips/gen/fabs.c
+++ b/lib/libc/mips/gen/fabs.c
@@ -1,8 +1,6 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/mips/gen/longjmp.c b/lib/libc/mips/gen/longjmp.c
index 11ef4f8c7652..7c684706c042 100644
--- a/lib/libc/mips/gen/longjmp.c
+++ b/lib/libc/mips/gen/longjmp.c
@@ -1,8 +1,6 @@
/* $NetBSD: longjmp.c,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/mips/gen/makecontext.c b/lib/libc/mips/gen/makecontext.c
index 6fd7bd69b1db..f2a826e77bdd 100644
--- a/lib/libc/mips/gen/makecontext.c
+++ b/lib/libc/mips/gen/makecontext.c
@@ -1,8 +1,6 @@
/* $NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/mips/gen/signalcontext.c b/lib/libc/mips/gen/signalcontext.c
index 7870a1efede8..694468c314dd 100644
--- a/lib/libc/mips/gen/signalcontext.c
+++ b/lib/libc/mips/gen/signalcontext.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
*
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 98e5398096ff..19aa6f64e8c4 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c
index 56a3287ed571..4f60f2db3917 100644
--- a/lib/libc/net/gai_strerror.c
+++ b/lib/libc/net/gai_strerror.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index a33f240bc376..ba61eb865e12 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,8 +1,6 @@
/* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 317485b9c507..2ee66e3e55fe 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* ++Copyright++ 1985, 1988, 1993
* -
* Copyright (c) 1985, 1988, 1993
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index 1b6aec071beb..1468afb6304f 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 9edee742e7e9..6bafdb116fd1 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, Garrett Wollman
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index b0e68cf3431c..9286e397527a 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, Garrett Wollman
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index 92a032f9f2ee..c05d6de57b25 100644
--- a/lib/libc/net/getifmaddrs.c
+++ b/lib/libc/net/getifmaddrs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 Bruce M. Simpson.
* All rights reserved
*
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index efd10bfe4f1e..4b7aecbc6f02 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -1,8 +1,6 @@
/* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2000 Ben Harris.
* All rights reserved.
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 64bd00baa867..6667a82f4645 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index ca57538a75f8..bee00e807fe3 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index 054632d37ab1..1dbed83f1b26 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, Garrett Wollman
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 77773992123f..e08f8915b457 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, Garrett Wollman
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index 1fc7bd891539..36eeb90a8a32 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index e28a5be55f22..41ff89687f1e 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index c0ffad192f41..22c57594f6db 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index 78fe34b5b55e..5614588aa263 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 5e2f9df8d008..db3f8ce66c3a 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -1,8 +1,6 @@
/* $KAME: ip6opt.c,v 1.13 2003/06/06 10:08:20 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index 43916deccd05..9432a53127df 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index e673878b1def..d9329ec2074c 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* ++Copyright++ 1985, 1988, 1993
* -
* Copyright (c) 1985, 1988, 1993
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 9b7aaf66ae21..b0970786dd8c 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -1,8 +1,6 @@
/* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index 9f2bde221c92..8ab224717cc1 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/nscache.c b/lib/libc/net/nscache.c
index e9954386b24f..88a115be673b 100644
--- a/lib/libc/net/nscache.c
+++ b/lib/libc/net/nscache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
*
diff --git a/lib/libc/net/nscachedcli.c b/lib/libc/net/nscachedcli.c
index 9e462b8dc39d..35dbe20f722c 100644
--- a/lib/libc/net/nscachedcli.c
+++ b/lib/libc/net/nscachedcli.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
*
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index bf605ece65f0..308f58f2688d 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -1,8 +1,6 @@
/* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
index 17cfef8af7a2..c7a95f614da8 100644
--- a/lib/libc/net/nslexer.l
+++ b/lib/libc/net/nslexer.l
@@ -2,8 +2,6 @@
/* $NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index 6e90fc73d8c9..7d2f6e208521 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -2,8 +2,6 @@
/* $NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/net/nss_backends.h b/lib/libc/net/nss_backends.h
index 0ec803220ada..9bea37b1c24b 100644
--- a/lib/libc/net/nss_backends.h
+++ b/lib/libc/net/nss_backends.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
index 7f613b6c77ef..ba1e95198ced 100644
--- a/lib/libc/net/nss_compat.c
+++ b/lib/libc/net/nss_compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/net/ntoh.c b/lib/libc/net/ntoh.c
index 7b2bf9edc113..d658c90b68ac 100644
--- a/lib/libc/net/ntoh.c
+++ b/lib/libc/net/ntoh.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 5ff1f0d0f72c..7b92f0816261 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index b321b5a51a2f..13278df11b2a 100644
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -1,8 +1,6 @@
/* $OpenBSD: rcmdsh.c,v 1.7 2002/03/12 00:05:44 millert Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2001, MagniComp
* All rights reserved.
*
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
index ca52a16ffd0e..68d3ce51015d 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libc/net/recv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 5a035e9d32d0..d91c98aa42b7 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -1,8 +1,6 @@
/* $KAME: rthdr.c,v 1.19 2003/06/06 10:48:51 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/net/sctp_sys_calls.c b/lib/libc/net/sctp_sys_calls.c
index 0c5161ab1eab..25b9ec87d195 100644
--- a/lib/libc/net/sctp_sys_calls.c
+++ b/lib/libc/net/sctp_sys_calls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index 2e6083ba4229..ff984363300a 100644
--- a/lib/libc/net/send.c
+++ b/lib/libc/net/send.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
index f56304359a76..9337da5d5d30 100644
--- a/lib/libc/net/sockatmark.c
+++ b/lib/libc/net/sockatmark.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 William C. Fenner. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index 9bfb72d84504..50a73d87dad3 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Bruce Simpson.
* All rights reserved.
*
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
index 5bcfb9f9263e..42ee2054d4e7 100644
--- a/lib/libc/net/vars.c
+++ b/lib/libc/net/vars.c
@@ -1,8 +1,6 @@
/* $KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_branding.c b/lib/libc/posix1e/acl_branding.c
index c8f698f96bbc..84b00636c195 100644
--- a/lib/libc/posix1e/acl_branding.c
+++ b/lib/libc/posix1e/acl_branding.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 7089df7d46e0..56215b9094c6 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_compat.c b/lib/libc/posix1e/acl_compat.c
index 1af2e89db43d..ab1bdf6244cb 100644
--- a/lib/libc/posix1e/acl_compat.c
+++ b/lib/libc/posix1e/acl_compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 12af1fa7a449..fc4c25d1ee49 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 5867196e4373..1bbadd583396 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 59462c8ae6ab..4564dde693b3 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index 221aa7d24a3e..2cffaa33d54c 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_flag.c b/lib/libc/posix1e/acl_flag.c
index d6ca954cc1ab..8ad10c52d9d8 100644
--- a/lib/libc/posix1e/acl_flag.c
+++ b/lib/libc/posix1e/acl_flag.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 49d6b722d2a9..6de41da8abfb 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 7cd45a7d6d25..7f15463e50de 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_from_text_nfs4.c b/lib/libc/posix1e/acl_from_text_nfs4.c
index 31ce2091ee00..5a0b36ab93a3 100644
--- a/lib/libc/posix1e/acl_from_text_nfs4.c
+++ b/lib/libc/posix1e/acl_from_text_nfs4.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 6031199e58e7..b3235016ed1a 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_id_to_name.c b/lib/libc/posix1e/acl_id_to_name.c
index c9a259716f07..aa108098aa87 100644
--- a/lib/libc/posix1e/acl_id_to_name.c
+++ b/lib/libc/posix1e/acl_id_to_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2001, 2008 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index f26ef7e705b7..88a1fc5aaf1c 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index 0fe28a49e30a..ad2f47e62313 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index d064d642838d..fdc12b6f7303 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index cd2696b95916..24fda8480646 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Chris D. Faulhaber
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index bb09d119f988..00848cbd2ed5 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2001, 2008 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_support.h b/lib/libc/posix1e/acl_support.h
index 87692153c4ee..e7f35d5ad68c 100644
--- a/lib/libc/posix1e/acl_support.h
+++ b/lib/libc/posix1e/acl_support.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_support_nfs4.c b/lib/libc/posix1e/acl_support_nfs4.c
index fe6f6f69cf21..7dd7f04daaf3 100644
--- a/lib/libc/posix1e/acl_support_nfs4.c
+++ b/lib/libc/posix1e/acl_support_nfs4.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index 009ceaceabf6..e5fd1f79d1ce 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c
index 66735f91c18d..f9945ab1d410 100644
--- a/lib/libc/posix1e/acl_to_text_nfs4.c
+++ b/lib/libc/posix1e/acl_to_text_nfs4.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 2be16dc5cc0d..d4cb872e2145 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index a1be7fcc1b8f..5a9ddce3a088 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index a8e0abe7afff..6bc9b773c22a 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index 72148eedea4c..f57d1cefee51 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
index d391ba5561d7..b641fc054807 100644
--- a/lib/libc/posix1e/mac_get.c
+++ b/lib/libc/posix1e/mac_get.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
index fee9208b915c..c657f10b45fe 100644
--- a/lib/libc/posix1e/mac_set.c
+++ b/lib/libc/posix1e/mac_set.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index 63a5ec47c4b4..f0665c09c144 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Benno Rice. All rights reserved.
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
*
diff --git a/lib/libc/powerpc/_fpmath.h b/lib/libc/powerpc/_fpmath.h
index 76eaa1eff089..4b7971e4da8a 100644
--- a/lib/libc/powerpc/_fpmath.h
+++ b/lib/libc/powerpc/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/_set_tp.c b/lib/libc/powerpc/gen/_set_tp.c
index 61986f21c697..eeb062f30217 100644
--- a/lib/libc/powerpc/gen/_set_tp.c
+++ b/lib/libc/powerpc/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/flt_rounds.c b/lib/libc/powerpc/gen/flt_rounds.c
index c6b6178bc07d..6294be72422e 100644
--- a/lib/libc/powerpc/gen/flt_rounds.c
+++ b/lib/libc/powerpc/gen/flt_rounds.c
@@ -1,8 +1,6 @@
/* $NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996 Mark Brinicombe
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c
index b8c813e8bb84..b67b1bcb4dc0 100644
--- a/lib/libc/powerpc/gen/fpgetmask.c
+++ b/lib/libc/powerpc/gen/fpgetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c
index 062a565cc570..097e82aa9a41 100644
--- a/lib/libc/powerpc/gen/fpgetround.c
+++ b/lib/libc/powerpc/gen/fpgetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c
index e556123251ec..57152ac50104 100644
--- a/lib/libc/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/powerpc/gen/fpgetsticky.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c
index 4d63552470be..81cd19e57f1b 100644
--- a/lib/libc/powerpc/gen/fpsetmask.c
+++ b/lib/libc/powerpc/gen/fpsetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c
index d1cc134760a5..17f70a0cab64 100644
--- a/lib/libc/powerpc/gen/fpsetround.c
+++ b/lib/libc/powerpc/gen/fpsetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/makecontext.c b/lib/libc/powerpc/gen/makecontext.c
index cf58f53b24b0..d66e82457a4e 100644
--- a/lib/libc/powerpc/gen/makecontext.c
+++ b/lib/libc/powerpc/gen/makecontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Suleiman Souhlal
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/signalcontext.c b/lib/libc/powerpc/gen/signalcontext.c
index 88975593db6c..30e2be848b2b 100644
--- a/lib/libc/powerpc/gen/signalcontext.c
+++ b/lib/libc/powerpc/gen/signalcontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
* All rights reserved.
*
diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c
index 5192d1356153..aa025cca8bc6 100644
--- a/lib/libc/powerpc/gen/syncicache.c
+++ b/lib/libc/powerpc/gen/syncicache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
* Copyright (C) 1995-1997, 1999 TooLs GmbH.
* All rights reserved.
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h
index cc1c268adf29..486e71bfeae8 100644
--- a/lib/libc/powerpc64/SYS.h
+++ b/lib/libc/powerpc64/SYS.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Benno Rice. All rights reserved.
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
*
diff --git a/lib/libc/powerpc64/_fpmath.h b/lib/libc/powerpc64/_fpmath.h
index 76eaa1eff089..4b7971e4da8a 100644
--- a/lib/libc/powerpc64/_fpmath.h
+++ b/lib/libc/powerpc64/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/_set_tp.c b/lib/libc/powerpc64/gen/_set_tp.c
index 541ad2d0d8a4..26009dcf97d0 100644
--- a/lib/libc/powerpc64/gen/_set_tp.c
+++ b/lib/libc/powerpc64/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/flt_rounds.c b/lib/libc/powerpc64/gen/flt_rounds.c
index 39af35c77e1c..6294be72422e 100644
--- a/lib/libc/powerpc64/gen/flt_rounds.c
+++ b/lib/libc/powerpc64/gen/flt_rounds.c
@@ -1,8 +1,6 @@
/* $NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1996 Mark Brinicombe
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/fpgetmask.c b/lib/libc/powerpc64/gen/fpgetmask.c
index b8c813e8bb84..b67b1bcb4dc0 100644
--- a/lib/libc/powerpc64/gen/fpgetmask.c
+++ b/lib/libc/powerpc64/gen/fpgetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/fpgetround.c b/lib/libc/powerpc64/gen/fpgetround.c
index 062a565cc570..097e82aa9a41 100644
--- a/lib/libc/powerpc64/gen/fpgetround.c
+++ b/lib/libc/powerpc64/gen/fpgetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/fpgetsticky.c b/lib/libc/powerpc64/gen/fpgetsticky.c
index e556123251ec..57152ac50104 100644
--- a/lib/libc/powerpc64/gen/fpgetsticky.c
+++ b/lib/libc/powerpc64/gen/fpgetsticky.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/fpsetmask.c b/lib/libc/powerpc64/gen/fpsetmask.c
index 4d63552470be..81cd19e57f1b 100644
--- a/lib/libc/powerpc64/gen/fpsetmask.c
+++ b/lib/libc/powerpc64/gen/fpsetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/fpsetround.c b/lib/libc/powerpc64/gen/fpsetround.c
index 2faee6d5bdfd..17f70a0cab64 100644
--- a/lib/libc/powerpc64/gen/fpsetround.c
+++ b/lib/libc/powerpc64/gen/fpsetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/makecontext.c b/lib/libc/powerpc64/gen/makecontext.c
index de77fda169e0..b01c5c1c40a7 100644
--- a/lib/libc/powerpc64/gen/makecontext.c
+++ b/lib/libc/powerpc64/gen/makecontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Suleiman Souhlal
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/signalcontext.c b/lib/libc/powerpc64/gen/signalcontext.c
index 6157f0657f07..fad9ee16cca2 100644
--- a/lib/libc/powerpc64/gen/signalcontext.c
+++ b/lib/libc/powerpc64/gen/signalcontext.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
* All rights reserved.
*
diff --git a/lib/libc/powerpc64/gen/syncicache.c b/lib/libc/powerpc64/gen/syncicache.c
index d96529bc3833..f9cc8bcde8a0 100644
--- a/lib/libc/powerpc64/gen/syncicache.c
+++ b/lib/libc/powerpc64/gen/syncicache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
* Copyright (C) 1995-1997, 1999 TooLs GmbH.
* All rights reserved.
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index 7607963b65d5..a9471a2ec632 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index ea8570ad7d58..ba543be0ea91 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
index 1c84dbb0acb0..40712216415f 100644
--- a/lib/libc/quad/adddi3.c
+++ b/lib/libc/quad/adddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
index 7cd2d3083ea9..575a35ca91eb 100644
--- a/lib/libc/quad/anddi3.c
+++ b/lib/libc/quad/anddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
index 6fc9084848c0..c2fd87428f5b 100644
--- a/lib/libc/quad/ashldi3.c
+++ b/lib/libc/quad/ashldi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index 78f1d80fd889..b5b1efd28f99 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
index e4073fd925b2..10cb48ca7fe5 100644
--- a/lib/libc/quad/cmpdi2.c
+++ b/lib/libc/quad/cmpdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
index 0b4e725f2fdc..4142056739e6 100644
--- a/lib/libc/quad/divdi3.c
+++ b/lib/libc/quad/divdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index 10c7d69d7012..2e3c18d54107 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 01de0cd34d96..15ab68b1bd51 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index fdaa2db1e2e0..7b6c05e0508d 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index 2dbccc13b1f5..9b13c792549c 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 5912b1f14f83..7167715adc53 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index 7929dd2bad71..0cf7af8bc101 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index f79d8e78f272..264cd6249637 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
index f9f56574ceef..5f4c67c898b3 100644
--- a/lib/libc/quad/iordi3.c
+++ b/lib/libc/quad/iordi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
index 64ad38a9ff0a..56fb0597e366 100644
--- a/lib/libc/quad/lshldi3.c
+++ b/lib/libc/quad/lshldi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
index 9c9fb701c402..4fc9362b06e5 100644
--- a/lib/libc/quad/lshrdi3.c
+++ b/lib/libc/quad/lshrdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
index ef0de7af7d14..9dbf1c3bce1b 100644
--- a/lib/libc/quad/moddi3.c
+++ b/lib/libc/quad/moddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index 40e440542a80..05c84b9e0e9c 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
index 935352580eeb..6af1ea902152 100644
--- a/lib/libc/quad/negdi2.c
+++ b/lib/libc/quad/negdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
index 2e6549bf5ec6..b5480bc17dc5 100644
--- a/lib/libc/quad/notdi2.c
+++ b/lib/libc/quad/notdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index dd5db8140286..e8e3c9857e60 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index 480f0f836993..d496fc6daba7 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
index e1e43ddfd00f..b31f0406e389 100644
--- a/lib/libc/quad/subdi3.c
+++ b/lib/libc/quad/subdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
index 1c07d29a3982..6605896e533d 100644
--- a/lib/libc/quad/ucmpdi2.c
+++ b/lib/libc/quad/ucmpdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
index 7bd6021964c5..8b5a7888faf4 100644
--- a/lib/libc/quad/udivdi3.c
+++ b/lib/libc/quad/udivdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
index f13beeb31ffa..29ce2cba8819 100644
--- a/lib/libc/quad/umoddi3.c
+++ b/lib/libc/quad/umoddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
index a5f1980a2534..ec7f6bd52206 100644
--- a/lib/libc/quad/xordi3.c
+++ b/lib/libc/quad/xordi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index 9c3a0d010934..d404af03c8b4 100644
--- a/lib/libc/regex/cname.h
+++ b/lib/libc/regex/cname.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index 82aefa1193a2..6b156492c005 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 62504bae2d8b..7012d8d602d4 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index fff7eda82de5..508c7d5e1298 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 57c2759f3160..672c824db727 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index f9a05ad193cf..f4cf8b7b741f 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index b85a6d8fe4c7..3d301d8edb8e 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
index aafd14dc2a09..3531aed232ed 100644
--- a/lib/libc/regex/utils.h
+++ b/lib/libc/regex/utils.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
index 06ea60390d40..8ced7081ddff 100644
--- a/lib/libc/resolv/h_errno.c
+++ b/lib/libc/resolv/h_errno.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index c87e93bff32c..d1f3a25c7d7b 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 170274c3fcfe..514a524aa0d4 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index 6cfb3efe6d66..2017909d88b1 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -15,9 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index b3b87e907ca0..732fb1e6646e 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index eded7e3f314e..43e46c19a663 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -15,9 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 2440dfb5edfa..c3c6313730f4 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Portions Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1996-2001, 2003 Internet Software Consortium.
*
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index 3b2bf910df0b..e47562b0970c 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1996-2003 Internet Software Consortium.
*
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
index 976d09c2cbaf..6d31d9282d7a 100644
--- a/lib/libc/resolv/res_state.c
+++ b/lib/libc/resolv/res_state.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index f2ad0349a6a8..5435e7749fdf 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 4422802c4c5c..32bebebf339d 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -1,8 +1,6 @@
/* $NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 08df14b54491..14043358e358 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -1,8 +1,6 @@
/* $NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 663261d631a9..0d4bec06264a 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -5,8 +5,6 @@ static char sccsid[] = "@(#)authdes_prot.c 2.1 88/07/29 4.0 RPCSRC; from 1.6 88
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index bb590c350429..cd6676bda2b3 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 44d3b0c1eacd..8629cba5ea39 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -1,8 +1,6 @@
/* $NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 649cab05a474..669de8aae3c9 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_bcast.c,v 1.3 2000/07/06 03:05:20 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index a1cd7502e2ad..39677737bf5d 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index d3cdf1f08fb8..0dea81d52eb5 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_generic.c,v 1.18 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index b9243ff4d558..d674fbb3847f 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -2,8 +2,6 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index f6a488be7e8d..ad641127ff8a 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_raw.c,v 1.20 2000/12/10 04:12:03 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index de9ec6543d15..4fc374ad6a33 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_simple.c,v 1.21 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index dec1791dcc95..1bc15008b149 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index c2ed109e10bb..b7f0d1fff48c 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 589ff7b3b88b..236e9ed87ff3 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
index 4992c1650b46..5eb99151c0e0 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index abd5eadf3917..84efd5cd2a46 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -1,8 +1,6 @@
/* $NetBSD: getnetconfig.c,v 1.3 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index e0758de8ded3..8d311369f52a 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -1,8 +1,6 @@
/* $NetBSD: getnetpath.c,v 1.3 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index a0604836d973..4c806856629b 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index acb9ce4f6b2c..e705af831d07 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -1,8 +1,6 @@
/* $NetBSD: getrpcent.c,v 1.17 2000/01/22 22:19:17 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 2b2d459c8887..b365678a7ace 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -1,8 +1,6 @@
/* $NetBSD: getrpcport.c,v 1.16 2000/01/22 22:19:18 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 66bd3b4eaaf3..b9bc77a7fd49 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index 5a69bb437e3e..19a2f6c188d5 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -7,8 +7,6 @@
#include <rpc/key_prot.h>
#include "un-namespace.h"
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/mt_misc.h b/lib/libc/rpc/mt_misc.h
index 7f3ced02c148..9cc2349c126e 100644
--- a/lib/libc/rpc/mt_misc.h
+++ b/lib/libc/rpc/mt_misc.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2006 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
index a9ccf1d2ef99..77b522b6ac93 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 591f6d5c91e5..c29f271d6792 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index f91d33abae23..702d58d5bf40 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_clnt.c,v 1.16 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 598de6baf8c2..1049005cfddf 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_getmaps.c,v 1.16 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 03feff190813..c1e0c7a4b88d 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_getport.c,v 1.16 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index cfb69d795bea..bf0167235bf5 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_prot.c,v 1.10 2000/01/22 22:19:18 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index 20d92250ed9d..f892afbc9bd7 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_prot2.c,v 1.14 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 95efae582e57..124120498dcb 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index 05294965c091..4063e8bf895d 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index c0c144fc589d..bfa6a0bca882 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 4506f3068e95..e63538d20c47 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_commondata.c,v 1.7 2000/06/02 23:11:13 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 59036dd23abf..4bcb71f5c94d 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_dtablesize.c,v 1.14 1998/11/15 17:32:43 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 6fbeaf77a7e7..079837d358ee 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index a865d43fc185..50d11ccc8735 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 1e5cd86d7ed4..64516a9fe806 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_soc.c,v 1.6 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index f39d99bfeee3..8c9b8ca22bfb 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index 6cb7204f1a66..39a201c6a7ff 100644
--- a/lib/libc/rpc/rpcb_prot.c
+++ b/lib/libc/rpc/rpcb_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index 2a102a5786be..362184ec79ad 100644
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ b/lib/libc/rpc/rpcb_st_xdr.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpcb_st_xdr.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
index 3e7c4a7c2f1a..08b5d7d49fc5 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/rpcsec_gss_stub.c b/lib/libc/rpc/rpcsec_gss_stub.c
index a24f250521f7..55eb1065c0b0 100644
--- a/lib/libc/rpc/rpcsec_gss_stub.c
+++ b/lib/libc/rpc/rpcsec_gss_stub.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 4adca5c5f13d..7c40c36ce374 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 801b32081a26..a002216e6e53 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 20a84c60c18a..58435af0c13b 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 8f742c39718a..7a24c06e34e0 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -4,8 +4,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index de146b821600..8e5118356dcd 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 54dbb0956a11..5d9baaa81f66 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 37ad3513c716..00bbc5a755fc 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 05da6231af37..91593350453c 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_raw.c,v 1.14 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index a4723c42144f..9b0089b3dd3f 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_run.c,v 1.17 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index fcf4199e611e..46ada7747659 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_simple.c,v 1.20 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index a045903c8285..a35ee6281d77 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 2fe4c12c589d..20c6928a3e55 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index 0f15f2ae4517..6ff1ffdb6f22 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index 8ac7b90e9647..f7ef466ba297 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index afbe64b2ee7f..47dcc95e85dc 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index 54df295000a4..ecdb6adf8ca7 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index 33c17120d33d..526b19faf0cf 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/SYS.h b/lib/libc/sparc64/SYS.h
index 94ad5f9bfac0..0bc7840d9452 100644
--- a/lib/libc/sparc64/SYS.h
+++ b/lib/libc/sparc64/SYS.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/_fpmath.h b/lib/libc/sparc64/_fpmath.h
index 84741157263f..f3238150ad80 100644
--- a/lib/libc/sparc64/_fpmath.h
+++ b/lib/libc/sparc64/_fpmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 2a604ad40d33..e01701cde00c 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_add.c b/lib/libc/sparc64/fpu/fpu_add.c
index e9f29915b437..af493cd5a3e6 100644
--- a/lib/libc/sparc64/fpu/fpu_add.c
+++ b/lib/libc/sparc64/fpu/fpu_add.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_arith.h b/lib/libc/sparc64/fpu/fpu_arith.h
index 1ce5d7cb3b04..292cd708a55f 100644
--- a/lib/libc/sparc64/fpu/fpu_arith.h
+++ b/lib/libc/sparc64/fpu/fpu_arith.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_compare.c b/lib/libc/sparc64/fpu/fpu_compare.c
index b7318372ba83..84b00bf964ee 100644
--- a/lib/libc/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/sparc64/fpu/fpu_compare.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_emu.h b/lib/libc/sparc64/fpu/fpu_emu.h
index 9f9b624e13b8..0822de89e143 100644
--- a/lib/libc/sparc64/fpu/fpu_emu.h
+++ b/lib/libc/sparc64/fpu/fpu_emu.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_extern.h b/lib/libc/sparc64/fpu/fpu_extern.h
index 176e29557738..a5fb9428d077 100644
--- a/lib/libc/sparc64/fpu/fpu_extern.h
+++ b/lib/libc/sparc64/fpu/fpu_extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_qp.c b/lib/libc/sparc64/fpu/fpu_qp.c
index a0711f794547..8578e013b48d 100644
--- a/lib/libc/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/sparc64/fpu/fpu_qp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/fpu/fpu_reg.h b/lib/libc/sparc64/fpu/fpu_reg.h
index cbfcff94c00c..0d213d64e39b 100644
--- a/lib/libc/sparc64/fpu/fpu_reg.h
+++ b/lib/libc/sparc64/fpu/fpu_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/gen/_set_tp.c b/lib/libc/sparc64/gen/_set_tp.c
index 4f1b8378ceab..7632951c4b8c 100644
--- a/lib/libc/sparc64/gen/_set_tp.c
+++ b/lib/libc/sparc64/gen/_set_tp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libc/sparc64/gen/makecontext.c b/lib/libc/sparc64/gen/makecontext.c
index e08caafc834d..42bcc8803060 100644
--- a/lib/libc/sparc64/gen/makecontext.c
+++ b/lib/libc/sparc64/gen/makecontext.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/gen/signalcontext.c b/lib/libc/sparc64/gen/signalcontext.c
index 20460bbda38f..159184513807 100644
--- a/lib/libc/sparc64/gen/signalcontext.c
+++ b/lib/libc/sparc64/gen/signalcontext.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
index cef0dfdf48c7..4475c6d4632a 100644
--- a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap.c b/lib/libc/sparc64/sys/__sparc_utrap.c
index 9d42689ae7dd..7a5dafa5aeb5 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_align.c b/lib/libc/sparc64/sys/__sparc_utrap_align.c
index 6c3d1bd98b8d..9b59826263cd 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_align.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_align.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_emul.c b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
index 19867ebb5aaa..6c6dd1b9b97a 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_emul.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_install.c b/lib/libc/sparc64/sys/__sparc_utrap_install.c
index db6e6ca85407..7b1a5e7a0226 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_install.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_install.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_private.h b/lib/libc/sparc64/sys/__sparc_utrap_private.h
index 1df32b37c8f0..8b9ae9eefc96 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_private.h
+++ b/lib/libc/sparc64/sys/__sparc_utrap_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_setup.c b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
index 6bdb4ba4c894..b8c2d74c0154 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index 069ed64c4e99..f53df35da078 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 1d9034b653d5..242127f36025 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index c9208c0c1c46..f161a6e1e802 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/dprintf.c b/lib/libc/stdio/dprintf.c
index 45d05f752583..7f883ddf3ba6 100644
--- a/lib/libc/stdio/dprintf.c
+++ b/lib/libc/stdio/dprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 84f890e3c38a..063ef841f72c 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993 The Regents of the University of California.
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/fcloseall.c b/lib/libc/stdio/fcloseall.c
index 6248c6123d02..8ee9a6227b79 100644
--- a/lib/libc/stdio/fcloseall.c
+++ b/lib/libc/stdio/fcloseall.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006 Daniel M. Eischen. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index 64d619963e14..fbe37e881428 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index ef6767fb2b1b..b970248a3128 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index bb29c27e1419..7e0f8f957165 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index 9a0f14538fe4..5ecfc4451f67 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index bb94f2ed5559..025a0c2df394 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index ba0736cbb0fc..1e6b9842bcec 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index c592ef0fc224..f161f4325fd3 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index ceb48562fe30..95d0ad997196 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
index edad907fe806..5f13e2dd4b74 100644
--- a/lib/libc/stdio/fgetwc.c
+++ b/lib/libc/stdio/fgetwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index b9077d68fc21..a29f1f6bfb3b 100644
--- a/lib/libc/stdio/fgetwln.c
+++ b/lib/libc/stdio/fgetwln.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index 84fc387ecae4..f47fea79934d 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 81673cd89034..3ac183010ef6 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index b30a06ffd9e5..5e1f06924ac8 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index a034c1674c98..9eed6d7dc8c7 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
index 3d6fddf1b2c1..09d24b85aac8 100644
--- a/lib/libc/stdio/floatio.h
+++ b/lib/libc/stdio/floatio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fmemopen.c b/lib/libc/stdio/fmemopen.c
index 8faf2fa146db..bcf187d20029 100644
--- a/lib/libc/stdio/fmemopen.c
+++ b/lib/libc/stdio/fmemopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2013 Pietro Cerutti <gahr@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index cb71387e0f38..9ab61ba157a4 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 95b71cc065c7..739e1f555e09 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index aa5daf2ca078..f205bdfc3bf5 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index e4ec6f8195e6..32c261aa3685 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index bc7f62265eaf..b10ac52f95d3 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index 666dd8bcc9d1..d16886734335 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index 56357b650979..19da946054b7 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 3ce3663d009a..ff1c65b480d8 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index fce965089a54..3d6cc89b6fa0 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 6d2cfe9b5a3f..d3e093334482 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 5fcd49f23c5f..e933bdabf4d2 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 4bb7c112fb06..c6b8b785918d 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index df73823c58ce..fc792af5fa22 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
index 4b1a31e2a962..983fe5011902 100644
--- a/lib/libc/stdio/funopen.c
+++ b/lib/libc/stdio/funopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 50b32b8eca6e..1a28b6a79c01 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
index bc91c3571f05..a4da7434f0bf 100644
--- a/lib/libc/stdio/fvwrite.h
+++ b/lib/libc/stdio/fvwrite.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index 37691a715c53..151837b29025 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
index b7a8b3909196..c94ffe63a1bc 100644
--- a/lib/libc/stdio/fwide.c
+++ b/lib/libc/stdio/fwide.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
index fb00c2e4b20d..f4342ab6c4e3 100644
--- a/lib/libc/stdio/fwprintf.c
+++ b/lib/libc/stdio/fwprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 53353fcde681..41bb4f6b0384 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index df31be7b5bf1..175607747d65 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 5329810ca14c..ad2df8a72f5d 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index e29dd7136a4c..320f96791ede 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/getdelim.c b/lib/libc/stdio/getdelim.c
index 8d8414266c78..26c608f8d49c 100644
--- a/lib/libc/stdio/getdelim.c
+++ b/lib/libc/stdio/getdelim.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdio/getline.c b/lib/libc/stdio/getline.c
index 3d8d6f51081a..3f35520ed219 100644
--- a/lib/libc/stdio/getline.c
+++ b/lib/libc/stdio/getline.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index b8dc528aa118..c75dcc202cc9 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index fa18f0183fb5..ed0313eb60c2 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
index d27988ba3163..666350bba923 100644
--- a/lib/libc/stdio/getwc.c
+++ b/lib/libc/stdio/getwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
index 2828075520a6..bc3b8a64c662 100644
--- a/lib/libc/stdio/getwchar.c
+++ b/lib/libc/stdio/getwchar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
index 65d77632faf8..1fef1404663a 100644
--- a/lib/libc/stdio/glue.h
+++ b/lib/libc/stdio/glue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 9b6d8ec62eba..e4b16872b188 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index 9bddf89a65b2..a92087e0eae7 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 0cc7496b693e..6fc552a18b2f 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/open_memstream.c b/lib/libc/stdio/open_memstream.c
index 12b7164af98f..a7e0bae9ca3a 100644
--- a/lib/libc/stdio/open_memstream.c
+++ b/lib/libc/stdio/open_memstream.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/open_wmemstream.c b/lib/libc/stdio/open_wmemstream.c
index 1ea7c82e4aa7..d3331aabee74 100644
--- a/lib/libc/stdio/open_wmemstream.c
+++ b/lib/libc/stdio/open_wmemstream.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index 6eeb14893b8c..15007882b79e 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/printf-pos.c b/lib/libc/stdio/printf-pos.c
index dac0a5f88d28..38cf014e98a6 100644
--- a/lib/libc/stdio/printf-pos.c
+++ b/lib/libc/stdio/printf-pos.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 7e7e5c8c128b..83147b2314c1 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/printfcommon.h b/lib/libc/stdio/printfcommon.h
index 989b2605612d..97acc5398ac3 100644
--- a/lib/libc/stdio/printfcommon.h
+++ b/lib/libc/stdio/printfcommon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/printflocal.h b/lib/libc/stdio/printflocal.h
index cf6d1e4daec3..3cef7bd02cdd 100644
--- a/lib/libc/stdio/printflocal.h
+++ b/lib/libc/stdio/printflocal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index 1713792e1909..c62d13f5ea4e 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 12adf86f3c34..1721a986f854 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index fe80ddbba792..b5fa01a0c41d 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index ba9853db9c8a..fc1d81c7c25c 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
index 510a3af70eda..56acf5081c1c 100644
--- a/lib/libc/stdio/putwc.c
+++ b/lib/libc/stdio/putwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
index a042e449e03a..8673bd5065fa 100644
--- a/lib/libc/stdio/putwchar.c
+++ b/lib/libc/stdio/putwchar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index dbbcb4912aa2..b4b4e015c91f 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index b92e14ad6c16..2e984baf9360 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 2449de397160..133e3f43dd0c 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index 530fb67b0ff1..bdc0311674e1 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index baffba9f9018..55aa420fa6f5 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 7c60c77dce9c..5c65f976c9de 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index b760e1a510f2..af5eb3cabf6e 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 03a3c7263125..01db02ea9b64 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index 8ee0b4429340..e2dd2ddd6c0c 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 8a7611f384a2..0f38d15cd2ce 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index cab6408535a8..ae79451a47fc 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 4f093f12dc80..c92fb4fb0e83 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index 39bb7346099c..1f6ecc65a8ad 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index e45449c16d53..c305ac15d943 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 2d7bd90e08a4..e15746f31a4d 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
index e5ee1be2884e..e5a2be1d97be 100644
--- a/lib/libc/stdio/tmpfile.c
+++ b/lib/libc/stdio/tmpfile.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index c4d56778027d..ce32dcc28149 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 2e140c965a02..a24a5a26ade4 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
index d7705c8199a2..b47caf4b3248 100644
--- a/lib/libc/stdio/ungetwc.c
+++ b/lib/libc/stdio/ungetwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index f3545f149a73..8feb23da758e 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -1,8 +1,6 @@
/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c
index 73f87b0f0cfa..454b0f9fdba7 100644
--- a/lib/libc/stdio/vdprintf.c
+++ b/lib/libc/stdio/vdprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 29fbd95b399f..4779ad7a9902 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index bd3830c19907..8f7c1e81638c 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index 91238fed138a..f130c14b1a2c 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index fb9c0a961fd7..aedc249f8cff 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 7a4cc69dec98..f98f1107c872 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 15024fdfc09c..309d00c460d2 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index f108a6d7871a..8d13a5041cd3 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 9e03e7126d4a..906a74c24b38 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 771dee0c1c42..4328fc15bfad 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
index 9bd31abe992c..2585888cfbca 100644
--- a/lib/libc/stdio/vswprintf.c
+++ b/lib/libc/stdio/vswprintf.c
@@ -1,8 +1,6 @@
/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index d3f96774a71c..c4a10379c2fc 100644
--- a/lib/libc/stdio/vswscanf.c
+++ b/lib/libc/stdio/vswscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
index f0aca08ac65a..e09a30eccca5 100644
--- a/lib/libc/stdio/vwprintf.c
+++ b/lib/libc/stdio/vwprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index 6f80c249d2d5..730beeef7f20 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index e1aa70243e94..5bc3c4dc3e77 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
index c1d1f2656b7a..fdffa8614634 100644
--- a/lib/libc/stdio/wprintf.c
+++ b/lib/libc/stdio/wprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index 33e0f3805d1c..22ce9bd1f89b 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 1733d69ee44d..70f8247c076b 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdio/xprintf.c b/lib/libc/stdio/xprintf.c
index 2c7eb6ce9414..b00b4cb3e430 100644
--- a/lib/libc/stdio/xprintf.c
+++ b/lib/libc/stdio/xprintf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c
index 7312ac6e0694..3c831d129388 100644
--- a/lib/libc/stdio/xprintf_errno.c
+++ b/lib/libc/stdio/xprintf_errno.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libc/stdio/xprintf_float.c b/lib/libc/stdio/xprintf_float.c
index e07227526792..ad17eb272032 100644
--- a/lib/libc/stdio/xprintf_float.c
+++ b/lib/libc/stdio/xprintf_float.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/stdio/xprintf_hexdump.c b/lib/libc/stdio/xprintf_hexdump.c
index 73f98a8fb53f..a2956ba27b65 100644
--- a/lib/libc/stdio/xprintf_hexdump.c
+++ b/lib/libc/stdio/xprintf_hexdump.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libc/stdio/xprintf_int.c b/lib/libc/stdio/xprintf_int.c
index 3a5c2d81893a..bbccc3e78426 100644
--- a/lib/libc/stdio/xprintf_int.c
+++ b/lib/libc/stdio/xprintf_int.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/stdio/xprintf_quote.c b/lib/libc/stdio/xprintf_quote.c
index 5b102b10c632..0edcd30e9c55 100644
--- a/lib/libc/stdio/xprintf_quote.c
+++ b/lib/libc/stdio/xprintf_quote.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libc/stdio/xprintf_str.c b/lib/libc/stdio/xprintf_str.c
index 19b37a4c9816..d46fa85841aa 100644
--- a/lib/libc/stdio/xprintf_str.c
+++ b/lib/libc/stdio/xprintf_str.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/stdio/xprintf_time.c b/lib/libc/stdio/xprintf_time.c
index fc86fc56d01b..debfac579fa6 100644
--- a/lib/libc/stdio/xprintf_time.c
+++ b/lib/libc/stdio/xprintf_time.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/stdio/xprintf_vis.c b/lib/libc/stdio/xprintf_vis.c
index ab1735b8543d..819f09ff1d8f 100644
--- a/lib/libc/stdio/xprintf_vis.c
+++ b/lib/libc/stdio/xprintf_vis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 72c93a115ec0..2335c400da77 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
index 0e4c94c68286..367b114f745d 100644
--- a/lib/libc/stdlib/abs.c
+++ b/lib/libc/stdlib/abs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index bc9ad3ebd7bf..eda57032f670 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
index fdf2fc158380..29610676edaa 100644
--- a/lib/libc/stdlib/atexit.h
+++ b/lib/libc/stdlib/atexit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index c7e0676188ea..0458eb968331 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index c268a8c1569d..9f92fcdad4be 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index 35e83fbf6181..bd8ef07c544d 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
index bfbdb976501a..093fde5d9f91 100644
--- a/lib/libc/stdlib/atoll.c
+++ b/lib/libc/stdlib/atoll.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index 432bb918f353..8303f971b562 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index b7efb1dfc595..0bafbe607037 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index efd7f55f68c6..521d05a554b1 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 5d445e18d93b..e90eccd3d3d3 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sean C. Farley <scf@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index b6bdf8a1eeaf..3929b321dca9 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -1,8 +1,6 @@
/* $NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index 7ad9ae994444..d2db9916d8d8 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index d2b7c1cd8cac..2d5d943a4d82 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015 Nuxi, https://nuxi.nl/
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index c39f67533b9a..db0a95384655 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2014 David T. Chisnall
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
index 7af863502ee5..35e3dee79d36 100644
--- a/lib/libc/stdlib/imaxabs.c
+++ b/lib/libc/stdlib/imaxabs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index 4d9f77546b9a..adcab0b14dbb 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
index a770b2cf4357..ef068826c2f3 100644
--- a/lib/libc/stdlib/labs.c
+++ b/lib/libc/stdlib/labs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index f55ad6de4faf..745c5667e6a4 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index 6b405f0314d1..2bfbada80d93 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index 47c13ee30e11..197b48f3f51e 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 3a47e424e4da..55b3a0c4fae1 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c
index 328528537ab5..3e4d4c096ef5 100644
--- a/lib/libc/stdlib/ptsname.c
+++ b/lib/libc/stdlib/ptsname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index dab451f58a48..1ccc518d396f 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/quick_exit.c b/lib/libc/stdlib/quick_exit.c
index 676dc287a511..4d81a35f5375 100644
--- a/lib/libc/stdlib/quick_exit.c
+++ b/lib/libc/stdlib/quick_exit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Chisnall
* All rights reserved.
*
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 4a0a764c81da..205f7765a444 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index be2c3d4f058b..2e0456a9edc3 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 4a1bb3b6e7dd..fe8fc86696fb 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 470d55bd736c..a85b5a3c036b 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, M. Warner Losh <imp@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 9b0ba94473cb..d19f641cfdee 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index 035b17136c3f..af038fe17caf 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index b26451232170..72903e8df00e 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 25212d8930ad..8c93653f002d 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index c87aefb1cd22..16a8196a3562 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index b3fd56186206..7bc1c80a3a32 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 50ce1cbf07a8..ed58dd8ae662 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 58a9b23b566d..dc40e0e98919 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index 80937036de75..769967727ac5 100644
--- a/lib/libc/stdlib/strtoumax.c
+++ b/lib/libc/stdlib/strtoumax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 77a74995afbd..9371680b9721 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index 343183256718..2b298e45a6d6 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index 4db89efdad11..89703ec8be3c 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Gary Mills
* Copyright 2011, Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1994 Powerdog Industries. All rights reserved.
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index f9d33eb8d927..362cec3958ce 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* Copyright (c) 1997 FreeBSD Inc.
* All rights reserved.
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index f65fb179fc3f..2e44415b9940 100644
--- a/lib/libc/stdtime/timelocal.h
+++ b/lib/libc/stdtime/timelocal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2002 FreeBSD Project.
* All rights reserved.
*
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 96cd49039eee..f1178a660b2b 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 141416d0afec..c424de560f6c 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 738ef90ce091..42a94ef7383d 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
index dbd894b9655b..3fd94521d623 100644
--- a/lib/libc/string/ffsl.c
+++ b/lib/libc/string/ffsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/ffsll.c b/lib/libc/string/ffsll.c
index 91886de2f127..e19df91d1f03 100644
--- a/lib/libc/string/ffsll.c
+++ b/lib/libc/string/ffsll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index d9edc41f9599..7145b909f026 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index 60370cf7d832..19485b2f787e 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/flsll.c b/lib/libc/string/flsll.c
index 275aaa0e2e15..b12f12f2d0d7 100644
--- a/lib/libc/string/flsll.c
+++ b/lib/libc/string/flsll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index e4c9d0e17edd..6102a5bdedaf 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 0dd9edecb704..8020333dec3b 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index c8d5d92985e2..d2d0f27d35ef 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
index 799bdfd189b2..3fd05dfdbbc9 100644
--- a/lib/libc/string/memmem.c
+++ b/lib/libc/string/memmem.c
@@ -1,8 +1,5 @@
/*-
- * SPDX-License-Identifier: MIT
- *
* Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
- * Copyright (c) 2005-2014 Rich Felker, et al.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 7d9909a76083..ad0d513933fe 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
index f31cce131777..beb115948d8a 100644
--- a/lib/libc/string/stpcpy.c
+++ b/lib/libc/string/stpcpy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999
* David E. O'Brien
* Copyright (c) 1988, 1993
diff --git a/lib/libc/string/stpncpy.c b/lib/libc/string/stpncpy.c
index d8267cc812c7..df70dc608cce 100644
--- a/lib/libc/string/stpncpy.c
+++ b/lib/libc/string/stpncpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index 60b5bb4f0c4c..c72a660508c4 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index b70c2195a94e..cca16dc7bb63 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index adaad598ec22..07a3c08c1a2f 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index 61244da4519c..ab83b3995a44 100644
--- a/lib/libc/string/strchr.c
+++ b/lib/libc/string/strchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strchrnul.c b/lib/libc/string/strchrnul.c
index 81c52afcc73b..893468cbdcbc 100644
--- a/lib/libc/string/strchrnul.c
+++ b/lib/libc/string/strchrnul.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Niclas Zeising
* All rights reserved.
*
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 63cb4468415b..9daf624acce0 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 7aa2c2a642c4..7675e0a3ddf5 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 3eb0aa81eff5..8a48d0d0d732 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 6e07c8c920d2..3879a3b085c7 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index 45ed95c2ea9d..8e90aa05fcb9 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index c5ac55ed3bc1..1d7a385bd9ea 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 811ac3a89e6d..2bc1f2b1febb 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, 2010 Xin LI <delphij@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index 50016be21ea1..a73dd0ede401 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index 116fc53f92f4..6a0e553daa3f 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index c68fe005fcbc..4967a9483e64 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 3c02ccae41d8..39074035084c 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strnlen.c b/lib/libc/string/strnlen.c
index fca7ad260ef8..f44151f730dc 100644
--- a/lib/libc/string/strnlen.c
+++ b/lib/libc/string/strnlen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
index 756399fea902..4de757d5996f 100644
--- a/lib/libc/string/strnstr.c
+++ b/lib/libc/string/strnstr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index 964379e19074..565ef82f11d3 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
index 6afb8c1a497f..f84ffb78c438 100644
--- a/lib/libc/string/strrchr.c
+++ b/lib/libc/string/strrchr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 5de452109df7..73c61af8115f 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index 5f3292d10255..7c461a3dbb80 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index f2e9f2706ba7..5dbac0a67857 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index fe757315f62c..18e60d579881 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -1,8 +1,7 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 2005-2014 Rich Felker, et al.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
* This code is derived from software contributed to Berkeley by
* Chris Torek.
*
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 46e40bfa4a61..063a554339a6 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Softweyr LLC. All rights reserved.
*
* strtok_r, from Berkeley strtok
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 3252173430f2..06ae6393069d 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 1a30ce813784..84633094be3b 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/wcpcpy.c b/lib/libc/string/wcpcpy.c
index 41b7c5178269..df63d72a0463 100644
--- a/lib/libc/string/wcpcpy.c
+++ b/lib/libc/string/wcpcpy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999
* David E. O'Brien
* Copyright (c) 1988, 1993
diff --git a/lib/libc/string/wcpncpy.c b/lib/libc/string/wcpncpy.c
index 58b7d39aa3cf..87b361c9737d 100644
--- a/lib/libc/string/wcpncpy.c
+++ b/lib/libc/string/wcpncpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/wcscasecmp.c b/lib/libc/string/wcscasecmp.c
index 1f75ef93cdd1..01435432722c 100644
--- a/lib/libc/string/wcscasecmp.c
+++ b/lib/libc/string/wcscasecmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 7428ba3364f2..7ae4e801157a 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 1375ed9181cf..1df1fe6cd520 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index 7205238d5637..c2abe4c797f7 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
index d8ef9320f8df..dac3dfdde1e4 100644
--- a/lib/libc/string/wcscoll.c
+++ b/lib/libc/string/wcscoll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2017 Nexenta Systems, Inc.
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index b400fae1cb5c..0c6e1f28f711 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index a0db7157e9e0..7729dc8ab381 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcsdup.c b/lib/libc/string/wcsdup.c
index eecc0557d284..1e5db9258a05 100644
--- a/lib/libc/string/wcsdup.c
+++ b/lib/libc/string/wcsdup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Tim J. Robbins.
* All rights reserved.
*
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index f954b7351fe5..2df94777d51f 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index ca60d587004f..b104a0622a6e 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index cfd3aa23cc99..ca3004e03cb9 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcsncasecmp.c b/lib/libc/string/wcsncasecmp.c
index 34833d185fdf..a42d98c92c9c 100644
--- a/lib/libc/string/wcsncasecmp.c
+++ b/lib/libc/string/wcsncasecmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index eb13fab8de34..5a243477db5b 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 55c88f60e6fa..8236d969feef 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index f86e40fe9536..215e9a115156 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/wcsnlen.c b/lib/libc/string/wcsnlen.c
index f7e30d766c02..f03cf76c05ae 100644
--- a/lib/libc/string/wcsnlen.c
+++ b/lib/libc/string/wcsnlen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 0e9ccf66e312..2ff71ba92f61 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index 73a0395fdc41..37c81ec8cdb7 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
*
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 2b08acbd94f6..6569206208b0 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 74921fecf047..ce598a698969 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
index b4bdc869a2e1..441fbd444854 100644
--- a/lib/libc/string/wcstok.c
+++ b/lib/libc/string/wcstok.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Softweyr LLC. All rights reserved.
*
* strtok_r, from Berkeley strtok
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index 3a8805f1b754..bac979b5b9f0 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
index 326e1117909c..3d6c9601db01 100644
--- a/lib/libc/string/wcsxfrm.c
+++ b/lib/libc/string/wcsxfrm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 42ae286aaec7..cab89c9ade4f 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index f1b1b00eb5da..fdb1f986f3a4 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 30956eb4f483..c10770ce4ec5 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 5e8da9f4004c..05cfd1082afe 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index fcf40efb8e32..0e96356ec007 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c
index ff73a6a16fb5..8a065bf72002 100644
--- a/lib/libc/sys/__error.c
+++ b/lib/libc/sys/__error.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libc/sys/__vdso_gettimeofday.c b/lib/libc/sys/__vdso_gettimeofday.c
index 3749e0473af2..0368b9787efc 100644
--- a/lib/libc/sys/__vdso_gettimeofday.c
+++ b/lib/libc/sys/__vdso_gettimeofday.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c
index cf95986973e2..e7e701b2e509 100644
--- a/lib/libc/sys/clock_gettime.c
+++ b/lib/libc/sys/clock_gettime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c
index f61cf426cc30..e85574a6e0e3 100644
--- a/lib/libc/sys/fcntl.c
+++ b/lib/libc/sys/fcntl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c
index f24cd41269db..5b1252314c39 100644
--- a/lib/libc/sys/gettimeofday.c
+++ b/lib/libc/sys/gettimeofday.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/sys/sigwait.c b/lib/libc/sys/sigwait.c
index ad485d0c5241..b21cabdeac55 100644
--- a/lib/libc/sys/sigwait.c
+++ b/lib/libc/sys/sigwait.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 davidxu@freebsd.org
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
index 655fd2b7f3ba..13d7c2743bf5 100644
--- a/lib/libc/uuid/uuid_compare.c
+++ b/lib/libc/uuid/uuid_compare.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
index 5ff4732f9792..da3f1d39f78d 100644
--- a/lib/libc/uuid/uuid_create.c
+++ b/lib/libc/uuid/uuid_create.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
index 0fd68712c7b5..6e85ae7fb768 100644
--- a/lib/libc/uuid/uuid_create_nil.c
+++ b/lib/libc/uuid/uuid_create_nil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
index 885cb109c383..e4c48e5253a1 100644
--- a/lib/libc/uuid/uuid_equal.c
+++ b/lib/libc/uuid/uuid_equal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
index 3eeefe5038e9..b09a04df875d 100644
--- a/lib/libc/uuid/uuid_from_string.c
+++ b/lib/libc/uuid/uuid_from_string.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
index 513f27e753f6..e5695ee4f60e 100644
--- a/lib/libc/uuid/uuid_hash.c
+++ b/lib/libc/uuid/uuid_hash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index 893b2a305f44..ee1865349dee 100644
--- a/lib/libc/uuid/uuid_is_nil.c
+++ b/lib/libc/uuid/uuid_is_nil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c
index 89e7050dc2fe..a7cfd7d17393 100644
--- a/lib/libc/uuid/uuid_stream.c
+++ b/lib/libc/uuid/uuid_stream.c
@@ -1,8 +1,6 @@
/* $NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
index 7d362c7564e8..35f8581bfe00 100644
--- a/lib/libc/uuid/uuid_to_string.c
+++ b/lib/libc/uuid/uuid_to_string.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index fcf4e9029074..2d99f58d81bf 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr.c,v 1.22 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index f081c8644872..a11c7a11545c 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_array.c,v 1.12 2000/01/22 22:19:18 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index d77a2e666d0e..1f16a4e44da7 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_float.c,v 1.23 2000/07/17 04:59:51 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 423b647e4bed..ecefb2ec38db 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_mem.c,v 1.15 2000/01/22 22:19:18 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index 3ecae9a1ab44..f818ed94b122 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_rec.c,v 1.18 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index 76fc115dd30c..9acdd9640063 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_reference.c,v 1.13 2000/01/22 22:19:18 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
index 71a6f4e8279b..f4b287449e9f 100644
--- a/lib/libc/xdr/xdr_sizeof.c
+++ b/lib/libc/xdr/xdr_sizeof.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 0d179f9802f9..0065154a0cd7 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -1,8 +1,6 @@
/* $NetBSD: xdr_stdio.c,v 1.14 2000/01/22 22:19:19 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index aa7c7123a04b..bb9096bb289f 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 4f3d921706f7..b04966f5c67c 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* Copyright (c) 1998 Bill Paul <wpaul@ctr.columbia.edu>
* All rights reserved.
diff --git a/lib/libc_nonshared/__stub.c b/lib/libc_nonshared/__stub.c
index b4a75488f8f5..495f0aa50a16 100644
--- a/lib/libc_nonshared/__stub.c
+++ b/lib/libc_nonshared/__stub.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index 4c89a5d9cf01..fca63eebd9ec 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 1dadd9c64fe7..2c42d6c2214e 100644
--- a/lib/libcalendar/calendar.h
+++ b/lib/libcalendar/calendar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 9ab0f8a7064d..8bb3e1c46a97 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index 40242958bfaf..d99a4c21c0f5 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1997, 1998, 1999, 2002 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 4aab63b31952..5c14740c6ed8 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index b123d2747ca9..4561b0b7e86c 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -1,10 +1,7 @@
/*
* Taken from the original FreeBSD user SCSI library.
*/
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 1994 HD Associates
+/* Copyright (c) 1994 HD Associates
* (contact: dufault@hda.com)
* All rights reserved.
*
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index f73f46bd0006..f82100c69faf 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c
index 5e85bbe421be..dbe57b129973 100644
--- a/lib/libcompat/4.3/re_comp.c
+++ b/lib/libcompat/4.3/re_comp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 5c44b2b311ef..cb7852449f1b 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 6ef898e595ca..eea1c6fd1c89 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index abd7522e0fa9..33186cd4de95 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index 0a920e241f9e..19b84ceb831d 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Michael Bretterklieber
* All rights reserved.
*
diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c
index 804da07316d2..cab7405bfd60 100644
--- a/lib/libcrypt/crypt-sha256.c
+++ b/lib/libcrypt/crypt-sha256.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libcrypt/crypt-sha512.c b/lib/libcrypt/crypt-sha512.c
index f37927cf3123..8e0054fb5a89 100644
--- a/lib/libcrypt/crypt-sha512.c
+++ b/lib/libcrypt/crypt-sha512.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index f95b4c9b4349..623809e5afce 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Mark Murray
* Copyright (c) 2014 Dag-Erling Smørgrav
* All rights reserved.
diff --git a/lib/libcrypt/crypt.h b/lib/libcrypt/crypt.h
index 031067099b33..b33ad0943e29 100644
--- a/lib/libcrypt/crypt.h
+++ b/lib/libcrypt/crypt.h
@@ -1,7 +1,5 @@
/* LINTLIBRARY */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1999
* Mark Murray. All rights reserved.
*
diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c
index 4c7c044bfcdf..0f63ce04214c 100644
--- a/lib/libcrypt/misc.c
+++ b/lib/libcrypt/misc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999
* University of California. All rights reserved.
*
diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c
index 98fe6d1f673a..dbd02d0fba41 100644
--- a/lib/libdevinfo/devinfo.c
+++ b/lib/libdevinfo/devinfo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index e096e1dc1982..f94644600aeb 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/lib/libdevinfo/devinfo_var.h b/lib/libdevinfo/devinfo_var.h
index 5b14341f3841..bbc5ee183e11 100644
--- a/lib/libdevinfo/devinfo_var.h
+++ b/lib/libdevinfo/devinfo_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 2da7eafa4fd8..68b5028c7c9a 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index f162a6cf2dbb..9471f934ba25 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/devstat.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 926bd02d9e8f..7dc70b092835 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2016 Dag-Erling Smørgrav
* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
* All rights reserved.
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index d688b07d24d1..aaa22ed2790e 100644
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2014 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 0aa23c91dde3..f2510831c00c 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index 60bad13f7700..319fca92b847 100644
--- a/lib/libfetch/fetch.h
+++ b/lib/libfetch/fetch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index a7e41bab3289..ab6b4b7089e8 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index b71897e830e5..814c4a3246ce 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 8abf2e9bff5a..fe4e9dec63d2 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2014 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/libgeom/geom_ctl.c b/lib/libgeom/geom_ctl.c
index 1d5c52fc3779..58976a90519a 100644
--- a/lib/libgeom/geom_ctl.c
+++ b/lib/libgeom/geom_ctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c
index f3d7ba9deb03..3fe1e72ca822 100644
--- a/lib/libgeom/geom_getxml.c
+++ b/lib/libgeom/geom_getxml.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index ebf7868c3c65..c87dd310bf79 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libgeom/geom_util.c b/lib/libgeom/geom_util.c
index 79a456a81a5a..54844c6e451c 100644
--- a/lib/libgeom/geom_util.c
+++ b/lib/libgeom/geom_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 5f4636f9368b..2a373d7f31d5 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 075d2d21f26c..73d43352ee84 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/lib/libgssapi/context.h b/lib/libgssapi/context.h
index dcb08df2a3a8..ac162aa1d6ac 100644
--- a/lib/libgssapi/context.h
+++ b/lib/libgssapi/context.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/cred.h b/lib/libgssapi/cred.h
index 3e6e9f25339b..e6fed6f88b93 100644
--- a/lib/libgssapi/cred.h
+++ b/lib/libgssapi/cred.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_accept_sec_context.c b/lib/libgssapi/gss_accept_sec_context.c
index 2cab71ee3dfd..0fa739c96a9e 100644
--- a/lib/libgssapi/gss_accept_sec_context.c
+++ b/lib/libgssapi/gss_accept_sec_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_acquire_cred.c b/lib/libgssapi/gss_acquire_cred.c
index 5c04a97c28ee..f6ae4d1f700c 100644
--- a/lib/libgssapi/gss_acquire_cred.c
+++ b/lib/libgssapi/gss_acquire_cred.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_add_cred.c b/lib/libgssapi/gss_add_cred.c
index a8955b200d00..34e29b1a2b71 100644
--- a/lib/libgssapi/gss_add_cred.c
+++ b/lib/libgssapi/gss_add_cred.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_add_oid_set_member.c b/lib/libgssapi/gss_add_oid_set_member.c
index 2c926c483926..57d3499cbd1f 100644
--- a/lib/libgssapi/gss_add_oid_set_member.c
+++ b/lib/libgssapi/gss_add_oid_set_member.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_buffer_set.c b/lib/libgssapi/gss_buffer_set.c
index fa084573f1b1..100dd4d58d4d 100644
--- a/lib/libgssapi/gss_buffer_set.c
+++ b/lib/libgssapi/gss_buffer_set.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004, PADL Software Pty Ltd.
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_canonicalize_name.c b/lib/libgssapi/gss_canonicalize_name.c
index 1967555a4e60..28940b9dbbba 100644
--- a/lib/libgssapi/gss_canonicalize_name.c
+++ b/lib/libgssapi/gss_canonicalize_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_compare_name.c b/lib/libgssapi/gss_compare_name.c
index 327a6a728744..05b28f600ac6 100644
--- a/lib/libgssapi/gss_compare_name.c
+++ b/lib/libgssapi/gss_compare_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_context_time.c b/lib/libgssapi/gss_context_time.c
index 86f04696733c..585ebd690875 100644
--- a/lib/libgssapi/gss_context_time.c
+++ b/lib/libgssapi/gss_context_time.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_create_empty_oid_set.c b/lib/libgssapi/gss_create_empty_oid_set.c
index e7d1f77c91d2..c35f99f3120d 100644
--- a/lib/libgssapi/gss_create_empty_oid_set.c
+++ b/lib/libgssapi/gss_create_empty_oid_set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_decapsulate_token.c b/lib/libgssapi/gss_decapsulate_token.c
index d48a854f9267..65ff46ab3c1a 100644
--- a/lib/libgssapi/gss_decapsulate_token.c
+++ b/lib/libgssapi/gss_decapsulate_token.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_delete_sec_context.c
index 151147010c12..b4b087f93142 100644
--- a/lib/libgssapi/gss_delete_sec_context.c
+++ b/lib/libgssapi/gss_delete_sec_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_display_name.c b/lib/libgssapi/gss_display_name.c
index 907ab0f22504..61faabac907e 100644
--- a/lib/libgssapi/gss_display_name.c
+++ b/lib/libgssapi/gss_display_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_display_status.c b/lib/libgssapi/gss_display_status.c
index b8ff12c4c3cb..b2a22d21fb48 100644
--- a/lib/libgssapi/gss_display_status.c
+++ b/lib/libgssapi/gss_display_status.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_duplicate_name.c b/lib/libgssapi/gss_duplicate_name.c
index 02aa2ccf6f8b..c6d07ac4e2b4 100644
--- a/lib/libgssapi/gss_duplicate_name.c
+++ b/lib/libgssapi/gss_duplicate_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_duplicate_oid.c b/lib/libgssapi/gss_duplicate_oid.c
index c61dedd6cb77..591508d8fa58 100644
--- a/lib/libgssapi/gss_duplicate_oid.c
+++ b/lib/libgssapi/gss_duplicate_oid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_encapsulate_token.c b/lib/libgssapi/gss_encapsulate_token.c
index e7ab7f84ff7a..0e33e191ec85 100644
--- a/lib/libgssapi/gss_encapsulate_token.c
+++ b/lib/libgssapi/gss_encapsulate_token.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_export_name.c b/lib/libgssapi/gss_export_name.c
index 5b7c32955539..49174bbcafd0 100644
--- a/lib/libgssapi/gss_export_name.c
+++ b/lib/libgssapi/gss_export_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_export_sec_context.c b/lib/libgssapi/gss_export_sec_context.c
index c94e81a9a844..a600f280048f 100644
--- a/lib/libgssapi/gss_export_sec_context.c
+++ b/lib/libgssapi/gss_export_sec_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_get_mic.c b/lib/libgssapi/gss_get_mic.c
index e8b4e52a0df3..b55a796dedad 100644
--- a/lib/libgssapi/gss_get_mic.c
+++ b/lib/libgssapi/gss_get_mic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_import_name.c b/lib/libgssapi/gss_import_name.c
index efc02d5f3028..3d8079d2dea9 100644
--- a/lib/libgssapi/gss_import_name.c
+++ b/lib/libgssapi/gss_import_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_import_sec_context.c b/lib/libgssapi/gss_import_sec_context.c
index f3c59b0e877b..0ab138ecae98 100644
--- a/lib/libgssapi/gss_import_sec_context.c
+++ b/lib/libgssapi/gss_import_sec_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_indicate_mechs.c b/lib/libgssapi/gss_indicate_mechs.c
index aab3ff4e32ce..ec4350f8eeb1 100644
--- a/lib/libgssapi/gss_indicate_mechs.c
+++ b/lib/libgssapi/gss_indicate_mechs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_init_sec_context.c b/lib/libgssapi/gss_init_sec_context.c
index 04a1e3eab3d2..d8f06ab3e819 100644
--- a/lib/libgssapi/gss_init_sec_context.c
+++ b/lib/libgssapi/gss_init_sec_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_context.c b/lib/libgssapi/gss_inquire_context.c
index 207e1c357e9c..59e03e819284 100644
--- a/lib/libgssapi/gss_inquire_context.c
+++ b/lib/libgssapi/gss_inquire_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_cred.c b/lib/libgssapi/gss_inquire_cred.c
index 60984371558a..c51f07e55841 100644
--- a/lib/libgssapi/gss_inquire_cred.c
+++ b/lib/libgssapi/gss_inquire_cred.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_cred_by_mech.c b/lib/libgssapi/gss_inquire_cred_by_mech.c
index b8394fa3e94d..d9c21bac2156 100644
--- a/lib/libgssapi/gss_inquire_cred_by_mech.c
+++ b/lib/libgssapi/gss_inquire_cred_by_mech.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_cred_by_oid.c b/lib/libgssapi/gss_inquire_cred_by_oid.c
index f564f3636338..fcb54a1d95bd 100644
--- a/lib/libgssapi/gss_inquire_cred_by_oid.c
+++ b/lib/libgssapi/gss_inquire_cred_by_oid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004, PADL Software Pty Ltd.
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_mechs_for_name.c b/lib/libgssapi/gss_inquire_mechs_for_name.c
index d171ef2b5bd8..68918df7fd54 100644
--- a/lib/libgssapi/gss_inquire_mechs_for_name.c
+++ b/lib/libgssapi/gss_inquire_mechs_for_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_names_for_mech.c b/lib/libgssapi/gss_inquire_names_for_mech.c
index 4d683075290c..21f03afb648b 100644
--- a/lib/libgssapi/gss_inquire_names_for_mech.c
+++ b/lib/libgssapi/gss_inquire_names_for_mech.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_inquire_sec_context_by_oid.c b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
index b4a4670b60be..5a9014210d1b 100644
--- a/lib/libgssapi/gss_inquire_sec_context_by_oid.c
+++ b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_krb5.c b/lib/libgssapi/gss_krb5.c
index 36b6f3556632..5150f8564a04 100644
--- a/lib/libgssapi/gss_krb5.c
+++ b/lib/libgssapi/gss_krb5.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_mech_switch.c b/lib/libgssapi/gss_mech_switch.c
index 4ef6e50182ca..2d742e7ee232 100644
--- a/lib/libgssapi/gss_mech_switch.c
+++ b/lib/libgssapi/gss_mech_switch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_names.c b/lib/libgssapi/gss_names.c
index 663a686d551b..02775ec72db3 100644
--- a/lib/libgssapi/gss_names.c
+++ b/lib/libgssapi/gss_names.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_oid_to_str.c b/lib/libgssapi/gss_oid_to_str.c
index 836b149676d8..05e0d73887d8 100644
--- a/lib/libgssapi/gss_oid_to_str.c
+++ b/lib/libgssapi/gss_oid_to_str.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 The Regents of the University of Michigan.
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_pname_to_uid.c b/lib/libgssapi/gss_pname_to_uid.c
index 9ee23a17c345..eb560b9e4248 100644
--- a/lib/libgssapi/gss_pname_to_uid.c
+++ b/lib/libgssapi/gss_pname_to_uid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/lib/libgssapi/gss_process_context_token.c b/lib/libgssapi/gss_process_context_token.c
index 2a91ece95d26..0b4d7ec9bfca 100644
--- a/lib/libgssapi/gss_process_context_token.c
+++ b/lib/libgssapi/gss_process_context_token.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_pseudo_random.c b/lib/libgssapi/gss_pseudo_random.c
index 423da4f57e08..c74682329585 100644
--- a/lib/libgssapi/gss_pseudo_random.c
+++ b/lib/libgssapi/gss_pseudo_random.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_buffer.c b/lib/libgssapi/gss_release_buffer.c
index 8a32d8db4530..7a85745abc5b 100644
--- a/lib/libgssapi/gss_release_buffer.c
+++ b/lib/libgssapi/gss_release_buffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_release_cred.c b/lib/libgssapi/gss_release_cred.c
index abcb6d18a7a9..6093acd8f3b7 100644
--- a/lib/libgssapi/gss_release_cred.c
+++ b/lib/libgssapi/gss_release_cred.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_release_name.c b/lib/libgssapi/gss_release_name.c
index 56fcf26b4a51..08ae10a26ec3 100644
--- a/lib/libgssapi/gss_release_name.c
+++ b/lib/libgssapi/gss_release_name.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_release_oid.c b/lib/libgssapi/gss_release_oid.c
index 19e3b262456c..01d06937f13e 100644
--- a/lib/libgssapi/gss_release_oid.c
+++ b/lib/libgssapi/gss_release_oid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_oid_set.c b/lib/libgssapi/gss_release_oid_set.c
index 6a5a1577f85f..a46853a4a0d8 100644
--- a/lib/libgssapi/gss_release_oid_set.c
+++ b/lib/libgssapi/gss_release_oid_set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_seal.c b/lib/libgssapi/gss_seal.c
index 9d0e25c52220..c3e3f7a83d66 100644
--- a/lib/libgssapi/gss_seal.c
+++ b/lib/libgssapi/gss_seal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_set_cred_option.c b/lib/libgssapi/gss_set_cred_option.c
index e645e7799d1e..93b221294651 100644
--- a/lib/libgssapi/gss_set_cred_option.c
+++ b/lib/libgssapi/gss_set_cred_option.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004, PADL Software Pty Ltd.
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_set_sec_context_option.c b/lib/libgssapi/gss_set_sec_context_option.c
index cda908d7ded8..4b6bf1bda269 100644
--- a/lib/libgssapi/gss_set_sec_context_option.c
+++ b/lib/libgssapi/gss_set_sec_context_option.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004, PADL Software Pty Ltd.
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_sign.c b/lib/libgssapi/gss_sign.c
index e8ebf3784c77..c521a7e533e6 100644
--- a/lib/libgssapi/gss_sign.c
+++ b/lib/libgssapi/gss_sign.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_test_oid_set_member.c b/lib/libgssapi/gss_test_oid_set_member.c
index dde6c7a66ad1..0421319eb149 100644
--- a/lib/libgssapi/gss_test_oid_set_member.c
+++ b/lib/libgssapi/gss_test_oid_set_member.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_unseal.c b/lib/libgssapi/gss_unseal.c
index 6da0ac92c5f2..c3775103ce4f 100644
--- a/lib/libgssapi/gss_unseal.c
+++ b/lib/libgssapi/gss_unseal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_unwrap.c b/lib/libgssapi/gss_unwrap.c
index 7faf2a691d4b..9ccc848d3efe 100644
--- a/lib/libgssapi/gss_unwrap.c
+++ b/lib/libgssapi/gss_unwrap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_utils.c b/lib/libgssapi/gss_utils.c
index ca55cc8df968..992908bea949 100644
--- a/lib/libgssapi/gss_utils.c
+++ b/lib/libgssapi/gss_utils.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_verify.c b/lib/libgssapi/gss_verify.c
index 5892d3e48259..0aa3fd67e28b 100644
--- a/lib/libgssapi/gss_verify.c
+++ b/lib/libgssapi/gss_verify.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_verify_mic.c b/lib/libgssapi/gss_verify_mic.c
index 689bf724650f..704d7fcc2c78 100644
--- a/lib/libgssapi/gss_verify_mic.c
+++ b/lib/libgssapi/gss_verify_mic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_wrap.c b/lib/libgssapi/gss_wrap.c
index dfb6bc877d31..1cf046ab86b6 100644
--- a/lib/libgssapi/gss_wrap.c
+++ b/lib/libgssapi/gss_wrap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/gss_wrap_size_limit.c b/lib/libgssapi/gss_wrap_size_limit.c
index 30d422c52fe9..7038a576e7c2 100644
--- a/lib/libgssapi/gss_wrap_size_limit.c
+++ b/lib/libgssapi/gss_wrap_size_limit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/mech_switch.h b/lib/libgssapi/mech_switch.h
index 4018f9e22a7c..e5173df4002e 100644
--- a/lib/libgssapi/mech_switch.h
+++ b/lib/libgssapi/mech_switch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/name.h b/lib/libgssapi/name.h
index 8702fd88df67..7f54359dc003 100644
--- a/lib/libgssapi/name.h
+++ b/lib/libgssapi/name.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/spnego.h b/lib/libgssapi/spnego.h
index 2fa3a6024ad2..8b2e22d537f2 100644
--- a/lib/libgssapi/spnego.h
+++ b/lib/libgssapi/spnego.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libgssapi/utils.h b/lib/libgssapi/utils.h
index fb0bd72f7eae..347b58358f3a 100644
--- a/lib/libgssapi/utils.h
+++ b/lib/libgssapi/utils.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/lib/libiconv_modules/BIG5/citrus_big5.c b/lib/libiconv_modules/BIG5/citrus_big5.c
index 9486ddafc206..8dffc657169d 100644
--- a/lib/libiconv_modules/BIG5/citrus_big5.c
+++ b/lib/libiconv_modules/BIG5/citrus_big5.c
@@ -28,8 +28,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libiconv_modules/BIG5/citrus_big5.h b/lib/libiconv_modules/BIG5/citrus_big5.h
index fd8de6af6dd8..e653ac6c1261 100644
--- a/lib/libiconv_modules/BIG5/citrus_big5.h
+++ b/lib/libiconv_modules/BIG5/citrus_big5.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_big5.h,v 1.2 2003/06/25 09:51:41 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
index fe27da24b383..ec2c5972390d 100644
--- a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
+++ b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_dechanyu.c,v 1.4 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2007 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
index 28a752d7c7d3..5f8873cf7f54 100644
--- a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
+++ b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_dechanyu.h,v 1.1 2007/04/01 18:52:32 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/EUC/citrus_euc.c b/lib/libiconv_modules/EUC/citrus_euc.c
index e83e23fb4666..e0c2d23ff0f0 100644
--- a/lib/libiconv_modules/EUC/citrus_euc.c
+++ b/lib/libiconv_modules/EUC/citrus_euc.c
@@ -28,8 +28,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libiconv_modules/EUC/citrus_euc.h b/lib/libiconv_modules/EUC/citrus_euc.h
index a7ffa8ab47e0..e9bab9f70753 100644
--- a/lib/libiconv_modules/EUC/citrus_euc.h
+++ b/lib/libiconv_modules/EUC/citrus_euc.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_euc.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.c b/lib/libiconv_modules/EUCTW/citrus_euctw.c
index 9132e38e5ecb..6c3e9f6b7fa1 100644
--- a/lib/libiconv_modules/EUCTW/citrus_euctw.c
+++ b/lib/libiconv_modules/EUCTW/citrus_euctw.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_euctw.c,v 1.11 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.h b/lib/libiconv_modules/EUCTW/citrus_euctw.h
index 2dca8457cf8a..5dde3421e3d7 100644
--- a/lib/libiconv_modules/EUCTW/citrus_euctw.h
+++ b/lib/libiconv_modules/EUCTW/citrus_euctw.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_euctw.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/GBK2K/citrus_gbk2k.c b/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
index 87ec6ebecc6a..b64c7e09cd4d 100644
--- a/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
+++ b/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_gbk2k.c,v 1.7 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/GBK2K/citrus_gbk2k.h b/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
index c5df93faa934..174a19e95055 100644
--- a/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
+++ b/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_gbk2k.h,v 1.2 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/HZ/citrus_hz.c
index f41a302fff9e..13d2f2c618ed 100644
--- a/lib/libiconv_modules/HZ/citrus_hz.c
+++ b/lib/libiconv_modules/HZ/citrus_hz.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_hz.c,v 1.2 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/HZ/citrus_hz.h b/lib/libiconv_modules/HZ/citrus_hz.h
index 6fc36d5a1743..9737b7b34338 100644
--- a/lib/libiconv_modules/HZ/citrus_hz.h
+++ b/lib/libiconv_modules/HZ/citrus_hz.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_hz.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/ISO2022/citrus_iso2022.c b/lib/libiconv_modules/ISO2022/citrus_iso2022.c
index 394495de906e..f9fa352111d4 100644
--- a/lib/libiconv_modules/ISO2022/citrus_iso2022.c
+++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iso2022.c,v 1.20 2010/12/07 22:01:45 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999, 2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/ISO2022/citrus_iso2022.h b/lib/libiconv_modules/ISO2022/citrus_iso2022.h
index 30cbf012a3b3..c5bbc40c9111 100644
--- a/lib/libiconv_modules/ISO2022/citrus_iso2022.h
+++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iso2022.h,v 1.2 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/JOHAB/citrus_johab.c b/lib/libiconv_modules/JOHAB/citrus_johab.c
index cd50bd3ed0e0..459f8c99c7db 100644
--- a/lib/libiconv_modules/JOHAB/citrus_johab.c
+++ b/lib/libiconv_modules/JOHAB/citrus_johab.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_johab.c,v 1.4 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/JOHAB/citrus_johab.h b/lib/libiconv_modules/JOHAB/citrus_johab.h
index c91ffea023a0..f11fb4e5009c 100644
--- a/lib/libiconv_modules/JOHAB/citrus_johab.h
+++ b/lib/libiconv_modules/JOHAB/citrus_johab.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_johab.h,v 1.1 2006/10/18 17:54:55 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/MSKanji/citrus_mskanji.c b/lib/libiconv_modules/MSKanji/citrus_mskanji.c
index 423ea3b8592f..4330cc8c0ec6 100644
--- a/lib/libiconv_modules/MSKanji/citrus_mskanji.c
+++ b/lib/libiconv_modules/MSKanji/citrus_mskanji.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mskanji.c,v 1.13 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/MSKanji/citrus_mskanji.h b/lib/libiconv_modules/MSKanji/citrus_mskanji.h
index 36f79f26ce6b..3dc385243910 100644
--- a/lib/libiconv_modules/MSKanji/citrus_mskanji.h
+++ b/lib/libiconv_modules/MSKanji/citrus_mskanji.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mskanji.h,v 1.2 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UES/citrus_ues.c b/lib/libiconv_modules/UES/citrus_ues.c
index 1c7b83687854..8516c2ae08aa 100644
--- a/lib/libiconv_modules/UES/citrus_ues.c
+++ b/lib/libiconv_modules/UES/citrus_ues.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_ues.c,v 1.3 2012/02/12 13:51:29 wiz Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UES/citrus_ues.h b/lib/libiconv_modules/UES/citrus_ues.h
index 82c13ac2b7ab..7198cdfca5a5 100644
--- a/lib/libiconv_modules/UES/citrus_ues.h
+++ b/lib/libiconv_modules/UES/citrus_ues.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_ues.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF1632/citrus_utf1632.c b/lib/libiconv_modules/UTF1632/citrus_utf1632.c
index b9625165051c..6682ab279692 100644
--- a/lib/libiconv_modules/UTF1632/citrus_utf1632.c
+++ b/lib/libiconv_modules/UTF1632/citrus_utf1632.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF1632/citrus_utf1632.h b/lib/libiconv_modules/UTF1632/citrus_utf1632.h
index 2327f5e14dc8..8ee7ada23dae 100644
--- a/lib/libiconv_modules/UTF1632/citrus_utf1632.h
+++ b/lib/libiconv_modules/UTF1632/citrus_utf1632.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_utf1632.h,v 1.1 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/UTF7/citrus_utf7.c
index b899b1a4f5ba..fa00a682fac7 100644
--- a/lib/libiconv_modules/UTF7/citrus_utf7.c
+++ b/lib/libiconv_modules/UTF7/citrus_utf7.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_utf7.c,v 1.5 2006/08/23 12:57:24 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004, 2005 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.h b/lib/libiconv_modules/UTF7/citrus_utf7.h
index 925e970a90fc..96ca478e0216 100644
--- a/lib/libiconv_modules/UTF7/citrus_utf7.h
+++ b/lib/libiconv_modules/UTF7/citrus_utf7.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_utf7.h,v 1.1 2005/03/05 18:05:15 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004,2005 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF8/citrus_utf8.c b/lib/libiconv_modules/UTF8/citrus_utf8.c
index 397823cf6144..1bf433e9c5b5 100644
--- a/lib/libiconv_modules/UTF8/citrus_utf8.c
+++ b/lib/libiconv_modules/UTF8/citrus_utf8.c
@@ -28,8 +28,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libiconv_modules/UTF8/citrus_utf8.h b/lib/libiconv_modules/UTF8/citrus_utf8.h
index 033d4ad659e9..fa412b7ba1aa 100644
--- a/lib/libiconv_modules/UTF8/citrus_utf8.h
+++ b/lib/libiconv_modules/UTF8/citrus_utf8.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_utf8.h,v 1.2 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.c b/lib/libiconv_modules/VIQR/citrus_viqr.c
index 8a81a7d12b01..ed91cf64cfea 100644
--- a/lib/libiconv_modules/VIQR/citrus_viqr.c
+++ b/lib/libiconv_modules/VIQR/citrus_viqr.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_viqr.c,v 1.5 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.h b/lib/libiconv_modules/VIQR/citrus_viqr.h
index ed2c1c2a5fe7..a6d943c2656c 100644
--- a/lib/libiconv_modules/VIQR/citrus_viqr.h
+++ b/lib/libiconv_modules/VIQR/citrus_viqr.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_viqr.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/ZW/citrus_zw.c b/lib/libiconv_modules/ZW/citrus_zw.c
index cbe86241196c..1728e3b7601c 100644
--- a/lib/libiconv_modules/ZW/citrus_zw.c
+++ b/lib/libiconv_modules/ZW/citrus_zw.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_zw.c,v 1.4 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/ZW/citrus_zw.h b/lib/libiconv_modules/ZW/citrus_zw.h
index f86de57665e4..b24485b5e852 100644
--- a/lib/libiconv_modules/ZW/citrus_zw.h
+++ b/lib/libiconv_modules/ZW/citrus_zw.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_zw.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2004,2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/iconv_none/citrus_iconv_none.c b/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
index ca09aab9451f..9d6cd317195d 100644
--- a/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
+++ b/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/iconv_none/citrus_iconv_none.h b/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
index ef804377308a..392af412c6ab 100644
--- a/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
+++ b/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_none.h,v 1.1 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
index ec9f21de541e..fd9a68cfccfe 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std.h b/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
index 5ca21bf48ea1..3aef79ee549c 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_std.h,v 1.1 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h b/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
index 97c89dc89eee..6e83730eb333 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_iconv_std_local.h,v 1.2 2003/07/01 09:42:16 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_646/citrus_mapper_646.c b/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
index 6295afde2864..b2775492a259 100644
--- a/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
+++ b/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_646.c,v 1.4 2003/07/14 11:37:49 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_646/citrus_mapper_646.h b/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
index c4cb50bc0b3e..2fd9170cbeb0 100644
--- a/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
+++ b/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_646.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_none/citrus_mapper_none.c b/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
index 59f9c23d4294..b3d2bda96b82 100644
--- a/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
+++ b/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_none.c,v 1.2 2003/06/27 17:53:31 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_none/citrus_mapper_none.h b/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
index 45dc72ccf2cb..9b4e07d5cb58 100644
--- a/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
+++ b/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_none.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
index 37633c15cf72..87f362a7ef8f 100644
--- a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
+++ b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_serial.c,v 1.2 2003/07/12 15:39:20 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
index 45fb8f83d12d..02cb9b1c8e50 100644
--- a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
+++ b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_serial.h,v 1.1 2003/06/25 09:51:46 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
index 67b26692170d..712e9b2f039c 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
index 10e5a1e36770..d6a0b62d3f58 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_std.h,v 1.1 2003/06/25 09:51:47 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
index 96f0f59bef27..d433c74eb3a1 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_std_file.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
index 02e8601e4f12..f76f606a2d52 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_std_local.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
index 12d6d1171126..f1117f423af4 100644
--- a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
+++ b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_zone.c,v 1.4 2003/07/12 15:39:21 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
index 3274f0760e96..590cee6bb26b 100644
--- a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
+++ b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
@@ -2,8 +2,6 @@
/* $NetBSD: citrus_mapper_zone.h,v 1.1 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 76848f3cb0a5..257bb092db53 100644
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@@ -1,8 +1,6 @@
/* $KAME: ipsec_dump_policy.c,v 1.13 2002/06/27 14:35:11 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c
index 37e02778ef51..232cb45097ff 100644
--- a/lib/libipsec/ipsec_get_policylen.c
+++ b/lib/libipsec/ipsec_get_policylen.c
@@ -1,8 +1,6 @@
/* $KAME: ipsec_get_policylen.c,v 1.5 2000/05/07 05:25:03 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c
index 6e7e9c6c29d2..f9b2dc9cf805 100644
--- a/lib/libipsec/ipsec_strerror.c
+++ b/lib/libipsec/ipsec_strerror.c
@@ -1,8 +1,6 @@
/* $KAME: ipsec_strerror.c,v 1.7 2000/07/30 00:45:12 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h
index 3a1a5536743a..d9a1f0deffe2 100644
--- a/lib/libipsec/ipsec_strerror.h
+++ b/lib/libipsec/ipsec_strerror.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h
index c4c191e3e438..07ff582ec827 100644
--- a/lib/libipsec/libpfkey.h
+++ b/lib/libipsec/libpfkey.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c
index d1aae7321c2e..7192d2918798 100644
--- a/lib/libipsec/pfkey.c
+++ b/lib/libipsec/pfkey.c
@@ -1,8 +1,6 @@
/* $KAME: pfkey.c,v 1.46 2003/08/26 03:37:06 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index e3ea7639d5c4..5619ac79b137 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -1,8 +1,6 @@
/* $KAME: pfkey_dump.c,v 1.45 2003/09/08 10:14:56 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y
index a9c45804ab0d..46e54e554c07 100644
--- a/lib/libipsec/policy_parse.y
+++ b/lib/libipsec/policy_parse.y
@@ -1,8 +1,6 @@
/* $KAME: policy_parse.y,v 1.14 2003/06/27 03:39:20 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
index 81893912714d..219cce446b65 100644
--- a/lib/libipsec/policy_token.l
+++ b/lib/libipsec/policy_token.l
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: policy_token.l,v 1.13 2003/05/09 05:19:55 sakane Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c
index 579937396b0b..a24a0b41397d 100644
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@@ -1,8 +1,6 @@
/* $KAME: test-policy.c,v 1.16 2003/08/26 03:24:08 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 15a3ecdc1894..db0771e9ca02 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 James Gritton.
* All rights reserved.
*
diff --git a/lib/libjail/jail.h b/lib/libjail/jail.h
index c38e84916607..2801dbc6c0df 100644
--- a/lib/libjail/jail.h
+++ b/lib/libjail/jail.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 James Gritton.
* All rights reserved.
*
diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c
index 6ab6d9eff98a..dab2dcf25ce8 100644
--- a/lib/libjail/jail_getid.c
+++ b/lib/libjail/jail_getid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 James Gritton.
* All rights reserved.
*
diff --git a/lib/libkiconv/kiconv_sysctl.c b/lib/libkiconv/kiconv_sysctl.c
index da68b3011f36..7eebf2b4e0c7 100644
--- a/lib/libkiconv/kiconv_sysctl.c
+++ b/lib/libkiconv/kiconv_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Ryuichiro Imura
* All rights reserved.
*
diff --git a/lib/libkiconv/quirks.c b/lib/libkiconv/quirks.c
index e2bb1e66beb1..54b61539b830 100644
--- a/lib/libkiconv/quirks.c
+++ b/lib/libkiconv/quirks.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
diff --git a/lib/libkiconv/quirks.h b/lib/libkiconv/quirks.h
index 80a6558bceb2..682d2cd7fc0c 100644
--- a/lib/libkiconv/quirks.h
+++ b/lib/libkiconv/quirks.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index 4d23f8d2a7e1..3efb7795634f 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, 2005 Ryuichiro Imura
* All rights reserved.
*
diff --git a/lib/libkiconv/xlat16_sysctl.c b/lib/libkiconv/xlat16_sysctl.c
index 4eb6a681584e..ae4dae7a5158 100644
--- a/lib/libkiconv/xlat16_sysctl.c
+++ b/lib/libkiconv/xlat16_sysctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000-2001, Boris Popov
* All rights reserved.
*
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 6a233a15051b..d6cc7d847ee6 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index 2d785439b21b..db71bf358828 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index ccf085d51379..4cf5f379f064 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index 4df70e1199db..e9fe42f04ad6 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 Olivier Houchard
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libkvm/kvm_cptime.c b/lib/libkvm/kvm_cptime.c
index 9d303943f551..dcb2ba78f32b 100644
--- a/lib/libkvm/kvm_cptime.c
+++ b/lib/libkvm/kvm_cptime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index e97cdf36693e..b850c023c47e 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 979ef71747e1..11a586a7da8f 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1999, Matthew Dillon. All Rights Reserved.
* Copyright (c) 2001, Thomas Moestl. All Rights Reserved.
*
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 771b86aeafa2..c1af0f3e8a85 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c
index 71b102d635b5..65a229cb976d 100644
--- a/lib/libkvm/kvm_minidump_amd64.c
+++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libkvm/kvm_minidump_arm.c b/lib/libkvm/kvm_minidump_arm.c
index c85eb20da4d1..ac90bc14a257 100644
--- a/lib/libkvm/kvm_minidump_arm.c
+++ b/lib/libkvm/kvm_minidump_arm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* Copyright (c) 2006 Peter Wemm
*
diff --git a/lib/libkvm/kvm_minidump_i386.c b/lib/libkvm/kvm_minidump_i386.c
index 9eade7e3eb2b..432d097ea219 100644
--- a/lib/libkvm/kvm_minidump_i386.c
+++ b/lib/libkvm/kvm_minidump_i386.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libkvm/kvm_minidump_mips.c b/lib/libkvm/kvm_minidump_mips.c
index 2920b5b31325..5e6c8623fa97 100644
--- a/lib/libkvm/kvm_minidump_mips.c
+++ b/lib/libkvm/kvm_minidump_mips.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Oleksandr Tymoshenko
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* Copyright (c) 2006 Peter Wemm
diff --git a/lib/libkvm/kvm_pcpu.c b/lib/libkvm/kvm_pcpu.c
index 2e52f5e7e850..68dd36334330 100644
--- a/lib/libkvm/kvm_pcpu.c
+++ b/lib/libkvm/kvm_pcpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2013 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 2010 Juniper Networks, Inc.
* Copyright (c) 2009 Robert N. M. Watson
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 9e596b6000aa..34b99eb0a276 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c
index afe1e5c42f21..c15ec881e19e 100644
--- a/lib/libkvm/kvm_powerpc64.c
+++ b/lib/libkvm/kvm_powerpc64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index 62c5730c82d7..3a31120a9e23 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 9215693dda4e..0885732ea7d3 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index bebb470dc5f9..e3fe2d7c7539 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libkvm/kvm_vnet.c b/lib/libkvm/kvm_vnet.c
index eac9584cc730..817462cc4027 100644
--- a/lib/libkvm/kvm_vnet.c
+++ b/lib/libkvm/kvm_vnet.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Robert N. M. Watson
* Copyright (c) 2009 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libmemstat/memstat.c b/lib/libmemstat/memstat.c
index 978a08189415..40bdc9d19f0f 100644
--- a/lib/libmemstat/memstat.c
+++ b/lib/libmemstat/memstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmemstat/memstat.h b/lib/libmemstat/memstat.h
index 98fc99f078f6..8394dc1c1221 100644
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmemstat/memstat_all.c b/lib/libmemstat/memstat_all.c
index b0eb50f81ccb..bd74b8acbe4c 100644
--- a/lib/libmemstat/memstat_all.c
+++ b/lib/libmemstat/memstat_all.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmemstat/memstat_internal.h b/lib/libmemstat/memstat_internal.h
index 12345d9f884c..9fdc22813b2a 100644
--- a/lib/libmemstat/memstat_internal.h
+++ b/lib/libmemstat/memstat_internal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmemstat/memstat_malloc.c b/lib/libmemstat/memstat_malloc.c
index a8ca0d8bc802..1fd362114ebb 100644
--- a/lib/libmemstat/memstat_malloc.c
+++ b/lib/libmemstat/memstat_malloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index 88fcadc0021c..8e89585300b0 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2006 Robert N. M. Watson
* All rights reserved.
*
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index e3b96831167a..2656124c4738 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
*
diff --git a/lib/libnandfs/libnandfs.h b/lib/libnandfs/libnandfs.h
index 53cd04946d0e..8338c63d600b 100644
--- a/lib/libnandfs/libnandfs.h
+++ b/lib/libnandfs/libnandfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/lib/libnandfs/nandfs.c b/lib/libnandfs/nandfs.c
index f1dd771ae8fd..fd59a921133f 100644
--- a/lib/libnandfs/nandfs.c
+++ b/lib/libnandfs/nandfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/lib/libnetbsd/rmd160.h b/lib/libnetbsd/rmd160.h
index 105c1efdd92a..7b811995edb4 100644
--- a/lib/libnetbsd/rmd160.h
+++ b/lib/libnetbsd/rmd160.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* All rights reserved.
*
diff --git a/lib/libnetbsd/sha1.h b/lib/libnetbsd/sha1.h
index d75365fe108a..9da870eacf6e 100644
--- a/lib/libnetbsd/sha1.h
+++ b/lib/libnetbsd/sha1.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* All rights reserved.
*
diff --git a/lib/libnetbsd/sha2.h b/lib/libnetbsd/sha2.h
index 44c6c9945a88..6329284924fc 100644
--- a/lib/libnetbsd/sha2.h
+++ b/lib/libnetbsd/sha2.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* All rights reserved.
*
diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h
index b7bb875740d5..d481913d58fd 100644
--- a/lib/libnetbsd/stdlib.h
+++ b/lib/libnetbsd/stdlib.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2012 SRI International
* Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/lib/libnetbsd/strsuftoll.c b/lib/libnetbsd/strsuftoll.c
index 078bee0ace58..657e52525fc6 100644
--- a/lib/libnetbsd/strsuftoll.c
+++ b/lib/libnetbsd/strsuftoll.c
@@ -1,7 +1,5 @@
/* $NetBSD: strsuftoll.c,v 1.6 2004/03/05 05:58:29 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h
index 0c19ba6bdc83..06e46fd30a56 100644
--- a/lib/libnetbsd/sys/cdefs.h
+++ b/lib/libnetbsd/sys/cdefs.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2012 SRI International
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libnetbsd/util.c b/lib/libnetbsd/util.c
index f33e6c63fc81..36b9421efc39 100644
--- a/lib/libnetbsd/util.c
+++ b/lib/libnetbsd/util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* All rights reserved.
*
diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h
index 93272a56086b..bc4f4d78c2ae 100644
--- a/lib/libnetbsd/util.h
+++ b/lib/libnetbsd/util.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2012 SRI International
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libnv/common_impl.h b/lib/libnv/common_impl.h
index a50902d221ce..5af4db2b835a 100644
--- a/lib/libnv/common_impl.h
+++ b/lib/libnv/common_impl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c
index 300a437a7421..283ddccbdd79 100644
--- a/lib/libnv/msgio.c
+++ b/lib/libnv/msgio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libnv/msgio.h b/lib/libnv/msgio.h
index 13592e4cd0fb..fd5e462af0d0 100644
--- a/lib/libnv/msgio.h
+++ b/lib/libnv/msgio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libpam/libpam/security/pam_mod_misc.h b/lib/libpam/libpam/security/pam_mod_misc.h
index 08c9c1ab8f56..13ff0f3a4c28 100644
--- a/lib/libpam/libpam/security/pam_mod_misc.h
+++ b/lib/libpam/libpam/security/pam_mod_misc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.c b/lib/libpam/modules/pam_chroot/pam_chroot.c
index d468c3390819..447e5f78dd10 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.c
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c
index 372e7e364c08..3d491b158e42 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.c
+++ b/lib/libpam/modules/pam_deny/pam_deny.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2001 Mark R V Murray
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_echo/pam_echo.c b/lib/libpam/modules/pam_echo/pam_echo.c
index 4217118f3011..ff008597b921 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.c
+++ b/lib/libpam/modules/pam_echo/pam_echo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001,2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c
index af1115adf369..d43d181f31e5 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.c
+++ b/lib/libpam/modules/pam_exec/pam_exec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001,2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
index ea800cbb17dd..421955ab250e 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_group/pam_group.c b/lib/libpam/modules/pam_group/pam_group.c
index bd6912a02d1a..6cf2774a308f 100644
--- a/lib/libpam/modules/pam_group/pam_group.c
+++ b/lib/libpam/modules/pam_group/pam_group.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
* All rights reserved.
diff --git a/lib/libpam/modules/pam_guest/pam_guest.c b/lib/libpam/modules/pam_guest/pam_guest.c
index 51e9181679c7..110edcec0ed4 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.c
+++ b/lib/libpam/modules/pam_guest/pam_guest.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c
index 1a4ebc39f65a..f8f7fb63ae8b 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.c
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jacques A. Vidrine <nectar@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
index 00b07bc19142..814edb8c59af 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2001 Mark R V Murray
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c
index 82aff72113e8..fe16662dd722 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.c
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.h b/lib/libpam/modules/pam_login_access/pam_login_access.h
index 16c5e14e8de4..38c304958042 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.h
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c
index 1ba2dcd92fad..1be63d287b8d 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.c
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index 41ad84b751bc..9625373d9d3e 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2000 James Bloom
* All rights reserved.
* Based upon code Copyright 1998 Juniper Networks, Inc.
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
index 090d98e5f2a6..035111553d5e 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c
index 38f44b222609..fe0a4ed2958b 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.c
+++ b/lib/libpam/modules/pam_permit/pam_permit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2001 Mark R V Murray
* All rights reserved.
*
diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c
index c71d3b954da0..dcfde30a9a5e 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.c
+++ b/lib/libpam/modules/pam_radius/pam_radius.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
* Copyright (c) 2001-2003 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.c b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
index e8b6ba461b2c..4ba6ade37834 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.c
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Danny Braniss
* All rights reserved.
* Copyright (c) 2001,2002 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c
index c5540a2683e3..16fab1f22cc5 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.c
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c
index 50574d315608..f58274a2ff47 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.c
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c
index de69f408d3f9..63df46c0f984 100644
--- a/lib/libpam/modules/pam_self/pam_self.c
+++ b/lib/libpam/modules/pam_self/pam_self.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
* Copyright (c) 2001,2002 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 1c151ddca7f7..821228dfc3da 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
* All rights reserved.
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
index 8f8e9d553ee7..7f860c3b370f 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
* Copyright (c) 2001-2003 Networks Associates Technology, Inc.
diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c
index ecdd10772155..2fd3b61970cf 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.c
+++ b/lib/libpam/modules/pam_unix/pam_unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
diff --git a/lib/libpjdlog/pjdlog.c b/lib/libpjdlog/pjdlog.c
index eb7ddb2b7a88..84615faccd27 100644
--- a/lib/libpjdlog/pjdlog.c
+++ b/lib/libpjdlog/pjdlog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libpjdlog/pjdlog.h b/lib/libpjdlog/pjdlog.h
index 9db5b15d1ba6..3f38b108b5cc 100644
--- a/lib/libpjdlog/pjdlog.h
+++ b/lib/libpjdlog/pjdlog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
index 8b25768d33d1..39d2f960fdce 100644
--- a/lib/libpmc/libpmc.c
+++ b/lib/libpmc/libpmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008 Joseph Koshy
* All rights reserved.
*
diff --git a/lib/libpmc/libpmcinternal.h b/lib/libpmc/libpmcinternal.h
index 0e7c6631b00d..b1c9c86b1488 100644
--- a/lib/libpmc/libpmcinternal.h
+++ b/lib/libpmc/libpmcinternal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h
index 5e4b89e4ea05..f237285121f4 100644
--- a/lib/libpmc/pmc.h
+++ b/lib/libpmc/pmc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003,2004 Joseph Koshy
* All rights reserved.
*
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c
index 8620a0c8789d..02940e7c835f 100644
--- a/lib/libpmc/pmclog.c
+++ b/lib/libpmc/pmclog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libpmc/pmclog.h b/lib/libpmc/pmclog.h
index 77644a85ed8c..2a50945e372e 100644
--- a/lib/libpmc/pmclog.h
+++ b/lib/libpmc/pmclog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c
index 28031d04de23..ab95e2a04c33 100644
--- a/lib/libprocstat/cd9660.c
+++ b/lib/libprocstat/cd9660.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libprocstat/common_kvm.c b/lib/libprocstat/common_kvm.c
index 2889f802775d..4ca25145b75d 100644
--- a/lib/libprocstat/common_kvm.c
+++ b/lib/libprocstat/common_kvm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libprocstat/common_kvm.h b/lib/libprocstat/common_kvm.h
index a8a74b5464b3..06627bff448c 100644
--- a/lib/libprocstat/common_kvm.h
+++ b/lib/libprocstat/common_kvm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c
index c3d5f8bec495..9baa0cde10ca 100644
--- a/lib/libprocstat/core.c
+++ b/lib/libprocstat/core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
* All rights reserved.
diff --git a/lib/libprocstat/core.h b/lib/libprocstat/core.h
index 1b3da375baf4..701697be0541 100644
--- a/lib/libprocstat/core.h
+++ b/lib/libprocstat/core.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
* All rights reserved.
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index 6b833bbc1a3d..03d4b7338720 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h
index 25b84140a719..00b6f1c1c110 100644
--- a/lib/libprocstat/libprocstat.h
+++ b/lib/libprocstat/libprocstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
* All rights reserved.
diff --git a/lib/libprocstat/libprocstat_internal.h b/lib/libprocstat/libprocstat_internal.h
index 38045379c794..6ca3197cbc4e 100644
--- a/lib/libprocstat/libprocstat_internal.h
+++ b/lib/libprocstat/libprocstat_internal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c
index 87906423f9b6..84b437e6c95a 100644
--- a/lib/libprocstat/msdosfs.c
+++ b/lib/libprocstat/msdosfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c
index 86da07d62acd..24d8acdd91bd 100644
--- a/lib/libprocstat/smbfs.c
+++ b/lib/libprocstat/smbfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
index 6cf765ce0f5f..90c369c8ff03 100644
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c
index 8beb902fb7f0..aa6d78e3f40c 100644
--- a/lib/libprocstat/zfs.c
+++ b/lib/libprocstat/zfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ulf Lilleengen
* All rights reserved.
*
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index 836111de29ce..55c6f5cb04a1 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libradius/radlib.h b/lib/libradius/radlib.h
index 0d17f3c61466..e9b7a87f123d 100644
--- a/lib/libradius/radlib.h
+++ b/lib/libradius/radlib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libradius/radlib_private.h b/lib/libradius/radlib_private.h
index 858ce98c8346..bfbbbd17ca89 100644
--- a/lib/libradius/radlib_private.h
+++ b/lib/libradius/radlib_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libradius/radlib_vs.h b/lib/libradius/radlib_vs.h
index 6b2d4c6486ed..0acfb0e10e00 100644
--- a/lib/libradius/radlib_vs.h
+++ b/lib/libradius/radlib_vs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/lib/librpcsec_gss/rpcsec_gss.c b/lib/librpcsec_gss/rpcsec_gss.c
index 46beb69de790..60208810e4aa 100644
--- a/lib/librpcsec_gss/rpcsec_gss.c
+++ b/lib/librpcsec_gss/rpcsec_gss.c
@@ -26,8 +26,6 @@
* $FreeBSD$
*/
/*
- SPDX-License-Identifier: BSD-3-Clause
-
auth_gss.c
RPCSEC_GSS client routines.
diff --git a/lib/librpcsec_gss/rpcsec_gss_conf.c b/lib/librpcsec_gss/rpcsec_gss_conf.c
index 74bdfc58a659..14e063c60d8f 100644
--- a/lib/librpcsec_gss/rpcsec_gss_conf.c
+++ b/lib/librpcsec_gss/rpcsec_gss_conf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/librpcsec_gss/rpcsec_gss_int.h b/lib/librpcsec_gss/rpcsec_gss_int.h
index e247d70fc3c5..d74191dde937 100644
--- a/lib/librpcsec_gss/rpcsec_gss_int.h
+++ b/lib/librpcsec_gss/rpcsec_gss_int.h
@@ -1,6 +1,4 @@
/*
- SPDX-License-Identifier: BSD-3-Clause
-
rpcsec_gss.h
Copyright (c) 2000 The Regents of the University of Michigan.
diff --git a/lib/librpcsec_gss/rpcsec_gss_misc.c b/lib/librpcsec_gss/rpcsec_gss_misc.c
index fe44b41764d7..e9d09dee2206 100644
--- a/lib/librpcsec_gss/rpcsec_gss_misc.c
+++ b/lib/librpcsec_gss/rpcsec_gss_misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/lib/librpcsec_gss/rpcsec_gss_prot.c b/lib/librpcsec_gss/rpcsec_gss_prot.c
index 08a00f6bdb97..924ff9f92c6e 100644
--- a/lib/librpcsec_gss/rpcsec_gss_prot.c
+++ b/lib/librpcsec_gss/rpcsec_gss_prot.c
@@ -1,6 +1,4 @@
/*
- SPDX-License-Identifier: BSD-3-Clause
-
rpcsec_gss_prot.c
Copyright (c) 2000 The Regents of the University of Michigan.
diff --git a/lib/librpcsec_gss/svc_rpcsec_gss.c b/lib/librpcsec_gss/svc_rpcsec_gss.c
index afb436db11ca..01a444b0df45 100644
--- a/lib/librpcsec_gss/svc_rpcsec_gss.c
+++ b/lib/librpcsec_gss/svc_rpcsec_gss.c
@@ -25,9 +25,7 @@
*
* $FreeBSD$
*/
-/*-
- SPDX-License-Identifier: BSD-3-Clause
-
+/*
svc_rpcsec_gss.c
Copyright (c) 2000 The Regents of the University of Michigan.
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index b8d99a66ab59..e7c59145fa2e 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index 081ef4f547f7..1d2848d4ea61 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/librt/aio.c b/lib/librt/aio.c
index 0ed791aed90f..9aa0c6ee930f 100644
--- a/lib/librt/aio.c
+++ b/lib/librt/aio.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/librt/mq.c b/lib/librt/mq.c
index 127e64e18f34..513fa72c14fb 100644
--- a/lib/librt/mq.c
+++ b/lib/librt/mq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/librt/sigev_thread.c b/lib/librt/sigev_thread.c
index 9ddac9d6633a..2677a8e50589 100644
--- a/lib/librt/sigev_thread.c
+++ b/lib/librt/sigev_thread.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/librt/sigev_thread.h b/lib/librt/sigev_thread.h
index cf968ebb9cf3..f94afa5461af 100644
--- a/lib/librt/sigev_thread.h
+++ b/lib/librt/sigev_thread.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/librt/timer.c b/lib/librt/timer.c
index f7b5e4fd7e72..b5f775c79792 100644
--- a/lib/librt/timer.c
+++ b/lib/librt/timer.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/librtld_db/rtld_db.c b/lib/librtld_db/rtld_db.c
index 4192f3ff9fc1..d168d306f5cd 100644
--- a/lib/librtld_db/rtld_db.c
+++ b/lib/librtld_db/rtld_db.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/librtld_db/rtld_db.h b/lib/librtld_db/rtld_db.h
index 62dee73a0d09..679748b311b1 100644
--- a/lib/librtld_db/rtld_db.h
+++ b/lib/librtld_db/rtld_db.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index 4d4dd2bcddd9..d8a064d1e382 100644
--- a/lib/libsdp/sdp-int.h
+++ b/lib/libsdp/sdp-int.h
@@ -1,8 +1,6 @@
-/*-
+/*
* sdp-int.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index 8774a0ba8c88..3bc144e79e0a 100644
--- a/lib/libsdp/sdp.h
+++ b/lib/libsdp/sdp.h
@@ -1,8 +1,6 @@
-/*-
+/*
* sdp.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 9fab2963a5fe..fa2a92d05a61 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -1,8 +1,6 @@
-/*-
+/*
* search.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 3309adefeb1f..53c8909bb2f3 100644
--- a/lib/libsdp/service.c
+++ b/lib/libsdp/service.c
@@ -1,8 +1,6 @@
-/*-
+/*
* service.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c
index 52559585c22e..a74ce5fea359 100644
--- a/lib/libsdp/session.c
+++ b/lib/libsdp/session.c
@@ -1,8 +1,6 @@
-/*-
+/*
* session.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c
index 8e3cfea2ea76..5ef4a1dfd376 100644
--- a/lib/libsdp/util.c
+++ b/lib/libsdp/util.c
@@ -1,8 +1,6 @@
-/*-
+/*
* util.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/lib/libstdbuf/stdbuf.c b/lib/libstdbuf/stdbuf.c
index e303605865f7..1b5d39a63613 100644
--- a/lib/libstdbuf/stdbuf.c
+++ b/lib/libstdbuf/stdbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/call_once.c b/lib/libstdthreads/call_once.c
index bb8618ce2818..70ce8de1e991 100644
--- a/lib/libstdthreads/call_once.c
+++ b/lib/libstdthreads/call_once.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/cnd.c b/lib/libstdthreads/cnd.c
index a27d55d729a8..145960df84ba 100644
--- a/lib/libstdthreads/cnd.c
+++ b/lib/libstdthreads/cnd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/mtx.c b/lib/libstdthreads/mtx.c
index f009d19edf23..f38fbae5261e 100644
--- a/lib/libstdthreads/mtx.c
+++ b/lib/libstdthreads/mtx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/thrd.c b/lib/libstdthreads/thrd.c
index 82fcdce693c8..b0e36ef618fb 100644
--- a/lib/libstdthreads/thrd.c
+++ b/lib/libstdthreads/thrd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/threads.h b/lib/libstdthreads/threads.h
index b274f7f8a68e..6f322a5af13e 100644
--- a/lib/libstdthreads/threads.h
+++ b/lib/libstdthreads/threads.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libstdthreads/tss.c b/lib/libstdthreads/tss.c
index 846ea7d4e268..ef78b4bd41f1 100644
--- a/lib/libstdthreads/tss.c
+++ b/lib/libstdthreads/tss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index c11674ff60d6..d551bfe3d5d5 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001, 2002, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 7973a608c2ab..46b9a59d80a4 100644
--- a/lib/libtacplus/taclib.h
+++ b/lib/libtacplus/taclib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libtacplus/taclib_private.h b/lib/libtacplus/taclib_private.h
index f48a89ebf40f..2730023a632a 100644
--- a/lib/libtacplus/taclib_private.h
+++ b/lib/libtacplus/taclib_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h
index 1d393d9cbbed..e4a0dd2fe44c 100644
--- a/lib/libthr/arch/amd64/include/pthread_md.h
+++ b/lib/libthr/arch/amd64/include/pthread_md.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2003 David Xu <davidxu@freebsd.org>
* Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
index 55d93d0853bc..9ed4706120ad 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
*
diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h
index 7de8aa56203e..ba7b75ceb2dc 100644
--- a/lib/libthr/arch/i386/include/pthread_md.h
+++ b/lib/libthr/arch/i386/include/pthread_md.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Daniel Eischen <deischen@freebsd.org>.
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h
index 433114010c24..22aa3db7dd33 100644
--- a/lib/libthr/arch/mips/include/pthread_md.h
+++ b/lib/libthr/arch/mips/include/pthread_md.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
*
diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
index a9923d7337d8..699233e175e5 100644
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright 2004 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libthr/arch/sparc64/include/pthread_md.h b/lib/libthr/arch/sparc64/include/pthread_md.h
index 85c5b7e80b16..35d8405b9d50 100644
--- a/lib/libthr/arch/sparc64/include/pthread_md.h
+++ b/lib/libthr/arch/sparc64/include/pthread_md.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder <jake@freebsd.org>.
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libthr/sys/thr_error.c b/lib/libthr/sys/thr_error.c
index 922d818c3ca8..852588a21092 100644
--- a/lib/libthr/sys/thr_error.c
+++ b/lib/libthr/sys/thr_error.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.
diff --git a/lib/libthr/thread/thr_affinity.c b/lib/libthr/thread/thr_affinity.c
index 1a820b72b9f3..e76ca2aa0bd6 100644
--- a/lib/libthr/thread/thr_affinity.c
+++ b/lib/libthr/thread/thr_affinity.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index 4a5b4afc93ee..a79048325104 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index d741f3cf1af7..7d9e52cc6ee4 100644
--- a/lib/libthr/thread/thr_autoinit.c
+++ b/lib/libthr/thread/thr_autoinit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2002 Alfred Perlstein <alfred@freebsd.org>.
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c
index 890e8a60f719..2c47f13f2669 100644
--- a/lib/libthr/thread/thr_barrier.c
+++ b/lib/libthr/thread/thr_barrier.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 66ba73050269..acaa0594b34f 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 0f131497aac5..c080931b40fb 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c
index 5a93d94a7e5a..62e3db20a4e0 100644
--- a/lib/libthr/thread/thr_clean.c
+++ b/lib/libthr/thread/thr_clean.c
@@ -1,7 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
-
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 9f60dca1e445..24714e6cbd3d 100644
--- a/lib/libthr/thread/thr_concurrency.c
+++ b/lib/libthr/thread/thr_concurrency.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003 Sergey Osokin <osa@FreeBSD.org.ru>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index 9b6c787f9614..64d075ca06fb 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/thread/thr_cond.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 2015 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libthr/thread/thr_condattr.c b/lib/libthr/thread/thr_condattr.c
index b98f695d7bce..906ea778a8d5 100644
--- a/lib/libthr/thread/thr_condattr.c
+++ b/lib/libthr/thread/thr_condattr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index 3f54f5c4c8d6..ee2c727cecee 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 Daniel M. Eischen <deischen@gdeb.com>
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index feac319d0df8..f03731f2c799 100644
--- a/lib/libthr/thread/thr_detach.c
+++ b/lib/libthr/thread/thr_detach.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c
index 8baed3b75c3f..a9eed8c07378 100644
--- a/lib/libthr/thread/thr_equal.c
+++ b/lib/libthr/thread/thr_equal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c
index 977c0dacb7c7..982f86a626d8 100644
--- a/lib/libthr/thread/thr_event.c
+++ b/lib/libthr/thread/thr_event.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index 03a2572903bb..1a34394e8520 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c
index 5e63e6eec40b..1a646b008c8b 100644
--- a/lib/libthr/thread/thr_fork.c
+++ b/lib/libthr/thread/thr_fork.c
@@ -25,9 +25,7 @@
* SUCH DAMAGE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_getcpuclockid.c b/lib/libthr/thread/thr_getcpuclockid.c
index 20f63039ea89..1ad6a08b2628 100644
--- a/lib/libthr/thread/thr_getcpuclockid.c
+++ b/lib/libthr/thread/thr_getcpuclockid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c
index a8d8d2bfe017..033f4f557723 100644
--- a/lib/libthr/thread/thr_getprio.c
+++ b/lib/libthr/thread/thr_getprio.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c
index 8301b4bf8743..04ff3991b9cc 100644
--- a/lib/libthr/thread/thr_getschedparam.c
+++ b/lib/libthr/thread/thr_getschedparam.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_getthreadid_np.c b/lib/libthr/thread/thr_getthreadid_np.c
index 3011307861ae..e7b496ea7a59 100644
--- a/lib/libthr/thread/thr_getthreadid_np.c
+++ b/lib/libthr/thread/thr_getthreadid_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Jung-uk Kim <jkim@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c
index d932bb0c7692..4e4f41eb9a86 100644
--- a/lib/libthr/thread/thr_info.c
+++ b/lib/libthr/thread/thr_info.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 65f7d111f73d..909f14236d17 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003 Daniel M. Eischen <deischen@freebsd.org>
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c
index f6136e479b52..42bd74965eef 100644
--- a/lib/libthr/thread/thr_join.c
+++ b/lib/libthr/thread/thr_join.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index 77ccc6847828..64128b4382d7 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_kill.c b/lib/libthr/thread/thr_kill.c
index 59b8b1567011..15928b1b91f6 100644
--- a/lib/libthr/thread/thr_kill.c
+++ b/lib/libthr/thread/thr_kill.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c
index 530e49721a4b..70b85bc80f7d 100644
--- a/lib/libthr/thread/thr_list.c
+++ b/lib/libthr/thread/thr_list.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index 7ce54bc9f1f0..9558adff27da 100644
--- a/lib/libthr/thread/thr_main_np.c
+++ b/lib/libthr/thread/thr_main_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Alfred Perlstein
* Author: Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c
index 59e782cc59b2..74379f55cc66 100644
--- a/lib/libthr/thread/thr_multi_np.c
+++ b/lib/libthr/thread/thr_multi_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index f3f815c99684..4ab7720b665b 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>.
* Copyright (c) 2015, 2016 The FreeBSD Foundation
diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c
index 5becec38ffba..d8a86714905a 100644
--- a/lib/libthr/thread/thr_mutexattr.c
+++ b/lib/libthr/thread/thr_mutexattr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 Jeffrey Hsu <hsu@freebsd.org>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index 90778440b76e..51aa8acfcc4e 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index d757c8d2d6e2..d38ee1869c9e 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Jonathan Mini <mini@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 285317d4bc28..4c9245e7b050 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2005 Daniel M. Eischen <deischen@freebsd.org>
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index c71bdbb3f196..1c83b25b67de 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>
* Copyright (c) 2016 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c
index 125d70a595e9..b280cb112274 100644
--- a/lib/libthr/thread/thr_resume_np.c
+++ b/lib/libthr/thread/thr_resume_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c
index 3239a9dcfb18..6f5347de2151 100644
--- a/lib/libthr/thread/thr_rtld.c
+++ b/lib/libthr/thread/thr_rtld.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 139e74557a55..105b35c4219f 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Alex Nash
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index 76013f59c307..56174edead46 100644
--- a/lib/libthr/thread/thr_rwlockattr.c
+++ b/lib/libthr/thread/thr_rwlockattr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Alex Nash
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_self.c b/lib/libthr/thread/thr_self.c
index eb7c197e4f29..65ad631eafa6 100644
--- a/lib/libthr/thread/thr_self.c
+++ b/lib/libthr/thread/thr_self.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index 66386764666a..a8b02acca446 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2005 David Xu <davidxu@freebsd.org>.
* Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
* All rights reserved.
diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c
index 537b9b89f201..6f8a0098217f 100644
--- a/lib/libthr/thread/thr_setprio.c
+++ b/lib/libthr/thread/thr_setprio.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c
index cf2c1f919e12..4db09e759ec4 100644
--- a/lib/libthr/thread/thr_setschedparam.c
+++ b/lib/libthr/thread/thr_setschedparam.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 576bc79de795..978ae61eca6f 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_single_np.c b/lib/libthr/thread/thr_single_np.c
index 7aecfc93b3e3..32bc5869a8f1 100644
--- a/lib/libthr/thread/thr_single_np.c
+++ b/lib/libthr/thread/thr_single_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_sleepq.c b/lib/libthr/thread/thr_sleepq.c
index 05145a739681..5ecd6f9d3e24 100644
--- a/lib/libthr/thread/thr_sleepq.c
+++ b/lib/libthr/thread/thr_sleepq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c
index 97680b99dc83..303e34e4afe0 100644
--- a/lib/libthr/thread/thr_spec.c
+++ b/lib/libthr/thread/thr_spec.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index 8680a7229018..51903a6948c9 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index b08bafdd9417..3510a74ab43f 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
* Copyright (c) 2000-2001 Jason Evans <jasone@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c
index 2d68582623dd..48d4bc149063 100644
--- a/lib/libthr/thread/thr_suspend_np.c
+++ b/lib/libthr/thread/thr_suspend_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c
index aad8641e4806..4380386e09f1 100644
--- a/lib/libthr/thread/thr_switch_np.c
+++ b/lib/libthr/thread/thr_switch_np.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
index cee263c56826..9eef8db1a0a6 100644
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c
index 025dfc75fab6..92d0c99d2831 100644
--- a/lib/libthr/thread/thr_syscalls.c
+++ b/lib/libthr/thread/thr_syscalls.c
@@ -33,9 +33,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c
index 86e5a1f13780..085e04e22dfb 100644
--- a/lib/libthr/thread/thr_umtx.c
+++ b/lib/libthr/thread/thr_umtx.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_umtx.h b/lib/libthr/thread/thr_umtx.h
index 1017214adb5c..5dae304528da 100644
--- a/lib/libthr/thread/thr_umtx.h
+++ b/lib/libthr/thread/thr_umtx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c
index 0d666d52a554..1739495f1e09 100644
--- a/lib/libthr/thread/thr_yield.c
+++ b/lib/libthr/thread/thr_yield.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 83ec8c1b0367..624e650cacf0 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libthread_db/arch/arm/libpthread_md.c b/lib/libthread_db/arch/arm/libpthread_md.c
index 34ebbf4c5046..086a3b530088 100644
--- a/lib/libthread_db/arch/arm/libpthread_md.c
+++ b/lib/libthread_db/arch/arm/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2007 Olivier Houchard
* All rights reserved.
*
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index e657bf984a6f..784c245d93eb 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthread_db/arch/mips/libpthread_md.c b/lib/libthread_db/arch/mips/libpthread_md.c
index cef786a32887..6d4556fde766 100644
--- a/lib/libthread_db/arch/mips/libpthread_md.c
+++ b/lib/libthread_db/arch/mips/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2006-2007, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/lib/libthread_db/arch/powerpc/libpthread_md.c b/lib/libthread_db/arch/powerpc/libpthread_md.c
index a1302edcc278..fbe77f4dcbec 100644
--- a/lib/libthread_db/arch/powerpc/libpthread_md.c
+++ b/lib/libthread_db/arch/powerpc/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/lib/libthread_db/arch/sparc64/libpthread_md.c b/lib/libthread_db/arch/sparc64/libpthread_md.c
index d91ceaaa76bd..ffa67e9fde48 100644
--- a/lib/libthread_db/arch/sparc64/libpthread_md.c
+++ b/lib/libthread_db/arch/sparc64/libpthread_md.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Marcel Moolenaar
* Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libthread_db/kse.h b/lib/libthread_db/kse.h
index e85aa0f493d3..9eb544912844 100644
--- a/lib/libthread_db/kse.h
+++ b/lib/libthread_db/kse.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Julian Elischer <julian@freebsd.org>
* for the FreeBSD Foundation.
*
diff --git a/lib/libthread_db/libpthread_db.c b/lib/libthread_db/libpthread_db.c
index 5e2453c760f6..49dd98f64aae 100644
--- a/lib/libthread_db/libpthread_db.c
+++ b/lib/libthread_db/libpthread_db.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthread_db/libpthread_db.h b/lib/libthread_db/libpthread_db.h
index ec14298313d6..79f6aa5bcacb 100644
--- a/lib/libthread_db/libpthread_db.h
+++ b/lib/libthread_db/libpthread_db.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index 343467b5eb7b..c20394c7ef22 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 Marcel Moolenaar
* Copyright (c) 2005 David Xu
* All rights reserved.
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index 0bf4276dc19c..121855b73a24 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libthread_db/thread_db.h b/lib/libthread_db/thread_db.h
index 35f5c0683b8c..8c30812a54b5 100644
--- a/lib/libthread_db/thread_db.h
+++ b/lib/libthread_db/thread_db.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libthread_db/thread_db_int.h b/lib/libthread_db/thread_db_int.h
index fe520d911222..92ba6e5908ef 100644
--- a/lib/libthread_db/thread_db_int.h
+++ b/lib/libthread_db/thread_db_int.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index 7accc8863693..89b4f6c5749d 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index 1c35e534fb23..dfb10d3feb94 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2003 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index 161b7cdbca5c..6d94582b3e54 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h
index 27ffc27ec4eb..a16d82b604ad 100644
--- a/lib/libufs/libufs.h
+++ b/lib/libufs/libufs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index 06cf97d51581..d6bec3ed182e 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index 3fce7e26cec5..05904b9e40b3 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
* This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c
index 0c54b67ec1e4..7cd9ff0e6ee7 100644
--- a/lib/libugidfw/ugidfw.c
+++ b/lib/libugidfw/ugidfw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2005 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libugidfw/ugidfw.h b/lib/libugidfw/ugidfw.h
index 107626c1aad4..5b7fcf25a9f9 100644
--- a/lib/libugidfw/ugidfw.h
+++ b/lib/libugidfw/ugidfw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libulog/ulog.h b/lib/libulog/ulog.h
index f29f275b9c78..c5f6fa0cb416 100644
--- a/lib/libulog/ulog.h
+++ b/lib/libulog/ulog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libulog/ulog_login.c b/lib/libulog/ulog_login.c
index 7e86220cf584..a053328ac22d 100644
--- a/lib/libulog/ulog_login.c
+++ b/lib/libulog/ulog_login.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libulog/ulog_login_pseudo.c b/lib/libulog/ulog_login_pseudo.c
index be6978740350..c7f306604cfd 100644
--- a/lib/libulog/ulog_login_pseudo.c
+++ b/lib/libulog/ulog_login_pseudo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libulog/utempter.c b/lib/libulog/utempter.c
index 9d8fc0b35169..94495b0c50c9 100644
--- a/lib/libulog/utempter.c
+++ b/lib/libulog/utempter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libulog/utempter.h b/lib/libulog/utempter.h
index 272fee81a318..0e0274cf04fb 100644
--- a/lib/libulog/utempter.h
+++ b/lib/libulog/utempter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index bc0678003174..42f55ab5edaa 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb01.c b/lib/libusb/libusb01.c
index 8b2031e0b804..91ae6e2defab 100644
--- a/lib/libusb/libusb01.c
+++ b/lib/libusb/libusb01.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 27dcd79e53b9..e7aeee54ffdd 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h
index e516de17b1e9..86bf5e393dd7 100644
--- a/lib/libusb/libusb10.h
+++ b/lib/libusb/libusb10.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
index b0866a78b791..bbc3429f883f 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c
index e25b6a37d77d..a276231a652c 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb20.c b/lib/libusb/libusb20.c
index 1bad0ec16877..91ed9d797afd 100644
--- a/lib/libusb/libusb20.c
+++ b/lib/libusb/libusb20.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb20.h b/lib/libusb/libusb20.h
index a35cde59b609..6d1613e3e649 100644
--- a/lib/libusb/libusb20.h
+++ b/lib/libusb/libusb20.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
* Copyright (c) 2001 Johannes Erdfelt. All rights reserved.
diff --git a/lib/libusb/libusb20_desc.c b/lib/libusb/libusb20_desc.c
index 517a2e5972c3..c285193664ab 100644
--- a/lib/libusb/libusb20_desc.c
+++ b/lib/libusb/libusb20_desc.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb20_desc.h b/lib/libusb/libusb20_desc.h
index bb7724294cb4..c5f085f30cff 100644
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
* Copyright (c) 2001 Johannes Erdfelt. All rights reserved.
diff --git a/lib/libusb/libusb20_int.h b/lib/libusb/libusb20_int.h
index 9ba6359965b2..7a1c515dff29 100644
--- a/lib/libusb/libusb20_int.h
+++ b/lib/libusb/libusb20_int.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb20_ugen20.c b/lib/libusb/libusb20_ugen20.c
index a4fac6067d07..be2acee7e9e0 100644
--- a/lib/libusb/libusb20_ugen20.c
+++ b/lib/libusb/libusb20_ugen20.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/libusb_global_linux.h b/lib/libusb/libusb_global_linux.h
index 3753a9fba309..13d344a92ea0 100644
--- a/lib/libusb/libusb_global_linux.h
+++ b/lib/libusb/libusb_global_linux.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusb/usb.h b/lib/libusb/usb.h
index 1a71029e9c0e..d7bbaa558279 100644
--- a/lib/libusb/usb.h
+++ b/lib/libusb/usb.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index ae81bb321095..f607737522d7 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -1,8 +1,6 @@
/* $NetBSD: data.c,v 1.8 2000/04/02 11:10:53 augustss Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index 329bbe9261b7..4ca9dd795d09 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -1,8 +1,6 @@
/* $NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c
index 237319269a2c..a38d8d705e04 100644
--- a/lib/libusbhid/descr_compat.c
+++ b/lib/libusbhid/descr_compat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 885c72fe33b0..7a2b3f41eea9 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -1,8 +1,6 @@
/* $NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999, 2001 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c
index fba9c668bd33..3960dad8076a 100644
--- a/lib/libusbhid/usage.c
+++ b/lib/libusbhid/usage.c
@@ -1,8 +1,6 @@
/* $NetBSD: usage.c,v 1.8 2000/10/10 19:23:58 is Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index 971884ba8ee9..231ee1fe8a77 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -1,8 +1,6 @@
/* $NetBSD: usb.h,v 1.8 2000/08/13 22:22:02 augustss Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h
index 5072f4787e42..2722a3783fac 100644
--- a/lib/libusbhid/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -1,8 +1,6 @@
/* $NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
*
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index ddc8eec0fad3..b57a784dc5e7 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Simple authentication database handling code.
*
* Copyright (c) 1998
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 77db2266f5e2..24bcc39a35e9 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Eric Anderson <anderson@FreeBSD.org>
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 436ec2018653..d03357eae95c 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,8 +1,6 @@
/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c
index 796cbf021ded..fcc08209e0cc 100644
--- a/lib/libutil/gr_util.c
+++ b/lib/libutil/gr_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libutil/hexdump.c b/lib/libutil/hexdump.c
index 735204885108..76b93ce7a383 100644
--- a/lib/libutil/hexdump.c
+++ b/lib/libutil/hexdump.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 5e8fe3dfd188..675a969aaa1e 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -1,8 +1,6 @@
/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
* Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libutil/kinfo_getallproc.c b/lib/libutil/kinfo_getallproc.c
index 609d77a259ac..8620f48545dc 100644
--- a/lib/libutil/kinfo_getallproc.c
+++ b/lib/libutil/kinfo_getallproc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2009 Ulf Lilleengen
* All rights reserved.
diff --git a/lib/libutil/kinfo_getproc.c b/lib/libutil/kinfo_getproc.c
index 4d16b1c16a13..496f71f55559 100644
--- a/lib/libutil/kinfo_getproc.c
+++ b/lib/libutil/kinfo_getproc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ulf Lilleengen
* All rights reserved.
*
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index 970ee50e2936..b4a6ab6d6fbf 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index bc9447055c07..b20ffa291a90 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 Peter Wemm <peter@FreeBSD.org>.
* All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index b5ab10e6be85..c65fc9b8328a 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Brian Fundakowski Feldman
* All rights reserved.
*
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index ef082ba07d74..92dc87fe710c 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index 21df5d2a27ed..157a53c7448f 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index f65a970e685b..a944f9d2fb23 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
*
* Simple property list handling code.
*
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 4869bdfb1520..7e0640804082 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index c91f55f3161c..627d79b301c5 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -1,6 +1,4 @@
-/*--
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c
index 2172a5b8e430..27444c2e31a5 100644
--- a/lib/libutil/quotafile.c
+++ b/lib/libutil/quotafile.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008 Marshall Kirk McKusick
* All rights reserved.
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 31dd1a50445c..87ac1dda85cb 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index 55d6e0c45fba..ec78a3503609 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Brian Fundakowski Feldman
* All rights reserved.
*
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index a783070bcd8c..85c27e0a1c10 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* Based on original work by Atsushi Murai <amurai@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 3bde858e6c6d..424ac26651e1 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index f98f533acd1c..fa130c580583 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index dc1b25cdaeec..9811650cc4a8 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index b78ce6cd5255..964d355377f9 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index f38c4bf9f34e..7d9465b1b541 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index d66176d786a6..4ca90fc05a5a 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index a090b8243233..289dd01181c9 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index 267c7a0f1673..742a903c0763 100644
--- a/lib/libvgl/vgl.h
+++ b/lib/libvgl/vgl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index b409c4f61303..9ba07d7e0b03 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
index 773c5995ffd7..df3a81b5aad9 100644
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/lib/libvmmapi/vmmapi_freebsd.c b/lib/libvmmapi/vmmapi_freebsd.c
index adb7717d19fe..d8011845541b 100644
--- a/lib/libvmmapi/vmmapi_freebsd.c
+++ b/lib/libvmmapi/vmmapi_freebsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/lib/liby/main.c b/lib/liby/main.c
index ee331e7ed86f..4301ca1f4a58 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 11718d97ed23..6cdcd603a062 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt.h b/lib/libypclnt/ypclnt.h
index c41e10efbba4..9cd204827726 100644
--- a/lib/libypclnt/ypclnt.h
+++ b/lib/libypclnt/ypclnt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_connect.c b/lib/libypclnt/ypclnt_connect.c
index 8b71c9314a3b..25d2f9ffb1c3 100644
--- a/lib/libypclnt/ypclnt_connect.c
+++ b/lib/libypclnt/ypclnt_connect.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_error.c b/lib/libypclnt/ypclnt_error.c
index 99cb7f703c5e..a7d986f19dd9 100644
--- a/lib/libypclnt/ypclnt_error.c
+++ b/lib/libypclnt/ypclnt_error.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_free.c b/lib/libypclnt/ypclnt_free.c
index ae2ba1cf8b7f..f5e78a42054e 100644
--- a/lib/libypclnt/ypclnt_free.c
+++ b/lib/libypclnt/ypclnt_free.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_get.c b/lib/libypclnt/ypclnt_get.c
index 5d2015ae3719..8a709719959e 100644
--- a/lib/libypclnt/ypclnt_get.c
+++ b/lib/libypclnt/ypclnt_get.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_new.c b/lib/libypclnt/ypclnt_new.c
index 510f16c1405c..650cfdd62f7e 100644
--- a/lib/libypclnt/ypclnt_new.c
+++ b/lib/libypclnt/ypclnt_new.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
index cbabb2ed456d..86844eb48e99 100644
--- a/lib/libypclnt/ypclnt_passwd.c
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c
index bcb0ea7bda3e..8b49b35c3eec 100644
--- a/lib/msun/amd64/fenv.c
+++ b/lib/msun/amd64/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index a2250b6fe016..16f1f48a24c8 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* Copyright (c) 2013 Andrew Turner <andrew@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
index 1e1bcbcb417b..280532fc2175 100644
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index f922d02a03aa..4400992795b6 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 23dbde4edeaa..b5583f22d7e0 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 832a729c20f8..1d0af4432863 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index abf299658615..04a4b6e3d788 100644
--- a/lib/msun/bsdsrc/mathimpl.h
+++ b/lib/msun/bsdsrc/mathimpl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index 80cfa1e8f2c4..6f51ba24a0f7 100644
--- a/lib/msun/i387/fenv.c
+++ b/lib/msun/i387/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/i387/invtrig.c b/lib/msun/i387/invtrig.c
index 425a2d14d7e8..fac2d05c2662 100644
--- a/lib/msun/i387/invtrig.c
+++ b/lib/msun/i387/invtrig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld128/invtrig.c b/lib/msun/ld128/invtrig.c
index ab93732c8dc8..4ceca8a4558a 100644
--- a/lib/msun/ld128/invtrig.c
+++ b/lib/msun/ld128/invtrig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld128/invtrig.h b/lib/msun/ld128/invtrig.h
index 423b56847031..12f598be283d 100644
--- a/lib/msun/ld128/invtrig.h
+++ b/lib/msun/ld128/invtrig.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld128/k_expl.h b/lib/msun/ld128/k_expl.h
index 38a9cb98b33d..e0a48fc2093f 100644
--- a/lib/msun/ld128/k_expl.h
+++ b/lib/msun/ld128/k_expl.h
@@ -1,8 +1,6 @@
/* from: FreeBSD: head/lib/msun/ld128/s_expl.c 251345 2013-06-03 20:09:22Z kargl */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/ld128/s_exp2l.c b/lib/msun/ld128/s_exp2l.c
index ee3d2c782cf8..5afa37e58222 100644
--- a/lib/msun/ld128/s_exp2l.c
+++ b/lib/msun/ld128/s_exp2l.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c
index f624d5143902..a6a967675033 100644
--- a/lib/msun/ld128/s_expl.c
+++ b/lib/msun/ld128/s_expl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c
index 01ad3d8d8669..391d623fcd55 100644
--- a/lib/msun/ld128/s_logl.c
+++ b/lib/msun/ld128/s_logl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2013 Bruce D. Evans
* All rights reserved.
*
diff --git a/lib/msun/ld128/s_nanl.c b/lib/msun/ld128/s_nanl.c
index 45d10e5a8871..0f74a1312a79 100644
--- a/lib/msun/ld128/s_nanl.c
+++ b/lib/msun/ld128/s_nanl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz
* All rights reserved.
*
diff --git a/lib/msun/ld80/invtrig.c b/lib/msun/ld80/invtrig.c
index 5c8047857dab..06d0092f16a7 100644
--- a/lib/msun/ld80/invtrig.c
+++ b/lib/msun/ld80/invtrig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld80/invtrig.h b/lib/msun/ld80/invtrig.h
index be06a044bdbf..fe30c01b7273 100644
--- a/lib/msun/ld80/invtrig.h
+++ b/lib/msun/ld80/invtrig.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld80/k_expl.h b/lib/msun/ld80/k_expl.h
index 2d803ea647ed..1c2213e023da 100644
--- a/lib/msun/ld80/k_expl.h
+++ b/lib/msun/ld80/k_expl.h
@@ -1,8 +1,6 @@
/* from: FreeBSD: head/lib/msun/ld80/s_expl.c 251343 2013-06-03 19:51:32Z kargl */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/ld80/s_exp2l.c b/lib/msun/ld80/s_exp2l.c
index 421d6e2e04b4..8730f1397186 100644
--- a/lib/msun/ld80/s_exp2l.c
+++ b/lib/msun/ld80/s_exp2l.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c
index d28b7dd0317c..3147d358788d 100644
--- a/lib/msun/ld80/s_expl.c
+++ b/lib/msun/ld80/s_expl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c
index 0a220f2a2403..e0daed740de8 100644
--- a/lib/msun/ld80/s_logl.c
+++ b/lib/msun/ld80/s_logl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2013 Bruce D. Evans
* All rights reserved.
*
diff --git a/lib/msun/ld80/s_nanl.c b/lib/msun/ld80/s_nanl.c
index ffc835a10e65..bbfd29537c30 100644
--- a/lib/msun/ld80/s_nanl.c
+++ b/lib/msun/ld80/s_nanl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz
* All rights reserved.
*
diff --git a/lib/msun/mips/fenv.c b/lib/msun/mips/fenv.c
index 7fac8ab53b51..a5a5c03d3a74 100644
--- a/lib/msun/mips/fenv.c
+++ b/lib/msun/mips/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/mips/fenv.h b/lib/msun/mips/fenv.h
index 94639d524699..f11499806bea 100644
--- a/lib/msun/mips/fenv.h
+++ b/lib/msun/mips/fenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c
index b7e611ed99a0..3f4801bbd81b 100644
--- a/lib/msun/powerpc/fenv.c
+++ b/lib/msun/powerpc/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h
index 27354e14f0f2..33de3750a93a 100644
--- a/lib/msun/powerpc/fenv.h
+++ b/lib/msun/powerpc/fenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/sparc64/fenv.c b/lib/msun/sparc64/fenv.c
index 802587582fd4..c4d3e5de67cc 100644
--- a/lib/msun/sparc64/fenv.c
+++ b/lib/msun/sparc64/fenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/sparc64/fenv.h b/lib/msun/sparc64/fenv.h
index d42702323580..0faf08d450b8 100644
--- a/lib/msun/sparc64/fenv.h
+++ b/lib/msun/sparc64/fenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/catrig.c b/lib/msun/src/catrig.c
index 6ca35af15ff9..ba5cbf5e8975 100644
--- a/lib/msun/src/catrig.c
+++ b/lib/msun/src/catrig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Stephen Montgomery-Smith <stephen@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/catrigf.c b/lib/msun/src/catrigf.c
index 9533aab71751..3067d314b910 100644
--- a/lib/msun/src/catrigf.c
+++ b/lib/msun/src/catrigf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Stephen Montgomery-Smith <stephen@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/e_remainderl.c b/lib/msun/src/e_remainderl.c
index 4a6786309f2f..03327b8e6d9e 100644
--- a/lib/msun/src/e_remainderl.c
+++ b/lib/msun/src/e_remainderl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/e_sqrtl.c b/lib/msun/src/e_sqrtl.c
index 565d963963c1..92b84def8d57 100644
--- a/lib/msun/src/e_sqrtl.c
+++ b/lib/msun/src/e_sqrtl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/fenv-softfloat.h b/lib/msun/src/fenv-softfloat.h
index 014d1276922a..48c12772f0de 100644
--- a/lib/msun/src/fenv-softfloat.h
+++ b/lib/msun/src/fenv-softfloat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/imprecise.c b/lib/msun/src/imprecise.c
index c6a16ed8f668..08cd23980603 100644
--- a/lib/msun/src/imprecise.c
+++ b/lib/msun/src/imprecise.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/lib/msun/src/k_exp.c b/lib/msun/src/k_exp.c
index c6dfc953c39d..ecef54c0f3c1 100644
--- a/lib/msun/src/k_exp.c
+++ b/lib/msun/src/k_exp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/k_expf.c b/lib/msun/src/k_expf.c
index 5b0993f9b1bd..f8c254d1d5bb 100644
--- a/lib/msun/src/k_expf.c
+++ b/lib/msun/src/k_expf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_carg.c b/lib/msun/src/s_carg.c
index 1611b9de3387..ea1a0d771636 100644
--- a/lib/msun/src/s_carg.c
+++ b/lib/msun/src/s_carg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cargf.c b/lib/msun/src/s_cargf.c
index 71c705daa0c9..90232d048faa 100644
--- a/lib/msun/src/s_cargf.c
+++ b/lib/msun/src/s_cargf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cargl.c b/lib/msun/src/s_cargl.c
index 96c3336bd1c2..0555083201aa 100644
--- a/lib/msun/src/s_cargl.c
+++ b/lib/msun/src/s_cargl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_ccosh.c b/lib/msun/src/s_ccosh.c
index db6f108a429e..2843198c3571 100644
--- a/lib/msun/src/s_ccosh.c
+++ b/lib/msun/src/s_ccosh.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_ccoshf.c b/lib/msun/src/s_ccoshf.c
index 3e3d242e346a..eeed92f8cf46 100644
--- a/lib/msun/src/s_ccoshf.c
+++ b/lib/msun/src/s_ccoshf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_cexp.c b/lib/msun/src/s_cexp.c
index 2ef8ba1972ca..9e11d515a68f 100644
--- a/lib/msun/src/s_cexp.c
+++ b/lib/msun/src/s_cexp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cexpf.c b/lib/msun/src/s_cexpf.c
index b815c99af89f..0138cd1e83fb 100644
--- a/lib/msun/src/s_cexpf.c
+++ b/lib/msun/src/s_cexpf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c
index 1f383cb2aae6..cbf6720bdd82 100644
--- a/lib/msun/src/s_cimag.c
+++ b/lib/msun/src/s_cimag.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c
index 86a43c116987..4e483a2a7f75 100644
--- a/lib/msun/src/s_cimagf.c
+++ b/lib/msun/src/s_cimagf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c
index 6d879505820a..c50e967b73ec 100644
--- a/lib/msun/src/s_cimagl.c
+++ b/lib/msun/src/s_cimagl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_conj.c b/lib/msun/src/s_conj.c
index dc56f48b217b..d0dd05133f29 100644
--- a/lib/msun/src/s_conj.c
+++ b/lib/msun/src/s_conj.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_conjf.c b/lib/msun/src/s_conjf.c
index 3fd8b8f02c6a..c4cf127f8c22 100644
--- a/lib/msun/src/s_conjf.c
+++ b/lib/msun/src/s_conjf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_conjl.c b/lib/msun/src/s_conjl.c
index d2f8d0fd3700..a4604b6fd166 100644
--- a/lib/msun/src/s_conjl.c
+++ b/lib/msun/src/s_conjl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_copysignl.c b/lib/msun/src/s_copysignl.c
index bd6744705587..8d39f841db20 100644
--- a/lib/msun/src/s_copysignl.c
+++ b/lib/msun/src/s_copysignl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_cosl.c b/lib/msun/src/s_cosl.c
index 46a2e8620a22..22e74cf675a4 100644
--- a/lib/msun/src/s_cosl.c
+++ b/lib/msun/src/s_cosl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_cproj.c b/lib/msun/src/s_cproj.c
index 220b4c83fe31..2f0db6e6151e 100644
--- a/lib/msun/src/s_cproj.c
+++ b/lib/msun/src/s_cproj.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cprojf.c b/lib/msun/src/s_cprojf.c
index af4c3a80ce5e..bd27bdcb0b51 100644
--- a/lib/msun/src/s_cprojf.c
+++ b/lib/msun/src/s_cprojf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_cprojl.c b/lib/msun/src/s_cprojl.c
index 16df514f3671..5cccc9170811 100644
--- a/lib/msun/src/s_cprojl.c
+++ b/lib/msun/src/s_cprojl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_creal.c b/lib/msun/src/s_creal.c
index 69a10f2790df..3295ff281b03 100644
--- a/lib/msun/src/s_creal.c
+++ b/lib/msun/src/s_creal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_crealf.c b/lib/msun/src/s_crealf.c
index 83e4d4632dc1..5819b86b790f 100644
--- a/lib/msun/src/s_crealf.c
+++ b/lib/msun/src/s_crealf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_creall.c b/lib/msun/src/s_creall.c
index 538b7d53d191..e4946f9fd088 100644
--- a/lib/msun/src/s_creall.c
+++ b/lib/msun/src/s_creall.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
*
diff --git a/lib/msun/src/s_csinh.c b/lib/msun/src/s_csinh.c
index 1a32bf99b812..7af363454b58 100644
--- a/lib/msun/src/s_csinh.c
+++ b/lib/msun/src/s_csinh.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_csinhf.c b/lib/msun/src/s_csinhf.c
index 03c2082df207..c9d9d3c911da 100644
--- a/lib/msun/src/s_csinhf.c
+++ b/lib/msun/src/s_csinhf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_csqrt.c b/lib/msun/src/s_csqrt.c
index 807532d2ae09..75e12d8a4940 100644
--- a/lib/msun/src/s_csqrt.c
+++ b/lib/msun/src/s_csqrt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_csqrtf.c b/lib/msun/src/s_csqrtf.c
index e7a2f68b4283..7ee513f2d760 100644
--- a/lib/msun/src/s_csqrtf.c
+++ b/lib/msun/src/s_csqrtf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_csqrtl.c b/lib/msun/src/s_csqrtl.c
index d46fca7f4857..01cc4090e964 100644
--- a/lib/msun/src/s_csqrtl.c
+++ b/lib/msun/src/s_csqrtl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_ctanh.c b/lib/msun/src/s_ctanh.c
index c8ecd5d713f7..f5b9bdd9d5f8 100644
--- a/lib/msun/src/s_ctanh.c
+++ b/lib/msun/src/s_ctanh.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz
* All rights reserved.
*
diff --git a/lib/msun/src/s_ctanhf.c b/lib/msun/src/s_ctanhf.c
index cc4ab41c861f..520bf77d6d5c 100644
--- a/lib/msun/src/s_ctanhf.c
+++ b/lib/msun/src/s_ctanhf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David Schultz
* All rights reserved.
*
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index bc36e5564a8e..5cf2e15bd259 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index c082924af5d3..9ac7c1f6cac2 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fabsl.c b/lib/msun/src/s_fabsl.c
index 5076d8a9b4d3..29831d2d24fd 100644
--- a/lib/msun/src/s_fabsl.c
+++ b/lib/msun/src/s_fabsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Dag-Erling Smørgrav
* All rights reserved.
*
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index c40c3e9d32ae..2f347fda6fe0 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index 41a6424fdf7f..b1066c20a15f 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index 389cf1b11bee..3695823f8314 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index a379346c171f..d435f4f451fd 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index 0c234bcc5f7f..77e27bec9bf7 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 8e9d1baf3e8e..423da54517e8 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index c0d7c88325c7..0ac48a976cc4 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index d7f24c121fb2..5545ff2fa1c0 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 258316725ddd..76a5c76a997d 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index 97604b38b487..f9d3ebb05852 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_frexpl.c b/lib/msun/src/s_frexpl.c
index 66e284fdd07d..d34f55d9f4f8 100644
--- a/lib/msun/src/s_frexpl.c
+++ b/lib/msun/src/s_frexpl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_isfinite.c b/lib/msun/src/s_isfinite.c
index 838d8b2e9d70..c9d1bd7a1347 100644
--- a/lib/msun/src/s_isfinite.c
+++ b/lib/msun/src/s_isfinite.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index 249c00615748..a54ded3fe44c 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_isnormal.c b/lib/msun/src/s_isnormal.c
index eb57c8a37b1e..49f2a74346b3 100644
--- a/lib/msun/src/s_isnormal.c
+++ b/lib/msun/src/s_isnormal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index ad9b978fa8f4..27ff5ffbbb9b 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 0cd3b3e6ba76..3cff4898ab4f 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_modfl.c b/lib/msun/src/s_modfl.c
index 2d83bbe339df..3dcdf86c17ff 100644
--- a/lib/msun/src/s_modfl.c
+++ b/lib/msun/src/s_modfl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_nan.c b/lib/msun/src/s_nan.c
index 659e98179770..890f4714f6ef 100644
--- a/lib/msun/src/s_nan.c
+++ b/lib/msun/src/s_nan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 David Schultz
* All rights reserved.
*
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index 796dbaf98443..063f8d7365f9 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_rintl.c b/lib/msun/src/s_rintl.c
index 1e9824d83b49..b43df89f53f3 100644
--- a/lib/msun/src/s_rintl.c
+++ b/lib/msun/src/s_rintl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index ca25f8efd5ec..fab3019b4cef 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index 5bbf6b33b631..e7e2eb928cf0 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index 8d1c02a7f840..2d15e134f646 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index c27420c9297b..5e4e42e9dcf0 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/src/s_signbit.c b/lib/msun/src/s_signbit.c
index 123bcbc6471b..01eb3ab8b2e6 100644
--- a/lib/msun/src/s_signbit.c
+++ b/lib/msun/src/s_signbit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/lib/msun/src/s_sinl.c b/lib/msun/src/s_sinl.c
index f1ef84c8cae7..f454f8f9b5af 100644
--- a/lib/msun/src/s_sinl.c
+++ b/lib/msun/src/s_sinl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_tanl.c b/lib/msun/src/s_tanl.c
index 0c5228ec8f9e..eadc8375dc74 100644
--- a/lib/msun/src/s_tanl.c
+++ b/lib/msun/src/s_tanl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
*
diff --git a/lib/msun/src/s_tgammaf.c b/lib/msun/src/s_tgammaf.c
index 1fd46e8098d3..9993d91aae6b 100644
--- a/lib/msun/src/s_tgammaf.c
+++ b/lib/msun/src/s_tgammaf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h
index a4270be8d6da..a4e452d5e465 100644
--- a/lib/msun/x86/fenv.h
+++ b/lib/msun/x86/fenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
*
diff --git a/lib/ncurses/ncurses/pathnames.h b/lib/ncurses/ncurses/pathnames.h
index b0af258b6c45..dde6cc9d8543 100644
--- a/lib/ncurses/ncurses/pathnames.h
+++ b/lib/ncurses/ncurses/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/ncurses/ncurses/termcap.c b/lib/ncurses/ncurses/termcap.c
index 1736d4fe29e9..085cc484c858 100644
--- a/lib/ncurses/ncurses/termcap.c
+++ b/lib/ncurses/ncurses/termcap.c
@@ -27,9 +27,7 @@
#include <term_entry.h>
/* The rest is from BSD */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index a689a5ac139f..a3dbb8e06805 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1984, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index c9d490d2cf6e..4420f00f7a12 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index ff8d5046a577..485afe5b06b7 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/fingerd/pathnames.h b/libexec/fingerd/pathnames.h
index 5f70e892e5b8..0a9154112eca 100644
--- a/libexec/fingerd/pathnames.h
+++ b/libexec/fingerd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 80d24b46d2e4..9d56cb235b4c 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 43718a44191f..8d4e3bdeae2f 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 38fc9ebb4778..badabacb348b 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 0ae48dd4cd7b..9beade307044 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index 47dc25a5dfe7..208303498654 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 082b2270a953..2dad033f0419 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 9ee77f06eeda..c7b73a87236e 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 2d3972e3bc10..83b17f013740 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index cac81fb072dd..a7077a332665 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 61e13ba2cad6..9b2c964873bf 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 749875a6d183..df59a2ca85cf 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 3d8a658c17b3..2496b4c40b2f 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index d340142aad90..b4a39cbc12ec 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index c1cf98cb2765..7918ae2e95f0 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 3a39b4b3e675..66868664c3c5 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index e876bd9f2ff0..6244a8c6847e 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index 0edcc06ccf7e..bfe20adc426e 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index af46f53c3c88..32b878274548 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h
index 4c082cbbfc78..ebf82439cf76 100644
--- a/libexec/rbootd/defs.h
+++ b/libexec/rbootd/defs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 9585e87185c6..58b9ac5d6a4b 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/pathnames.h b/libexec/rbootd/pathnames.h
index 49412a9eb0f4..54f8c67bf3a3 100644
--- a/libexec/rbootd/pathnames.h
+++ b/libexec/rbootd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 3bc02ec9cb80..de142f17fbec 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/rmp.h b/libexec/rbootd/rmp.h
index 0e8d17532ec0..09b67eedce01 100644
--- a/libexec/rbootd/rmp.h
+++ b/libexec/rbootd/rmp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/rmp_var.h b/libexec/rbootd/rmp_var.h
index 8c5201295ccc..fdaacf7c7c51 100644
--- a/libexec/rbootd/rmp_var.h
+++ b/libexec/rbootd/rmp_var.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 26f4a069581e..aa4be5647222 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index f5c2d62d30d7..81ef584813bc 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
* for Software Science (CSS).
* Copyright (c) 1992, 1993
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 2dd1a3f91d74..118008023551 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index b12c91e8d293..2485901ed68e 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index a1e954164ea9..b89148143894 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 11fba515a7ba..505c482b3be8 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 6a6b09b9ae0c..bb74eb806024 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/libexec/rpc.rusersd/extern.h b/libexec/rpc.rusersd/extern.h
index 8c2fef55755f..ac91526318ed 100644
--- a/libexec/rpc.rusersd/extern.h
+++ b/libexec/rpc.rusersd/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index bfb65dadb004..51e9a4dc0faf 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index e1e77398c8ff..2a1e7bdadb31 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 5aa3e07b3fcb..a277d87f3b6c 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
*
diff --git a/libexec/rtld-elf/rtld_printf.c b/libexec/rtld-elf/rtld_printf.c
index 761d69c5b85d..9d945dc3b260 100644
--- a/libexec/rtld-elf/rtld_printf.c
+++ b/libexec/rtld-elf/rtld_printf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 9cf326669998..00c01ac6d735 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 4d10329dd7f8..9a749618ff70 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 2bd22a1becb2..742043f8ceb0 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index ed1560f86ff8..30200c45e997 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 984afbce905a..a444fe7c9ed3 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index e8ae35506ae3..26d81051ab5a 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 120e6748b609..488f9e4ad446 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index 6929bf38f27e..f843b645b6dd 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 5fc45b327d85..1bde10efe3d4 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index d7eb75a94c51..03ebbe12fcaf 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 3ee3ff58b8d5..323fd53cf9cd 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 2358b68b9be2..a5ac92da578d 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/release/picobsd/tinyware/login/pathnames.h b/release/picobsd/tinyware/login/pathnames.h
index 1984631aa944..333c2ca280fa 100644
--- a/release/picobsd/tinyware/login/pathnames.h
+++ b/release/picobsd/tinyware/login/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/login/pico-login.c b/release/picobsd/tinyware/login/pico-login.c
index 080954c8bfcd..e540ca861a51 100644
--- a/release/picobsd/tinyware/login/pico-login.c
+++ b/release/picobsd/tinyware/login/pico-login.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index 0c6c9f505ec6..eae768c6e82a 100644
--- a/release/picobsd/tinyware/passwd/extern.h
+++ b/release/picobsd/tinyware/passwd/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/local_passwd.c b/release/picobsd/tinyware/passwd/local_passwd.c
index 41b6fe998443..33af88ac38c7 100644
--- a/release/picobsd/tinyware/passwd/local_passwd.c
+++ b/release/picobsd/tinyware/passwd/local_passwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/passwd.c b/release/picobsd/tinyware/passwd/passwd.c
index 419396390afe..42ebd8c1fd48 100644
--- a/release/picobsd/tinyware/passwd/passwd.c
+++ b/release/picobsd/tinyware/passwd/passwd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_copy.c b/release/picobsd/tinyware/passwd/pw_copy.c
index 7586980e4a55..753e1a67ff81 100644
--- a/release/picobsd/tinyware/passwd/pw_copy.c
+++ b/release/picobsd/tinyware/passwd/pw_copy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_util.c b/release/picobsd/tinyware/passwd/pw_util.c
index cfab6e115269..1c163d2d57ed 100644
--- a/release/picobsd/tinyware/passwd/pw_util.c
+++ b/release/picobsd/tinyware/passwd/pw_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_util.h b/release/picobsd/tinyware/passwd/pw_util.h
index d441b1907966..1000a9abdc7f 100644
--- a/release/picobsd/tinyware/passwd/pw_util.h
+++ b/release/picobsd/tinyware/passwd/pw_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index af91dcc16b61..072c4cfa0884 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1994, 1995 Gordon W. Ross
* Copyright (c) 1994 Theo de Raadt
* All rights reserved.
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index 4df05892debb..c8a9ef362e54 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 23f28c7f4918..ff41d1a57cbe 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 64cf63725bd0..8757f62ac87e 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2010 M. Warner Losh.
* All rights reserved.
*
diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index c3ea309a5456..cd60ceca7d83 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -2,9 +2,7 @@
/* Memory allocation... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index a9da1f0a5a9f..78b9eb624e88 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -2,9 +2,7 @@
/* BPF socket interface code, originally contributed by Archie Cobbs. */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1998, 1999
* The Internet Software Consortium. All rights reserved.
*
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index ac80db5e8cfb..16aeb8f101a4 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -2,9 +2,7 @@
/* Parser for dhclient config and lease files... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 480f99289eb3..72113397bdd1 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -2,9 +2,7 @@
/* Lexical scanner for dhcpd config file... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index c30195254d4b..adca0929a07c 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -5,9 +5,7 @@
* which can't be assumed to be aligned.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index c0332b9fd55b..12719e848449 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,8 +1,6 @@
/* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index e4dcfb93271e..6e7d1a743bc9 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -3,9 +3,7 @@
/* Protocol structures... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index e44a98c81499..a72905151820 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,8 +1,6 @@
/* $OpenBSD: dhcpd.h,v 1.33 2004/05/06 22:29:15 deraadt Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 327ecaf1726d..a2f5eef24603 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,8 +1,6 @@
/* $OpenBSD: dispatch.c,v 1.31 2004/09/21 04:07:03 david Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index 1a70fc3504cb..57207807902f 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -2,9 +2,7 @@
/* Errors and warnings... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 The Internet Software Consortium.
* All Rights Reserved.
* Copyright (c) 1995 RadioMail Corporation. All rights reserved.
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index d16a3e66d857..040236ab735b 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -2,9 +2,7 @@
/* Routines for manipulating hash tables... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index c72a7f6b702e..1e4640717e63 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -5,9 +5,7 @@
* way...
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 The Internet Software Consortium. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index e0515f367a37..d88ab7f588a5 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -2,9 +2,7 @@
/* DHCP options parsing and reassembly. */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 2328d577386d..034c39b6c402 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -2,9 +2,7 @@
/* Packet assembly code, originally contributed by Archie Cobbs. */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1999 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index d82d598a7fac..398cb26089b9 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -2,9 +2,7 @@
/* Common parser code for dhcpd and dhclient. */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 062eaccf5427..c7bac57e4772 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -2,9 +2,7 @@
/* Tables of information... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 9639cb87321b..dc0e064eeb7d 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -2,9 +2,7 @@
/* Routines for manipulating parse trees... */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 41132095fabe..827ed8e28c2b 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 528b7fc05db2..4a8af104d4df 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 6b8b83979ab0..dd02642bdbf6 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index f01889edf890..e57faa511e9d 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index b7c59a44f761..ee02728875ae 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 83bea1f76d75..bffcdc8bb7e8 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index 6cd3cfd0b092..eb3ce3977af2 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 8d49f3e1f35a..ff4e397849dd 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 7643b3b919b6..2aa0305a6867 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index f84d9fda3b79..3720ebf550fd 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 245f3b863249..ab76db6de234 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 81f1ce94344a..8407111c7f65 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c
index fd2a7fb86db2..b9bd3b9c56ff 100644
--- a/sbin/etherswitchcfg/ifmedia.c
+++ b/sbin/etherswitchcfg/ifmedia.c
@@ -1,9 +1,7 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 6b0b0395ad0d..c1e7c87c1b47 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 7895ee7b6557..728acee4f52b 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,8 +1,6 @@
/* $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 4fb0750e1a82..935992e9bda4 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -1,8 +1,6 @@
/* $NetBSD: fsutil.c,v 1.15 2006/06/05 16:52:05 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 967e0b21f984..d367eb2453d1 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,8 +1,6 @@
/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 775aa431175c..604349779c4e 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index ab05b1257613..12f863a719b4 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 77b2f546af34..52a982f180dd 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index 7fa33ae01353..ba8dc3416a96 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index 41315e6bd409..a64224965f9c 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index b3908ea78a04..d13c5b270e19 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index ff8bc6691449..98cdafdd20f9 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 032cfe827b88..515dffeaef4f 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index c61f02f51318..52f74792c049 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 0d7320208b9c..36a41ac960cc 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 782822cd7d8e..22309cbbde57 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index a43033d1143e..3b64dfbaf537 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 318800e0f480..67ad68a71ef0 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 341b081b85c7..69d4afc18e5f 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 8f857c3438da..1a78cfda91ee 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 7774ae3cbb23..d3710133c013 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 068e89c3441f..3cad9d97874c 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index b71e415f0317..a212d13d3521 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index e9c112a5e936..8b72eea7834f 100644
--- a/sbin/gvinum/gvinum.h
+++ b/sbin/gvinum/gvinum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Nan Yang Computer Services Limited. All rights reserved.
*
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 68ac0a50bc3f..ed8419a58fcd 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index 2d99f0e81ccf..2c9c2f070110 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index 148b9c73d665..c2aafa734738 100644
--- a/sbin/ifconfig/af_link.c
+++ b/sbin/ifconfig/af_link.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c
index 8806722c4b84..21dcdc3dec8e 100644
--- a/sbin/ifconfig/ifclone.c
+++ b/sbin/ifconfig/ifclone.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 1837d962ee19..5fe59233e852 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 983b0b78bf04..c289193509f2 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,9 +1,7 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index a29c50f11efa..3b37160c3c85 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1999 Bill Paul <wpaul@ctr.columbia.edu>
* Copyright (c) 2012 ADARA Networks, Inc.
* All rights reserved.
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 724e6aa9856e..f4206c4831c1 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 8627d251befb..ec33b458c9b7 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index f6847ba52dbc..76bb2e549c7b 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 3e0d3b20a94c..59a383ebe5f0 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 430cbf4366b7..4cb83f15e6e5 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index e7b678d9575f..08ddc290e447 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 6591f2e8baf1..385cd0fb5637 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index 715d8379b67e..aaa0a2c10e1e 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 9f4b5a826bd6..fa5fdf6d9540 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 7fb9fabaf11d..7ea606439ef2 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index adfa7a318e3b..919333718768 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 21edaff09df4..e08599fca549 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 34b9342b756a..7585c501cf97 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Scott Long
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index fb3fdf3a6e55..1026ecf2d9ee 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California.
* Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc.
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 0dd95d978c42..b7af4d23eb6a 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 6ba7c2c52c29..5b9239292e73 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 475816ed1454..72f431404515 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 0dd59ce22c8c..b1db1f1615b9 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index d0d3ba523918..ab4764aa27d6 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 3eb7327dab10..51a154d325f3 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,8 +1,6 @@
/* $KAME: ping6.c,v 1.169 2003/07/25 06:01:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index 4daf757aef9a..fd843e2ee0b2 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -1,8 +1,6 @@
/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 69573d34e7ba..0ee5b092887e 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/quotacheck/quotacheck.h b/sbin/quotacheck/quotacheck.h
index 47f054274a1e..dcff75b68a8c 100644
--- a/sbin/quotacheck/quotacheck.h
+++ b/sbin/quotacheck/quotacheck.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/rcorder/ealloc.c b/sbin/rcorder/ealloc.c
index eae8bb67d69a..997119315531 100644
--- a/sbin/rcorder/ealloc.c
+++ b/sbin/rcorder/ealloc.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c
index 3dcb77054960..34b95ce82f7a 100644
--- a/sbin/rcorder/hash.c
+++ b/sbin/rcorder/hash.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h
index d190633861a0..fd2f9783377b 100644
--- a/sbin/rcorder/hash.h
+++ b/sbin/rcorder/hash.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 15af9d093fbf..51b751513f5d 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 8c337c86814e..57b0523a69d9 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 5eb21d2254d3..9b319ca70900 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 43fa2d5a9f17..6f4c02e403a0 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 77c1ff978dfb..d74e59ebeef1 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 99fe51d050df..fbc24ece7c49 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 119b91e842d7..5d02bdfd9578 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 0a0f1e98be13..0713ff040eb6 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 102811f85f5a..f66f8b4caf4a 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 8582500406b4..90bde98ce0d3 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/route/route.c b/sbin/route/route.c
index fdc245d16156..9a5d8e8db662 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 088a88077b5d..a31d6f596e96 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index fb5d1ac994d4..b59186a9c818 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index bf49640427d7..bdf0a8b25007 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 81477da8cb7e..4a8d3ca547f6 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index f62b9c8332b2..4a9c5a214d1d 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index a6b2d74bb5a9..73d7deaa77f7 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index dd5603b63a56..c45405ed9e55 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 58982cc252a0..9ae08760d1c8 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index d7deda7a3bd3..5cc177e94160 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 56edebb40e09..959b80f86a43 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 7a1b5d9e763c..2d9f351ffc1b 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index c45b8afd7f1e..7804d7c27cfb 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 4c2131811279..fefa3a3aefdd 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 2ff67c8c1f1b..4c3f9451cfc1 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index ae0859c22d2c..f336c5d489fd 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: parse.y,v 1.83 2004/05/18 08:48:23 sakane Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index 1d66a92e0100..e4525ee50d1b 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index aead9d851dd0..d3af16217ed9 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/test-policy.c b/sbin/setkey/test-policy.c
index 3bf5c8975171..9749dd3e4966 100644
--- a/sbin/setkey/test-policy.c
+++ b/sbin/setkey/test-policy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index 358f87a63b80..7f30859e3861 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/vchar.h b/sbin/setkey/vchar.h
index c7e96cb9ca1a..f3251c7bfed3 100644
--- a/sbin/setkey/vchar.h
+++ b/sbin/setkey/vchar.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index f4fa1d0db6f5..b04e0bd87de6 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index d1d5cea42d45..c79e213b686e 100644
--- a/sbin/sunlabel/sunlabel.c
+++ b/sbin/sunlabel/sunlabel.c
@@ -24,9 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1994, 1995 Gordon W. Ross
* Copyright (c) 1994 Theo de Raadt
* All rights reserved.
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 746ad4837e34..6ec2ff1d6622 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index ce65abfa309c..0f5617450f00 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e30bdd56441a..b03cdde7b65c 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 378156c4bc07..adda04874ab6 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/share/examples/tests/tests/atf/cp_test.sh b/share/examples/tests/tests/atf/cp_test.sh
index 0e88d1a5f2a5..befec0911ba3 100644
--- a/share/examples/tests/tests/atf/cp_test.sh
+++ b/share/examples/tests/tests/atf/cp_test.sh
@@ -1,7 +1,5 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright 2013 Google Inc.
# All rights reserved.
#
diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c
index 5a4cb658395e..719927cbccfe 100644
--- a/share/examples/tests/tests/atf/printf_test.c
+++ b/share/examples/tests/tests/atf/printf_test.c
@@ -1,7 +1,5 @@
/* $FreeBSD$
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2013 Google Inc.
* All rights reserved.
*
diff --git a/share/examples/tests/tests/plain/printf_test.c b/share/examples/tests/tests/plain/printf_test.c
index 89d96d037791..c43269b2a73c 100644
--- a/share/examples/tests/tests/plain/printf_test.c
+++ b/share/examples/tests/tests/plain/printf_test.c
@@ -1,7 +1,4 @@
-/* $FreeBSD$ */
-
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* $FreeBSD$
*
* Copyright 2013 Google Inc.
* All rights reserved.
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 0feab2ba060e..bd9aede5f7ed 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index 0544336bd99a..9dc3e8d58130 100644
--- a/sys/amd64/amd64/atomic.c
+++ b/sys/amd64/amd64/atomic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Peter Jeremy
* All rights reserved.
*
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 2c43b480d256..c8985c1f773a 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/sys/amd64/amd64/bpf_jit_machdep.c b/sys/amd64/amd64/bpf_jit_machdep.c
index 6be4a051c6da..ff5ca5f90e9a 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.c
+++ b/sys/amd64/amd64/bpf_jit_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/amd64/amd64/bpf_jit_machdep.h b/sys/amd64/amd64/bpf_jit_machdep.h
index 868180e11200..01c251f6db91 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.h
+++ b/sys/amd64/amd64/bpf_jit_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 377949e54c7b..4e9476a2f29c 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index e3f5706033d7..540966b9e859 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 William Jolitz.
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c
index a35b1bb4896e..61ffad629dba 100644
--- a/sys/amd64/amd64/gdb_machdep.c
+++ b/sys/amd64/amd64/gdb_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index ec8d43bec395..28f584f0f0d9 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index 30e90f043cc3..ae02e91d9203 100644
--- a/sys/amd64/amd64/in_cksum.c
+++ b/sys/amd64/amd64/in_cksum.c
@@ -1,8 +1,6 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index 5c84c938c7ae..de3e461545eb 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) KATO Takenori, 1997, 1998.
*
* All rights reserved. Unpublished rights reserved under the copyright
diff --git a/sys/amd64/amd64/io.c b/sys/amd64/amd64/io.c
index 5d70ba612859..c2d0d515555b 100644
--- a/sys/amd64/amd64/io.c
+++ b/sys/amd64/amd64/io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index dd9cd189a96b..51b84338c9bd 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 653c68eb9649..c2e74ff63b06 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 3d3856f0602e..31f420dff926 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 34012d2b4f96..450d51275b19 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, by Steve Passe
* Copyright (c) 2003, by Peter Wemm
* All rights reserved.
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 53c4b123703d..a14aa9a63a2d 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index fcf61b559d2c..273c8336fca3 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/amd64/amd64/ptrace_machdep.c b/sys/amd64/amd64/ptrace_machdep.c
index dbab8ee88a59..169e15c1755e 100644
--- a/sys/amd64/amd64/ptrace_machdep.c
+++ b/sys/amd64/amd64/ptrace_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 7fb384ed6969..2f03756259c0 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 132b9d0bac05..328476b732f4 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
index 786844dda7ce..75654387dec8 100644
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/amd64/uma_machdep.c b/sys/amd64/amd64/uma_machdep.c
index 41ba8250e5cc..cc94c1b78353 100644
--- a/sys/amd64/amd64/uma_machdep.c
+++ b/sys/amd64/amd64/uma_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 8115314f3296..ad7ddbaab6e2 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/amd64/ia32/ia32_misc.c b/sys/amd64/ia32/ia32_misc.c
index e2a834816d7d..5a8a7211cf9b 100644
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Konstantin Belousov
* All rights reserved.
*
diff --git a/sys/amd64/ia32/ia32_reg.c b/sys/amd64/ia32/ia32_reg.c
index e9b5f6427ac3..0521e954a635 100644
--- a/sys/amd64/ia32/ia32_reg.c
+++ b/sys/amd64/ia32/ia32_reg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c
index 63860e2c361c..4947f01dacb0 100644
--- a/sys/amd64/ia32/ia32_signal.c
+++ b/sys/amd64/ia32/ia32_signal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 124c878d35f5..f743440996d9 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h
index 73482b452e65..a8cbf4810c75 100644
--- a/sys/amd64/include/_bus.h
+++ b/sys/amd64/include/_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index e163baa895f0..87272f76fdde 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 73e2ff36aef5..cd7acd82050b 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -1,7 +1,5 @@
/* -*- mode: asm -*- */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index cb68b342c94e..211cd07e976e 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 804b53106fa5..bc8bdf4881e2 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
diff --git a/sys/amd64/include/counter.h b/sys/amd64/include/counter.h
index 1b068e92b063..74ed1ef4d1f1 100644
--- a/sys/amd64/include/counter.h
+++ b/sys/amd64/include/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 4b916fe620e2..eb9bef8f2e72 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index a5d99e8a4be2..628982b17dfa 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 34c06e3ee278..8d07887be252 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index b7c154743d0c..cda9e46230ca 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index c6f872f20873..433457fac8f7 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/gdb_machdep.h b/sys/amd64/include/gdb_machdep.h
index 79e14e05d262..d8c25b90fea6 100644
--- a/sys/amd64/include/gdb_machdep.h
+++ b/sys/amd64/include/gdb_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index df2263098f46..a40366092d57 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 Andrew Moore, Talke Studio
* All rights reserved.
diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h
index 79d30cafbc90..d76b48a8863f 100644
--- a/sys/amd64/include/in_cksum.h
+++ b/sys/amd64/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index 38432bd577eb..29c20b60cadf 100644
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/iodev.h b/sys/amd64/include/iodev.h
index 5aced158609e..9f53cacff001 100644
--- a/sys/amd64/include/iodev.h
+++ b/sys/amd64/include/iodev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/amd64/include/kdb.h b/sys/amd64/include/kdb.h
index 2fb158622eb4..56d20184bd34 100644
--- a/sys/amd64/include/kdb.h
+++ b/sys/amd64/include/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index 8d437add22d2..35eea1f619de 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 3125e46f110c..f4d6e606d797 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/amd64/include/memdev.h b/sys/amd64/include/memdev.h
index 41e34da79264..649b5576f306 100644
--- a/sys/amd64/include/memdev.h
+++ b/sys/amd64/include/memdev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/amd64/include/minidump.h b/sys/amd64/include/minidump.h
index 21bbdadc99dc..2ac529ccef59 100644
--- a/sys/amd64/include/minidump.h
+++ b/sys/amd64/include/minidump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/amd64/include/mp_watchdog.h b/sys/amd64/include/mp_watchdog.h
index e1fc0742ee1e..bcec051a942f 100644
--- a/sys/amd64/include/mp_watchdog.h
+++ b/sys/amd64/include/mp_watchdog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 59f6b4468365..a619e3950d63 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 7534b5111299..32bbf1639269 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 1419f9dbf928..09aea36994dd 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index b1335e7433c2..e40c5216291b 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
*
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 06002d603588..dcb94f81f325 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h
index 58354707cf19..22249c1e5377 100644
--- a/sys/amd64/include/pmc_mdep.h
+++ b/sys/amd64/include/pmc_mdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/amd64/include/ppireg.h b/sys/amd64/include/ppireg.h
index 9794504da499..5774757ce67a 100644
--- a/sys/amd64/include/ppireg.h
+++ b/sys/amd64/include/ppireg.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 58831e8f841a..0c16e883fb8f 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index e03b1e96fad5..8fea3711fc54 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index 690802a075d3..188319323399 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index c3e26ff57432..855e315b6847 100644
--- a/sys/amd64/include/runq.h
+++ b/sys/amd64/include/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 169c1478ce0e..6bcadc7621e2 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1990 William F. Jolitz
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h
index 216dfe8d411b..00b3085991e1 100644
--- a/sys/amd64/include/sf_buf.h
+++ b/sys/amd64/include/sf_buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/amd64/include/timerreg.h b/sys/amd64/include/timerreg.h
index 77e6cad5775d..cf5f281c0aa1 100644
--- a/sys/amd64/include/timerreg.h
+++ b/sys/amd64/include/timerreg.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 613da75db61b..fbbe3aff4189 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 8d1d7d7e1f38..93faac6a84dd 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/vm.h b/sys/amd64/include/vm.h
index 2e9c30da9936..22d2ecafe211 100644
--- a/sys/amd64/include/vm.h
+++ b/sys/amd64/include/vm.h
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
index bc8fdfd34cd2..424e612e9622 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h
index 3e7144c48bc4..1af75a3c065d 100644
--- a/sys/amd64/include/vmm_dev.h
+++ b/sys/amd64/include/vmm_dev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/include/vmm_instruction_emul.h b/sys/amd64/include/vmm_instruction_emul.h
index 261be571a071..5e7127f0129d 100644
--- a/sys/amd64/include/vmm_instruction_emul.h
+++ b/sys/amd64/include/vmm_instruction_emul.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 6d63201c6581..381097adf8b1 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index 348f3c13eebb..ad6d9fae91ba 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2001 Doug Rabson
* Copyright (c) 1994-1996 Søren Schmidt
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 553936e6eed3..d0f04b183adc 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
@@ -8,22 +6,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index c73ecc4e3642..dd741e603bec 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 2000 Marcel Moolenaar
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 8088777b4b36..caa453e0db2a 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2002 Doug Rabson
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index a76e594ac769..2e6e7284589f 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/amd64/vmm/amd/amdv.c b/sys/amd64/vmm/amd/amdv.c
index 89a50ed7c0a9..3157e2120beb 100644
--- a/sys/amd64/vmm/amd/amdv.c
+++ b/sys/amd64/vmm/amd/amdv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/ept.c b/sys/amd64/vmm/intel/ept.c
index 17d2239516ec..54320cb36bd1 100644
--- a/sys/amd64/vmm/intel/ept.c
+++ b/sys/amd64/vmm/intel/ept.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/ept.h b/sys/amd64/vmm/intel/ept.h
index 4a029e8b22df..1393e467ee1a 100644
--- a/sys/amd64/vmm/intel/ept.h
+++ b/sys/amd64/vmm/intel/ept.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
index 85f766469cba..f4b9cceb2c89 100644
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmcs.h b/sys/amd64/vmm/intel/vmcs.h
index a1404834b7fa..6d78a6928e20 100644
--- a/sys/amd64/vmm/intel/vmcs.h
+++ b/sys/amd64/vmm/intel/vmcs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index b8a14872d77f..60f95bf0b68b 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
index f062309d343d..7028d47b18a6 100644
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx_controls.h b/sys/amd64/vmm/intel/vmx_controls.h
index 5408d129ad45..2b117ae5cf23 100644
--- a/sys/amd64/vmm/intel/vmx_controls.h
+++ b/sys/amd64/vmm/intel/vmx_controls.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx_cpufunc.h b/sys/amd64/vmm/intel/vmx_cpufunc.h
index 09d6d25a18e0..2e6644304b05 100644
--- a/sys/amd64/vmm/intel/vmx_cpufunc.h
+++ b/sys/amd64/vmm/intel/vmx_cpufunc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx_genassym.c b/sys/amd64/vmm/intel/vmx_genassym.c
index 0881b274bbdf..e1b98d63f1d5 100644
--- a/sys/amd64/vmm/intel/vmx_genassym.c
+++ b/sys/amd64/vmm/intel/vmx_genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
index 726df43ad8fc..a48cb76e1c70 100644
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vmx_msr.h b/sys/amd64/vmm/intel/vmx_msr.h
index ac2adb0dd1b4..e77881c75e8f 100644
--- a/sys/amd64/vmm/intel/vmx_msr.h
+++ b/sys/amd64/vmm/intel/vmx_msr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c
index 9474b30fc606..f3b7a98a9d3d 100644
--- a/sys/amd64/vmm/intel/vtd.c
+++ b/sys/amd64/vmm/intel/vtd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/iommu.c b/sys/amd64/vmm/io/iommu.c
index 09a67279b6da..d1772094333a 100644
--- a/sys/amd64/vmm/io/iommu.c
+++ b/sys/amd64/vmm/io/iommu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/iommu.h b/sys/amd64/vmm/io/iommu.h
index f8003a5d4552..a941c779aa18 100644
--- a/sys/amd64/vmm/io/iommu.h
+++ b/sys/amd64/vmm/io/iommu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
index d7d3a29caa8b..b306508e18ad 100644
--- a/sys/amd64/vmm/io/ppt.c
+++ b/sys/amd64/vmm/io/ppt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h
index 686b15db49af..80788960950f 100644
--- a/sys/amd64/vmm/io/ppt.h
+++ b/sys/amd64/vmm/io/ppt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/vhpet.c b/sys/amd64/vmm/io/vhpet.c
index 8f91f9fe6d78..b11095f72c4a 100644
--- a/sys/amd64/vmm/io/vhpet.c
+++ b/sys/amd64/vmm/io/vhpet.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vhpet.h b/sys/amd64/vmm/io/vhpet.h
index 3d6b653055c9..330e01739a06 100644
--- a/sys/amd64/vmm/io/vhpet.h
+++ b/sys/amd64/vmm/io/vhpet.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
index 8eeae0bf52c6..d112bbbe7c0c 100644
--- a/sys/amd64/vmm/io/vioapic.c
+++ b/sys/amd64/vmm/io/vioapic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
index 730c4b3f2ad9..65176b3d6de5 100644
--- a/sys/amd64/vmm/io/vioapic.h
+++ b/sys/amd64/vmm/io/vioapic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 3cd1d00439e7..cdf411b288be 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/vlapic.h b/sys/amd64/vmm/io/vlapic.h
index b2d5db7318f7..0e68b2fe8243 100644
--- a/sys/amd64/vmm/io/vlapic.h
+++ b/sys/amd64/vmm/io/vlapic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/io/vlapic_priv.h b/sys/amd64/vmm/io/vlapic_priv.h
index 43abd20a0a90..08592c84897f 100644
--- a/sys/amd64/vmm/io/vlapic_priv.h
+++ b/sys/amd64/vmm/io/vlapic_priv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 68757666a9c2..2118c13aab36 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 27bfe86f37b1..53a8bdc660aa 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_host.c b/sys/amd64/vmm/vmm_host.c
index 27b80000bdb1..9e5b96618c3b 100644
--- a/sys/amd64/vmm/vmm_host.c
+++ b/sys/amd64/vmm/vmm_host.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_host.h b/sys/amd64/vmm/vmm_host.h
index 4f80cf893050..95618ff53e6d 100644
--- a/sys/amd64/vmm/vmm_host.h
+++ b/sys/amd64/vmm/vmm_host.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c
index 873b2aeacd24..852f1d7393bf 100644
--- a/sys/amd64/vmm/vmm_instruction_emul.c
+++ b/sys/amd64/vmm/vmm_instruction_emul.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Sandvine, Inc.
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_ktr.h b/sys/amd64/vmm/vmm_ktr.h
index 414d0341cca9..61ff53f47fea 100644
--- a/sys/amd64/vmm/vmm_ktr.h
+++ b/sys/amd64/vmm/vmm_ktr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c
index 464a0ee16ef9..6bccd32f7576 100644
--- a/sys/amd64/vmm/vmm_lapic.c
+++ b/sys/amd64/vmm/vmm_lapic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_lapic.h b/sys/amd64/vmm/vmm_lapic.h
index 94f2c769122b..88fa94868fe8 100644
--- a/sys/amd64/vmm/vmm_lapic.h
+++ b/sys/amd64/vmm/vmm_lapic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_mem.c b/sys/amd64/vmm/vmm_mem.c
index a736d94bba64..c9be6c9affdd 100644
--- a/sys/amd64/vmm/vmm_mem.c
+++ b/sys/amd64/vmm/vmm_mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_mem.h b/sys/amd64/vmm/vmm_mem.h
index 4a010a2f9f0a..7773faab22ed 100644
--- a/sys/amd64/vmm/vmm_mem.h
+++ b/sys/amd64/vmm/vmm_mem.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c
index c2c2cfe77c23..62002d632eec 100644
--- a/sys/amd64/vmm/vmm_stat.c
+++ b/sys/amd64/vmm/vmm_stat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_stat.h b/sys/amd64/vmm/vmm_stat.h
index dfa7d21eceaf..c69584090264 100644
--- a/sys/amd64/vmm/vmm_stat.h
+++ b/sys/amd64/vmm/vmm_stat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_util.c b/sys/amd64/vmm/vmm_util.c
index 25dac0da4d0b..f245f922120f 100644
--- a/sys/amd64/vmm/vmm_util.c
+++ b/sys/amd64/vmm/vmm_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/vmm_util.h b/sys/amd64/vmm/vmm_util.h
index fc7e7364c784..7f82332923a0 100644
--- a/sys/amd64/vmm/vmm_util.h
+++ b/sys/amd64/vmm/vmm_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index 106932d57993..61d99d502ac2 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/amd64/vmm/x86.h b/sys/amd64/vmm/x86.h
index 3a8e043852e9..6f99d52931d7 100644
--- a/sys/amd64/vmm/x86.h
+++ b/sys/amd64/vmm/x86.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/arm/allwinner/a10_ehci.c b/sys/arm/allwinner/a10_ehci.c
index 859da1b1c8bf..d750a71011a2 100644
--- a/sys/arm/allwinner/a10_ehci.c
+++ b/sys/arm/allwinner/a10_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/a10_gpio.c b/sys/arm/allwinner/a10_gpio.c
index a4fdd15a9154..a7100bdead7e 100644
--- a/sys/arm/allwinner/a10_gpio.c
+++ b/sys/arm/allwinner/a10_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Luiz Otavio O Souza.
diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
index 95365c335a48..22ba1f7c4adf 100644
--- a/sys/arm/allwinner/a10_sramc.c
+++ b/sys/arm/allwinner/a10_sramc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/a10_sramc.h b/sys/arm/allwinner/a10_sramc.h
index 882091319a67..d66a8f2fbb1d 100644
--- a/sys/arm/allwinner/a10_sramc.h
+++ b/sys/arm/allwinner/a10_sramc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
index 0895b96f71a9..a0bdb5a0b46e 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.c
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.h b/sys/arm/allwinner/a20/a20_cpu_cfg.h
index 6f3d400f0edc..de80cfa93606 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.h
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index e6681442c0eb..26a967a859c2 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/allwinner/if_emacreg.h b/sys/arm/allwinner/if_emacreg.h
index f84e92c56e04..477630277a5d 100644
--- a/sys/arm/allwinner/if_emacreg.h
+++ b/sys/arm/allwinner/if_emacreg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c
index 3b9036200406..f18f67dcda8f 100644
--- a/sys/arm/arm/autoconf.c
+++ b/sys/arm/arm/autoconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/arm/bus_space_generic.c b/sys/arm/arm/bus_space_generic.c
index ecca1f65f197..65885a0aafcc 100644
--- a/sys/arm/arm/bus_space_generic.c
+++ b/sys/arm/arm/bus_space_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio_space.c,v 1.6 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c
index 662c0e7b2869..58e2012e44e0 100644
--- a/sys/arm/arm/busdma_machdep-v6.c
+++ b/sys/arm/arm/busdma_machdep-v6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2015 Ian Lepore
* Copyright (c) 2010 Mark Tinguely
* Copyright (c) 2004 Olivier Houchard
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 349126c69d8d..e608cc7150fc 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -1,8 +1,6 @@
/* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* arm9 support code Copyright (C) 2001 ARM Ltd
* Copyright (c) 1997 Mark Brinicombe.
* Copyright (c) 1997 Causality Limited
diff --git a/sys/arm/arm/db_disasm.c b/sys/arm/arm/db_disasm.c
index 012773415b40..2eabf387c3ff 100644
--- a/sys/arm/arm/db_disasm.c
+++ b/sys/arm/arm/db_disasm.c
@@ -1,8 +1,6 @@
/* $NetBSD: db_disasm.c,v 1.4 2003/07/15 00:24:38 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Mark Brinicombe.
* Copyright (c) 1996 Brini.
*
diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c
index b332f1951470..81dbe1096f2d 100644
--- a/sys/arm/arm/disassem.c
+++ b/sys/arm/arm/disassem.c
@@ -1,8 +1,6 @@
/* $NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Mark Brinicombe.
* Copyright (c) 1996 Brini.
*
diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index ead54ca7b225..a8d05919960d 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index f55f9aaa89e1..6ee08af10888 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/arm/arm/elf_trampoline.c b/sys/arm/arm/elf_trampoline.c
index 92696b29f444..379bc327f0a7 100644
--- a/sys/arm/arm/elf_trampoline.c
+++ b/sys/arm/arm/elf_trampoline.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c
index 39137e8261d0..e55aa1276deb 100644
--- a/sys/arm/arm/fiq.c
+++ b/sys/arm/arm/fiq.c
@@ -1,8 +1,6 @@
/* $NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/arm/gdb_machdep.c b/sys/arm/arm/gdb_machdep.c
index 21c04341c3f6..8cc7a198bf8b 100644
--- a/sys/arm/arm/gdb_machdep.c
+++ b/sys/arm/arm/gdb_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index 6884b803701f..b5cc952adeaf 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index 5b0f7b3c9bac..d91eee14ee44 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011 The FreeBSD Foundation
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 63f0606b0834..2974bacb630e 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c
index d37c68720d2a..3bce65018397 100644
--- a/sys/arm/arm/in_cksum.c
+++ b/sys/arm/arm/in_cksum.c
@@ -1,8 +1,6 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index 42b196828ea4..e4dbccd01ed9 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -1,8 +1,6 @@
/* $NetBSD: intr.c,v 1.12 2003/07/15 00:24:41 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004 Olivier Houchard.
* Copyright (c) 1994-1998 Mark Brinicombe.
* All rights reserved.
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 511fc885682d..4ee4a77f4c5b 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -1,8 +1,6 @@
/* $NetBSD: arm32_machdep.c,v 1.44 2004/03/24 15:34:47 atatat Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004 Olivier Houchard
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c
index bfab53f2bc28..c2cf320b2b67 100644
--- a/sys/arm/arm/mem.c
+++ b/sys/arm/arm/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index 6d71a08b7ffd..e7340dcf33db 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index b654b6566880..2dc71718e06f 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Semihalf.
* All rights reserved.
*
diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
index 51ba6148ba91..84034514f180 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/arm/physmem.c b/sys/arm/arm/physmem.c
index 7c9cfb86c494..ec68c3619a5b 100644
--- a/sys/arm/arm/physmem.c
+++ b/sys/arm/arm/physmem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c
index 940dd9b68aa2..c269b47a8be3 100644
--- a/sys/arm/arm/pl310.c
+++ b/sys/arm/arm/pl310.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2012 Olivier Houchard <cognet@FreeBSD.org>
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 1b51d9f9e123..9220cc7b6c13 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1991 Regents of the University of California.
* Copyright (c) 1994 John S. Dyson
* Copyright (c) 1994 David Greenman
diff --git a/sys/arm/arm/sc_machdep.c b/sys/arm/arm/sc_machdep.c
index 8a77cef2fbce..a81ffddbb211 100644
--- a/sys/arm/arm/sc_machdep.c
+++ b/sys/arm/arm/sc_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/arm/arm/stack_machdep.c b/sys/arm/arm/stack_machdep.c
index 9d089c931593..df232a957978 100644
--- a/sys/arm/arm/stack_machdep.c
+++ b/sys/arm/arm/stack_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
diff --git a/sys/arm/arm/stdatomic.c b/sys/arm/arm/stdatomic.c
index 8b3688f9e67b..29ff7f5b187f 100644
--- a/sys/arm/arm/stdatomic.c
+++ b/sys/arm/arm/stdatomic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c
index f65e140933fa..c938c0b1f570 100644
--- a/sys/arm/arm/sys_machdep.c
+++ b/sys/arm/arm/sys_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
index 45f39cc4e734..f04569f66ff1 100644
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 9579198c3ee4..1bac76de4ca6 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -1,8 +1,6 @@
/* $NetBSD: undefined.c,v 1.22 2003/11/29 22:21:29 bjh21 Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Ben Harris.
* Copyright (c) 1995 Mark Brinicombe.
* Copyright (c) 1995 Brini.
diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c
index d42660d7e4f9..7e3e728ce1d2 100644
--- a/sys/arm/arm/vfp.c
+++ b/sys/arm/arm/vfp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2012 Mark Tinguely
*
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 554184d66a44..b57d69814142 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index 10fb9201dc14..75b40b20699a 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91_aic.c b/sys/arm/at91/at91_aic.c
index 51b98da96292..92d6eada203c 100644
--- a/sys/arm/at91/at91_aic.c
+++ b/sys/arm/at91/at91_aic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_aicreg.h b/sys/arm/at91/at91_aicreg.h
index 8ce6644f57fd..f46f23487740 100644
--- a/sys/arm/at91/at91_aicreg.h
+++ b/sys/arm/at91/at91_aicreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_cfata.c b/sys/arm/at91/at91_cfata.c
index 9a8243e84cc2..890029c13e32 100644
--- a/sys/arm/at91/at91_cfata.c
+++ b/sys/arm/at91/at91_cfata.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Deglitch Networks, Stanislav Sedov
* All rights reserved.
*
diff --git a/sys/arm/at91/at91_gpio.h b/sys/arm/at91/at91_gpio.h
index 21b67475f7f0..935e43733e2b 100644
--- a/sys/arm/at91/at91_gpio.h
+++ b/sys/arm/at91/at91_gpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index 5f3dc7fc4459..2dddd065f348 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index 6df31ec880cb..f05fee694871 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
diff --git a/sys/arm/at91/at91_mcireg.h b/sys/arm/at91/at91_mcireg.h
index cf70dcad410d..1831c0dbfc74 100644
--- a/sys/arm/at91/at91_mcireg.h
+++ b/sys/arm/at91/at91_mcireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Berndt Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/at91_pdcreg.h b/sys/arm/at91/at91_pdcreg.h
index 88389e002e95..d15c22a7b114 100644
--- a/sys/arm/at91/at91_pdcreg.h
+++ b/sys/arm/at91/at91_pdcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_pio.c b/sys/arm/at91/at91_pio.c
index a1c887e6525d..0d9bd46a4215 100644
--- a/sys/arm/at91/at91_pio.c
+++ b/sys/arm/at91/at91_pio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (C) 2012 Ian Lepore. All rights reserved.
*
diff --git a/sys/arm/at91/at91_pio_sam9g45.h b/sys/arm/at91/at91_pio_sam9g45.h
index 1fc38e43e324..6045536ee6aa 100644
--- a/sys/arm/at91/at91_pio_sam9g45.h
+++ b/sys/arm/at91/at91_pio_sam9g45.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* ----------------------------------------------------------------------------
* ATMEL Microcontroller Software Support - ROUSSET -
* ----------------------------------------------------------------------------
diff --git a/sys/arm/at91/at91_pioreg.h b/sys/arm/at91/at91_pioreg.h
index 4b1f22d89582..7869d9d05a30 100644
--- a/sys/arm/at91/at91_pioreg.h
+++ b/sys/arm/at91/at91_pioreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_piovar.h b/sys/arm/at91/at91_piovar.h
index 4a314e83873a..7b83d0724862 100644
--- a/sys/arm/at91/at91_piovar.h
+++ b/sys/arm/at91/at91_piovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_pit.c b/sys/arm/at91/at91_pit.c
index 8e45a0e36d3d..7f7890b01783 100644
--- a/sys/arm/at91/at91_pit.c
+++ b/sys/arm/at91/at91_pit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Gallon Sylvestre. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91_pitreg.h b/sys/arm/at91/at91_pitreg.h
index f7095aa6b2e7..5e87e397255a 100644
--- a/sys/arm/at91/at91_pitreg.h
+++ b/sys/arm/at91/at91_pitreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index 8ec0552fdb31..3784bada9418 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91_pmcreg.h b/sys/arm/at91/at91_pmcreg.h
index 020be6772420..65846a3fb9ba 100644
--- a/sys/arm/at91/at91_pmcreg.h
+++ b/sys/arm/at91/at91_pmcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_pmcvar.h b/sys/arm/at91/at91_pmcvar.h
index 850ec653cf02..700eba18706e 100644
--- a/sys/arm/at91/at91_pmcvar.h
+++ b/sys/arm/at91/at91_pmcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_rst.c b/sys/arm/at91/at91_rst.c
index d4f8efc60691..77ace5fbe613 100644
--- a/sys/arm/at91/at91_rst.c
+++ b/sys/arm/at91/at91_rst.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_rstreg.h b/sys/arm/at91/at91_rstreg.h
index 5af38fbaa79e..ee64f140ff68 100644
--- a/sys/arm/at91/at91_rstreg.h
+++ b/sys/arm/at91/at91_rstreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_rtc.c b/sys/arm/at91/at91_rtc.c
index 3933f1d8902c..7bb80b94bd1d 100644
--- a/sys/arm/at91/at91_rtc.c
+++ b/sys/arm/at91/at91_rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2012 Ian Lepore. All rights reserved.
*
diff --git a/sys/arm/at91/at91_rtcreg.h b/sys/arm/at91/at91_rtcreg.h
index b493c1e648cd..923db0aeb582 100644
--- a/sys/arm/at91/at91_rtcreg.h
+++ b/sys/arm/at91/at91_rtcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_sdramc.c b/sys/arm/at91/at91_sdramc.c
index af473a61cd90..99787ba7a71d 100644
--- a/sys/arm/at91/at91_sdramc.c
+++ b/sys/arm/at91/at91_sdramc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_shdwc.c b/sys/arm/at91/at91_shdwc.c
index 4923509b4a0c..f3fa491dad8f 100644
--- a/sys/arm/at91/at91_shdwc.c
+++ b/sys/arm/at91/at91_shdwc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_smc.c b/sys/arm/at91/at91_smc.c
index 3d4421786f3c..2d59d169a76d 100644
--- a/sys/arm/at91/at91_smc.c
+++ b/sys/arm/at91/at91_smc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_smc.h b/sys/arm/at91/at91_smc.h
index fe46da9074f0..f571c46b1862 100644
--- a/sys/arm/at91/at91_smc.h
+++ b/sys/arm/at91/at91_smc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_spi.c b/sys/arm/at91/at91_spi.c
index e92d50661a4e..e9b4b1357b8e 100644
--- a/sys/arm/at91/at91_spi.c
+++ b/sys/arm/at91/at91_spi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh.
* Copyright (c) 2011-2012 Ian Lepore.
* All rights reserved.
diff --git a/sys/arm/at91/at91_spireg.h b/sys/arm/at91/at91_spireg.h
index 8c6fc2839bcb..251564f3d286 100644
--- a/sys/arm/at91/at91_spireg.h
+++ b/sys/arm/at91/at91_spireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_ssc.c b/sys/arm/at91/at91_ssc.c
index 435380a88576..d79020b8b493 100644
--- a/sys/arm/at91/at91_ssc.c
+++ b/sys/arm/at91/at91_ssc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_sscreg.h b/sys/arm/at91/at91_sscreg.h
index ae1eb800bcd8..f411f4606144 100644
--- a/sys/arm/at91/at91_sscreg.h
+++ b/sys/arm/at91/at91_sscreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_st.c b/sys/arm/at91/at91_st.c
index cad0c314b7c2..07ee24d54684 100644
--- a/sys/arm/at91/at91_st.c
+++ b/sys/arm/at91/at91_st.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_streg.h b/sys/arm/at91/at91_streg.h
index 771e10ae143c..48a63c3f0ca1 100644
--- a/sys/arm/at91/at91_streg.h
+++ b/sys/arm/at91/at91_streg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_tcb.c b/sys/arm/at91/at91_tcb.c
index b8c31a6285ae..42491ed74bd0 100644
--- a/sys/arm/at91/at91_tcb.c
+++ b/sys/arm/at91/at91_tcb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_twi.c b/sys/arm/at91/at91_twi.c
index 04dbdbbc61bc..303e4dd4f3f0 100644
--- a/sys/arm/at91/at91_twi.c
+++ b/sys/arm/at91/at91_twi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_twiio.h b/sys/arm/at91/at91_twiio.h
index 98074557d008..0a24e57c0ad1 100644
--- a/sys/arm/at91/at91_twiio.h
+++ b/sys/arm/at91/at91_twiio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_twireg.h b/sys/arm/at91/at91_twireg.h
index 78e694a7943a..5f59b22febf7 100644
--- a/sys/arm/at91/at91_twireg.h
+++ b/sys/arm/at91/at91_twireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_usartreg.h b/sys/arm/at91/at91_usartreg.h
index d3e7031c439d..71b8ed4b15cb 100644
--- a/sys/arm/at91/at91_usartreg.h
+++ b/sys/arm/at91/at91_usartreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_wdt.c b/sys/arm/at91/at91_wdt.c
index f8b6318f69cc..95332025e2f7 100644
--- a/sys/arm/at91/at91_wdt.c
+++ b/sys/arm/at91/at91_wdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91_wdtreg.h b/sys/arm/at91/at91_wdtreg.h
index 9ff0440d1607..1c8dd892c14a 100644
--- a/sys/arm/at91/at91_wdtreg.h
+++ b/sys/arm/at91/at91_wdtreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Gallon Sylvestre. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91board.h b/sys/arm/at91/at91board.h
index 80b7decc7a76..16763d57ea38 100644
--- a/sys/arm/at91/at91board.h
+++ b/sys/arm/at91/at91board.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91reg.h b/sys/arm/at91/at91reg.h
index fd7c7cf5aa7a..35e14f5fc083 100644
--- a/sys/arm/at91/at91reg.h
+++ b/sys/arm/at91/at91reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91rm9200.c b/sys/arm/at91/at91rm9200.c
index 2a136151e8da..d350117f1dad 100644
--- a/sys/arm/at91/at91rm9200.c
+++ b/sys/arm/at91/at91rm9200.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91rm9200_devices.c b/sys/arm/at91/at91rm9200_devices.c
index a31445e99314..bc29cc18babb 100644
--- a/sys/arm/at91/at91rm9200_devices.c
+++ b/sys/arm/at91/at91rm9200_devices.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 M. Warner Losh. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91rm9200var.h b/sys/arm/at91/at91rm9200var.h
index 6f4dcef0abf0..156320eba757 100644
--- a/sys/arm/at91/at91rm9200var.h
+++ b/sys/arm/at91/at91rm9200var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91rm92reg.h b/sys/arm/at91/at91rm92reg.h
index a1956d4c0a33..16fc82c06ebb 100644
--- a/sys/arm/at91/at91rm92reg.h
+++ b/sys/arm/at91/at91rm92reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91sam9260.c b/sys/arm/at91/at91sam9260.c
index 1e1c32c8f3a2..4514d8712b6a 100644
--- a/sys/arm/at91/at91sam9260.c
+++ b/sys/arm/at91/at91sam9260.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91sam9260reg.h b/sys/arm/at91/at91sam9260reg.h
index 3f5ed332a349..1609ed17e869 100644
--- a/sys/arm/at91/at91sam9260reg.h
+++ b/sys/arm/at91/at91sam9260reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91sam9g20.c b/sys/arm/at91/at91sam9g20.c
index 5658f08a23eb..3c17e3aadabc 100644
--- a/sys/arm/at91/at91sam9g20.c
+++ b/sys/arm/at91/at91sam9g20.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91sam9g20reg.h b/sys/arm/at91/at91sam9g20reg.h
index e0d53600d950..d29dfa5ef57c 100644
--- a/sys/arm/at91/at91sam9g20reg.h
+++ b/sys/arm/at91/at91sam9g20reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/at91sam9g45.c b/sys/arm/at91/at91sam9g45.c
index fb4024cc7897..c3a26d58f499 100644
--- a/sys/arm/at91/at91sam9g45.c
+++ b/sys/arm/at91/at91sam9g45.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 Andrew Turner. All rights reserved.
diff --git a/sys/arm/at91/at91sam9g45reg.h b/sys/arm/at91/at91sam9g45reg.h
index 79620fbd7b83..0dc31beea9be 100644
--- a/sys/arm/at91/at91sam9g45reg.h
+++ b/sys/arm/at91/at91sam9g45reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 Andrew Turner. All rights reserved.
diff --git a/sys/arm/at91/at91sam9x5.c b/sys/arm/at91/at91sam9x5.c
index 9b2459e9e985..9fe7104740b0 100644
--- a/sys/arm/at91/at91sam9x5.c
+++ b/sys/arm/at91/at91sam9x5.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 M. Warner Losh.. All rights reserved.
diff --git a/sys/arm/at91/at91sam9x5reg.h b/sys/arm/at91/at91sam9x5reg.h
index b0af4a9bfd32..dd777f9a6b2d 100644
--- a/sys/arm/at91/at91sam9x5reg.h
+++ b/sys/arm/at91/at91sam9x5reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 M. Warener Losh. All rights reserved.
diff --git a/sys/arm/at91/at91soc.c b/sys/arm/at91/at91soc.c
index 520a8597ffc4..7031e8326047 100644
--- a/sys/arm/at91/at91soc.c
+++ b/sys/arm/at91/at91soc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91soc.h b/sys/arm/at91/at91soc.h
index ad48f817c5b7..e2f4d41ae219 100644
--- a/sys/arm/at91/at91soc.h
+++ b/sys/arm/at91/at91soc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/at91var.h b/sys/arm/at91/at91var.h
index 84c898fbf453..46227a0dd999 100644
--- a/sys/arm/at91/at91var.h
+++ b/sys/arm/at91/at91var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/board_bwct.c b/sys/arm/at91/board_bwct.c
index fd6bdbaf0b4c..0515b21098f8 100644
--- a/sys/arm/at91/board_bwct.c
+++ b/sys/arm/at91/board_bwct.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/board_eb9200.c b/sys/arm/at91/board_eb9200.c
index 8fe8bce0bc48..23f914a3c2a2 100644
--- a/sys/arm/at91/board_eb9200.c
+++ b/sys/arm/at91/board_eb9200.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/board_ethernut5.c b/sys/arm/at91/board_ethernut5.c
index 54f78d460ebc..96beebac677a 100644
--- a/sys/arm/at91/board_ethernut5.c
+++ b/sys/arm/at91/board_ethernut5.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/at91/board_hl200.c b/sys/arm/at91/board_hl200.c
index b594b0c18438..d3ac4fe16c91 100644
--- a/sys/arm/at91/board_hl200.c
+++ b/sys/arm/at91/board_hl200.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/board_hl201.c b/sys/arm/at91/board_hl201.c
index 81c8488e5232..66dbf368f4b6 100644
--- a/sys/arm/at91/board_hl201.c
+++ b/sys/arm/at91/board_hl201.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2008 Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/board_kb920x.c b/sys/arm/at91/board_kb920x.c
index 17ae3d96d432..1f35705297d8 100644
--- a/sys/arm/at91/board_kb920x.c
+++ b/sys/arm/at91/board_kb920x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
diff --git a/sys/arm/at91/board_qila9g20.c b/sys/arm/at91/board_qila9g20.c
index e5a3db328399..4c94b2ba51bc 100644
--- a/sys/arm/at91/board_qila9g20.c
+++ b/sys/arm/at91/board_qila9g20.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/board_sam9260ek.c b/sys/arm/at91/board_sam9260ek.c
index 4c61a667fa60..e3210afb1086 100644
--- a/sys/arm/at91/board_sam9260ek.c
+++ b/sys/arm/at91/board_sam9260ek.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/at91/board_sam9g20ek.c b/sys/arm/at91/board_sam9g20ek.c
index c35f9b4e76a8..918aea047a04 100644
--- a/sys/arm/at91/board_sam9g20ek.c
+++ b/sys/arm/at91/board_sam9g20ek.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/board_sam9x25ek.c b/sys/arm/at91/board_sam9x25ek.c
index 194f2d76d16d..a9874ff9ce9f 100644
--- a/sys/arm/at91/board_sam9x25ek.c
+++ b/sys/arm/at91/board_sam9x25ek.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/board_sn9g45.c b/sys/arm/at91/board_sn9g45.c
index 6bc60036f8b3..eb1980e00cc4 100644
--- a/sys/arm/at91/board_sn9g45.c
+++ b/sys/arm/at91/board_sn9g45.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/board_tsc4370.c b/sys/arm/at91/board_tsc4370.c
index 65198de087f5..9c0658bac387 100644
--- a/sys/arm/at91/board_tsc4370.c
+++ b/sys/arm/at91/board_tsc4370.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
* Copyright (c) 2007-2014 Ian Lepore. All rights reserved.
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 2df3a1f93433..fdca46bf95fc 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
diff --git a/sys/arm/at91/if_atereg.h b/sys/arm/at91/if_atereg.h
index 8440e2c17450..c6cbbcfda798 100644
--- a/sys/arm/at91/if_atereg.h
+++ b/sys/arm/at91/if_atereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/if_macb.c b/sys/arm/at91/if_macb.c
index 337cf7a3abe3..c62184d2803b 100644
--- a/sys/arm/at91/if_macb.c
+++ b/sys/arm/at91/if_macb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Yohanes Nugroho <yohanes@gmail.com>
* All rights reserved.
*
diff --git a/sys/arm/at91/uart_bus_at91usart.c b/sys/arm/at91/uart_bus_at91usart.c
index 6c4264318d6d..28182faa8922 100644
--- a/sys/arm/at91/uart_bus_at91usart.c
+++ b/sys/arm/at91/uart_bus_at91usart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/at91/uart_cpu_at91usart.c b/sys/arm/at91/uart_cpu_at91usart.c
index eff681230492..39f146cc5698 100644
--- a/sys/arm/at91/uart_cpu_at91usart.c
+++ b/sys/arm/at91/uart_cpu_at91usart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* Copyright (c) 2006 M. Warner Losh
* All rights reserved.
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c
index be83d211758e..cac5e6a2abd9 100644
--- a/sys/arm/at91/uart_dev_at91usart.c
+++ b/sys/arm/at91/uart_dev_at91usart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh
* Copyright (c) 2005 Olivier Houchard
* Copyright (c) 2012 Ian Lepore
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
index 4ce8238ebe77..62c5c120cec9 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Tsubai Masanari.
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
index 4b9532053807..48b31b645d91 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
index 24ab93c163d1..77974854f4c3 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index dbaa02a4f080..3b6c03201fa1 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013 Daisuke Aoyama <aoyama@peach.ne.jp>
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@bluezbox.com>
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.h b/sys/arm/broadcom/bcm2835/bcm2835_dma.h
index a6a427665940..c39344a272ae 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013 Daisuke Aoyama <aoyama@peach.ne.jp>
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@bluezbox.com>
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index fccfa95d65f3..15746ec2111e 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
index 093c4561e0d2..04cc83a42c81 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index 5ca65abeaf09..ed3bbae998fe 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2012-2015 Luiz Otavio O Souza <loos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.h b/sys/arm/broadcom/bcm2835/bcm2835_gpio.h
index 10436f8f732e..911bcf219842 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@bluezbox.com>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index f6dbad81a32e..9f7bd7f44d32 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index d0a28f1f5fde..840b71b47b44 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2012 Oleksandr Tymoshenko.
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
index f3b5363268ed..2fc0a9e70f08 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.h b/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
index 3cd8699a704b..17e59eb7adc5 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index e11af63b874e..2a1b2a90b312 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
index f1d7b960509f..8396426191bb 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spireg.h b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
index a658f16c92b9..6a0350c8b57c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spivar.h b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
index 25b06e2aa2f8..6a32f9229b92 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index 5dc74c367dbc..731c7d069bd8 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Damjan Marion <dmarion@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
index f35b70331202..e1d44b31f76d 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
index 057b79a128e9..c1152a2dc549 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Alexander Rybalko <ray@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
index 214991820fdc..55569d9b4cee 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Alexander Rybalko <ray@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/conf/genboardid.awk b/sys/arm/conf/genboardid.awk
index 47ef97266711..440989c14d49 100644
--- a/sys/arm/conf/genboardid.awk
+++ b/sys/arm/conf/genboardid.awk
@@ -2,8 +2,6 @@
# $FreeBSD$
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
-#
# Copyright (c) 2012 M. Warner Losh. All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/freescale/fsl_ocotp.c b/sys/arm/freescale/fsl_ocotp.c
index 9a0f9b4ec62f..09210c528b6c 100644
--- a/sys/arm/freescale/fsl_ocotp.c
+++ b/sys/arm/freescale/fsl_ocotp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
*
diff --git a/sys/arm/freescale/fsl_ocotpreg.h b/sys/arm/freescale/fsl_ocotpreg.h
index 80e3d3e5644f..686e97eee835 100644
--- a/sys/arm/freescale/fsl_ocotpreg.h
+++ b/sys/arm/freescale/fsl_ocotpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
*
diff --git a/sys/arm/freescale/fsl_ocotpvar.h b/sys/arm/freescale/fsl_ocotpvar.h
index ca7dd13e8c54..c3f5ecfbe5f4 100644
--- a/sys/arm/freescale/fsl_ocotpvar.h
+++ b/sys/arm/freescale/fsl_ocotpvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index 3aa0fe26238b..c9690d781cc3 100644
--- a/sys/arm/freescale/imx/imx51_ccm.c
+++ b/sys/arm/freescale/imx/imx51_ccm.c
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h
index d306c0e7acde..61b9fa2cb560 100644
--- a/sys/arm/freescale/imx/imx51_ccmreg.h
+++ b/sys/arm/freescale/imx/imx51_ccmreg.h
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx51_ccmvar.h b/sys/arm/freescale/imx/imx51_ccmvar.h
index acbb35a7e71d..c86fa4e8ff37 100644
--- a/sys/arm/freescale/imx/imx51_ccmvar.h
+++ b/sys/arm/freescale/imx/imx51_ccmvar.h
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_ccmvar.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx51_dpllreg.h b/sys/arm/freescale/imx/imx51_dpllreg.h
index d224333a9830..99fdf80c8942 100644
--- a/sys/arm/freescale/imx/imx51_dpllreg.h
+++ b/sys/arm/freescale/imx/imx51_dpllreg.h
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_dpllreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c
index 2105a726b88b..b88bb3fdb5d3 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index 8c8f014c724a..4f44e9ccc13c 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx51_ipuv3reg.h b/sys/arm/freescale/imx/imx51_ipuv3reg.h
index 137c75033812..d2fede4389cf 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3reg.h
+++ b/sys/arm/freescale/imx/imx51_ipuv3reg.h
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_ipuv3reg.h,v 1.1 2012/04/17 10:19:57 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx51_machdep.c b/sys/arm/freescale/imx/imx51_machdep.c
index a6fbf34ad6da..748cb108467f 100644
--- a/sys/arm/freescale/imx/imx51_machdep.c
+++ b/sys/arm/freescale/imx/imx51_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx51_sdmareg.h b/sys/arm/freescale/imx/imx51_sdmareg.h
index 71c28f6bec14..d8c4fea4efa3 100644
--- a/sys/arm/freescale/imx/imx51_sdmareg.h
+++ b/sys/arm/freescale/imx/imx51_sdmareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx51_ssireg.h b/sys/arm/freescale/imx/imx51_ssireg.h
index 3846b4950750..c1ad093f1bab 100644
--- a/sys/arm/freescale/imx/imx51_ssireg.h
+++ b/sys/arm/freescale/imx/imx51_ssireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx51_tzicreg.h b/sys/arm/freescale/imx/imx51_tzicreg.h
index 0c3c811e00de..2f700a0b42bd 100644
--- a/sys/arm/freescale/imx/imx51_tzicreg.h
+++ b/sys/arm/freescale/imx/imx51_tzicreg.h
@@ -1,7 +1,5 @@
/* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
diff --git a/sys/arm/freescale/imx/imx53_machdep.c b/sys/arm/freescale/imx/imx53_machdep.c
index 446b69d2178d..aebcf01f46b2 100644
--- a/sys/arm/freescale/imx/imx53_machdep.c
+++ b/sys/arm/freescale/imx/imx53_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c
index 7fe78d13e806..689df94623cc 100644
--- a/sys/arm/freescale/imx/imx6_anatop.c
+++ b/sys/arm/freescale/imx/imx6_anatop.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_anatopreg.h b/sys/arm/freescale/imx/imx6_anatopreg.h
index e82695261328..a155249ec00d 100644
--- a/sys/arm/freescale/imx/imx6_anatopreg.h
+++ b/sys/arm/freescale/imx/imx6_anatopreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_anatopvar.h b/sys/arm/freescale/imx/imx6_anatopvar.h
index 7378bf245b54..4ebe672dfdab 100644
--- a/sys/arm/freescale/imx/imx6_anatopvar.h
+++ b/sys/arm/freescale/imx/imx6_anatopvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_ccm.c b/sys/arm/freescale/imx/imx6_ccm.c
index b685edfb559e..91cec14e1532 100644
--- a/sys/arm/freescale/imx/imx6_ccm.c
+++ b/sys/arm/freescale/imx/imx6_ccm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_ccmreg.h b/sys/arm/freescale/imx/imx6_ccmreg.h
index 69e028debae6..c5f3766422b9 100644
--- a/sys/arm/freescale/imx/imx6_ccmreg.h
+++ b/sys/arm/freescale/imx/imx6_ccmreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index b729235ef4a8..1550286292fd 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index 8565ae71135d..4010c3625e74 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Juergen Weiss <weiss@uni-mainz.de>
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_pl310.c b/sys/arm/freescale/imx/imx6_pl310.c
index d5d67531c0f2..9e0427faf4ed 100644
--- a/sys/arm/freescale/imx/imx6_pl310.c
+++ b/sys/arm/freescale/imx/imx6_pl310.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard.
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx6_usbphy.c b/sys/arm/freescale/imx/imx6_usbphy.c
index 5a35c4e010d1..ad63ed6f1793 100644
--- a/sys/arm/freescale/imx/imx6_usbphy.c
+++ b/sys/arm/freescale/imx/imx6_usbphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_common.c b/sys/arm/freescale/imx/imx_common.c
index 82df02553979..3eb076e0b51f 100644
--- a/sys/arm/freescale/imx/imx_common.c
+++ b/sys/arm/freescale/imx/imx_common.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008-2011 MARVELL INTERNATIONAL LTD.
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c
index 4b45f8f65aeb..07e52e9bf97d 100644
--- a/sys/arm/freescale/imx/imx_gpt.c
+++ b/sys/arm/freescale/imx/imx_gpt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_gptreg.h b/sys/arm/freescale/imx/imx_gptreg.h
index e1c13b7d0d6a..21bb69afbe70 100644
--- a/sys/arm/freescale/imx/imx_gptreg.h
+++ b/sys/arm/freescale/imx/imx_gptreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_machdep.c b/sys/arm/freescale/imx/imx_machdep.c
index 39adbc7ffbc9..e07e7371f4aa 100644
--- a/sys/arm/freescale/imx/imx_machdep.c
+++ b/sys/arm/freescale/imx/imx_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_machdep.h b/sys/arm/freescale/imx/imx_machdep.h
index 0717246495b5..24a1368bcc35 100644
--- a/sys/arm/freescale/imx/imx_machdep.h
+++ b/sys/arm/freescale/imx/imx_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_nop_usbphy.c b/sys/arm/freescale/imx/imx_nop_usbphy.c
index 9b6986b0eca9..49bebfcd5739 100644
--- a/sys/arm/freescale/imx/imx_nop_usbphy.c
+++ b/sys/arm/freescale/imx/imx_nop_usbphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_wdog.c b/sys/arm/freescale/imx/imx_wdog.c
index 842e837198e8..97f42c15e352 100644
--- a/sys/arm/freescale/imx/imx_wdog.c
+++ b/sys/arm/freescale/imx/imx_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/imx_wdogreg.h b/sys/arm/freescale/imx/imx_wdogreg.h
index a0c362c50ed2..549a8349c564 100644
--- a/sys/arm/freescale/imx/imx_wdogreg.h
+++ b/sys/arm/freescale/imx/imx_wdogreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/imx/tzic.c b/sys/arm/freescale/imx/tzic.c
index 6859a04acb47..97332cb06025 100644
--- a/sys/arm/freescale/imx/tzic.c
+++ b/sys/arm/freescale/imx/tzic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_anadig.c b/sys/arm/freescale/vybrid/vf_anadig.c
index 4f0d35af3538..3a2cbc4e4811 100644
--- a/sys/arm/freescale/vybrid/vf_anadig.c
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index 9c7a463cdfd8..82284d588984 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_common.h b/sys/arm/freescale/vybrid/vf_common.h
index ab3c57fd3c81..44593be341cf 100644
--- a/sys/arm/freescale/vybrid/vf_common.h
+++ b/sys/arm/freescale/vybrid/vf_common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_dcu4.c b/sys/arm/freescale/vybrid/vf_dcu4.c
index 9e455d6027c6..7fbf4a36ebb7 100644
--- a/sys/arm/freescale/vybrid/vf_dcu4.c
+++ b/sys/arm/freescale/vybrid/vf_dcu4.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.c b/sys/arm/freescale/vybrid/vf_dmamux.c
index b6d0fe812804..a887ffa16d99 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.c
+++ b/sys/arm/freescale/vybrid/vf_dmamux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.h b/sys/arm/freescale/vybrid/vf_dmamux.h
index 8b3a2b959b42..92fa0764c537 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.h
+++ b/sys/arm/freescale/vybrid/vf_dmamux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_edma.c b/sys/arm/freescale/vybrid/vf_edma.c
index 23ce8cfd2c8d..eb6e514840d2 100644
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_edma.h b/sys/arm/freescale/vybrid/vf_edma.h
index 72968e7ce79e..5f77eaccbc04 100644
--- a/sys/arm/freescale/vybrid/vf_edma.h
+++ b/sys/arm/freescale/vybrid/vf_edma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_ehci.c b/sys/arm/freescale/vybrid/vf_ehci.c
index e7a7f41f505e..0a7dc941fef3 100644
--- a/sys/arm/freescale/vybrid/vf_ehci.c
+++ b/sys/arm/freescale/vybrid/vf_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
index cfe5db5e7a9a..0c1cf82303d8 100644
--- a/sys/arm/freescale/vybrid/vf_gpio.c
+++ b/sys/arm/freescale/vybrid/vf_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index 7a531948fc5f..8008d1af8973 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
index 340bfe04b5a5..c4e29fe89ccd 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.h b/sys/arm/freescale/vybrid/vf_iomuxc.h
index 3dc1bcdcbe2f..98b98b3c79b8 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.h
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_machdep.c b/sys/arm/freescale/vybrid/vf_machdep.c
index 7e2e162fd8c8..15566a4f3837 100644
--- a/sys/arm/freescale/vybrid/vf_machdep.c
+++ b/sys/arm/freescale/vybrid/vf_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_mscm.c b/sys/arm/freescale/vybrid/vf_mscm.c
index 73aeb41c8230..02850e58936f 100644
--- a/sys/arm/freescale/vybrid/vf_mscm.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_nfc.c b/sys/arm/freescale/vybrid/vf_nfc.c
index cdefa2564864..62b77824f411 100644
--- a/sys/arm/freescale/vybrid/vf_nfc.c
+++ b/sys/arm/freescale/vybrid/vf_nfc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_port.c b/sys/arm/freescale/vybrid/vf_port.c
index 3acd30a4ad37..6ff8bfcccb10 100644
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_port.h b/sys/arm/freescale/vybrid/vf_port.h
index e046a8fcba83..a2fd360e6347 100644
--- a/sys/arm/freescale/vybrid/vf_port.h
+++ b/sys/arm/freescale/vybrid/vf_port.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 84dcf991419b..8ff802a37f3f 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_src.c b/sys/arm/freescale/vybrid/vf_src.c
index 4cb71db477b9..83d7e969e09d 100644
--- a/sys/arm/freescale/vybrid/vf_src.c
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_src.h b/sys/arm/freescale/vybrid/vf_src.h
index 09bcfb2b4d06..8e50b058a83f 100644
--- a/sys/arm/freescale/vybrid/vf_src.h
+++ b/sys/arm/freescale/vybrid/vf_src.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_tcon.c b/sys/arm/freescale/vybrid/vf_tcon.c
index 6edd9081d014..31f85b58b464 100644
--- a/sys/arm/freescale/vybrid/vf_tcon.c
+++ b/sys/arm/freescale/vybrid/vf_tcon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/freescale/vybrid/vf_uart.c b/sys/arm/freescale/vybrid/vf_uart.c
index 50a0f9104e28..61a08fbf1db2 100644
--- a/sys/arm/freescale/vybrid/vf_uart.c
+++ b/sys/arm/freescale/vybrid/vf_uart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/include/_align.h b/sys/arm/include/_align.h
index 8b575ceca082..e382fe2ac311 100644
--- a/sys/arm/include/_align.h
+++ b/sys/arm/include/_align.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index cf07e71d19a9..4d3e91be872b 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h
index d8c1ce8a6cb9..ca70a7a95785 100644
--- a/sys/arm/include/_inttypes.h
+++ b/sys/arm/include/_inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index febb8834a181..8cb84649b100 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h
index 2032b7368143..0e1e80049f93 100644
--- a/sys/arm/include/_stdint.h
+++ b/sys/arm/include/_stdint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index de299e9bb680..204d8b3c42c5 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 366650af9e9c..ea2d598c6d2e 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: armreg.h,v 1.37 2007/01/06 00:50:54 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998, 2001 Ben Harris
* Copyright (c) 1994-1996 Mark Brinicombe.
* Copyright (c) 1994 Brini.
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 98889c674eb8..83e525cdfc9f 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -1,8 +1,6 @@
/* $NetBSD: asm.h,v 1.5 2003/08/07 16:26:53 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index 1e0b5071b729..d7f804fa26de 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard <cognet@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/include/at91_gpio.h b/sys/arm/include/at91_gpio.h
index ed940b9fbb39..d5445ffe2c77 100644
--- a/sys/arm/include/at91_gpio.h
+++ b/sys/arm/include/at91_gpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006 M. Warner Losh. All rights reserved.
* Copyright (C) 2012 Ian Lepore. All rights reserved.
*
diff --git a/sys/arm/include/atags.h b/sys/arm/include/atags.h
index 63aa4206d0cc..6d400af3d139 100644
--- a/sys/arm/include/atags.h
+++ b/sys/arm/include/atags.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 25c663bc251c..94735fc2717d 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -1,8 +1,6 @@
/* $NetBSD: atomic.h,v 1.1 2002/10/19 12:22:34 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003-2004 Olivier Houchard
* Copyright (C) 1994-1997 Mark Brinicombe
* Copyright (C) 1994 Brini
diff --git a/sys/arm/include/blockio.h b/sys/arm/include/blockio.h
index 963ddfc082fe..01db600217ec 100644
--- a/sys/arm/include/blockio.h
+++ b/sys/arm/include/blockio.h
@@ -1,8 +1,6 @@
/* $NetBSD: blockio.h,v 1.2 2001/06/02 10:44:56 bjh21 Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Ben Harris
* All rights reserved.
*
diff --git a/sys/arm/include/board.h b/sys/arm/include/board.h
index 67b1dce00644..931b24b30d5c 100644
--- a/sys/arm/include/board.h
+++ b/sys/arm/include/board.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h
index 37994f682ad0..3fbbf93262d7 100644
--- a/sys/arm/include/bus.h
+++ b/sys/arm/include/bus.h
@@ -31,8 +31,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Charles M. Hannum. All rights reserved.
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h
index 9cc1144cdb56..129511871f42 100644
--- a/sys/arm/include/bus_dma.h
+++ b/sys/arm/include/bus_dma.h
@@ -1,8 +1,6 @@
/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/arm/include/clock.h b/sys/arm/include/clock.h
index c9ac2039f836..61922f4daa93 100644
--- a/sys/arm/include/clock.h
+++ b/sys/arm/include/clock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h
index 2b9c9263ecbc..b2ddabd3f702 100644
--- a/sys/arm/include/counter.h
+++ b/sys/arm/include/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index 93786412d977..13c0eddd53db 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -1,8 +1,6 @@
/* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Mark Brinicombe.
* Copyright (c) 1997 Causality Limited
* All rights reserved.
diff --git a/sys/arm/include/disassem.h b/sys/arm/include/disassem.h
index 2ef5cda04c2f..a72c1fd10eba 100644
--- a/sys/arm/include/disassem.h
+++ b/sys/arm/include/disassem.h
@@ -1,8 +1,6 @@
/* $NetBSD: disassem.h,v 1.4 2001/03/04 04:15:58 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Mark Brinicombe.
* Copyright (c) 1997 Causality Limited.
*
diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
index b9c279819fa6..ee854f76adde 100644
--- a/sys/arm/include/elf.h
+++ b/sys/arm/include/elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
diff --git a/sys/arm/include/endian.h b/sys/arm/include/endian.h
index 5fb94db3b9b8..8ad09e1497d9 100644
--- a/sys/arm/include/endian.h
+++ b/sys/arm/include/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 David E. O'Brien
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/include/exec.h b/sys/arm/include/exec.h
index be6bc6f8677b..f5a2bb26f61f 100644
--- a/sys/arm/include/exec.h
+++ b/sys/arm/include/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* All rights reserved.
*
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 026e8557befe..e8302d6a7b3b 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/include/fiq.h b/sys/arm/include/fiq.h
index a075c99e7d9b..ccb29a8d7b5f 100644
--- a/sys/arm/include/fiq.h
+++ b/sys/arm/include/fiq.h
@@ -1,8 +1,6 @@
/* $NetBSD: fiq.h,v 1.1 2001/12/20 01:20:23 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/include/float.h b/sys/arm/include/float.h
index 857d76ea57e7..358a611bd4f7 100644
--- a/sys/arm/include/float.h
+++ b/sys/arm/include/float.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/include/floatingpoint.h b/sys/arm/include/floatingpoint.h
index b1c28e91d79e..fd328a9d739b 100644
--- a/sys/arm/include/floatingpoint.h
+++ b/sys/arm/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index 7eaf2e67c87e..c5a028aef209 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -1,8 +1,6 @@
/* $NetBSD: frame.h,v 1.5 2002/10/19 00:10:54 bjh21 Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994-1997 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/include/gdb_machdep.h b/sys/arm/include/gdb_machdep.h
index ab904a58934c..0b38f60d7745 100644
--- a/sys/arm/include/gdb_machdep.h
+++ b/sys/arm/include/gdb_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/include/ieee.h b/sys/arm/include/ieee.h
index 0942eac8eadf..25a096d10a47 100644
--- a/sys/arm/include/ieee.h
+++ b/sys/arm/include/ieee.h
@@ -1,8 +1,6 @@
/* $NetBSD: ieee754.h,v 1.4 2003/10/27 02:30:26 simonb Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/in_cksum.h b/sys/arm/include/in_cksum.h
index a75433830d73..60efb1e22eea 100644
--- a/sys/arm/include/in_cksum.h
+++ b/sys/arm/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index 37c3eca98e23..7a91525a909d 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -1,8 +1,6 @@
/* $NetBSD: intr.h,v 1.7 2003/06/16 20:01:00 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Mark Brinicombe.
* All rights reserved.
*
diff --git a/sys/arm/include/kdb.h b/sys/arm/include/kdb.h
index 96dbf1a0031e..c7968ab6e8b2 100644
--- a/sys/arm/include/kdb.h
+++ b/sys/arm/include/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h
index 8d437add22d2..35eea1f619de 100644
--- a/sys/arm/include/limits.h
+++ b/sys/arm/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/md_var.h b/sys/arm/include/md_var.h
index b39220199718..39a174ee7a42 100644
--- a/sys/arm/include/md_var.h
+++ b/sys/arm/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h
index b50449b94fbd..3ce0f38f33cd 100644
--- a/sys/arm/include/memdev.h
+++ b/sys/arm/include/memdev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h
index 587fd901b379..9589b7309dd4 100644
--- a/sys/arm/include/metadata.h
+++ b/sys/arm/include/metadata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/include/minidump.h b/sys/arm/include/minidump.h
index 2708030f27c3..aea9ec470f43 100644
--- a/sys/arm/include/minidump.h
+++ b/sys/arm/include/minidump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/arm/include/ofw_machdep.h b/sys/arm/include/ofw_machdep.h
index 76ab31c963cf..941be82fd1c4 100644
--- a/sys/arm/include/ofw_machdep.h
+++ b/sys/arm/include/ofw_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 52eb6fb3e61f..a5fd5208a9e7 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index 0d4aca5082f4..886fa43f49c2 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -1,8 +1,6 @@
/* $NetBSD: pcb.h,v 1.10 2003/10/13 21:46:39 scw Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Matt Thomas <matt@3am-software.com>.
* Copyright (c) 1994 Mark Brinicombe.
* All rights reserved.
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index e4d30874fd2d..33dfb1bb72ec 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/include/physmem.h b/sys/arm/include/physmem.h
index 1c86015a7d43..5e5968d06968 100644
--- a/sys/arm/include/physmem.h
+++ b/sys/arm/include/physmem.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/include/pl310.h b/sys/arm/include/pl310.h
index 02131396a519..5fcb7af955ab 100644
--- a/sys/arm/include/pl310.h
+++ b/sys/arm/include/pl310.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 4af92e7101e0..044483ddace7 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2016 Svatopluk Kraus
* Copyright (c) 2016 Michal Meloun
* All rights reserved.
diff --git a/sys/arm/include/pmc_mdep.h b/sys/arm/include/pmc_mdep.h
index d76615ad0e92..91023f4cb9e7 100644
--- a/sys/arm/include/pmc_mdep.h
+++ b/sys/arm/include/pmc_mdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index 94855b6f60e7..fc4b31eabac1 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index 2a2fab981f48..a28f33e90d3b 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/psl.h b/sys/arm/include/psl.h
index 000e93dd64a6..b300ff4858b3 100644
--- a/sys/arm/include/psl.h
+++ b/sys/arm/include/psl.h
@@ -1,8 +1,6 @@
/* $NetBSD: psl.h,v 1.6 2003/06/16 20:00:58 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Mark Brinicombe.
* All rights reserved.
*
diff --git a/sys/arm/include/reloc.h b/sys/arm/include/reloc.h
index 688475703225..df4a126eb1a9 100644
--- a/sys/arm/include/reloc.h
+++ b/sys/arm/include/reloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/runq.h b/sys/arm/include/runq.h
index ba21b9ab4316..e906fa192c6c 100644
--- a/sys/arm/include/runq.h
+++ b/sys/arm/include/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/include/sc_machdep.h b/sys/arm/include/sc_machdep.h
index 61a2a86f702d..4f3526fabcf0 100644
--- a/sys/arm/include/sc_machdep.h
+++ b/sys/arm/include/sc_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h
index c2857c7ac845..c711a42d00a3 100644
--- a/sys/arm/include/sf_buf.h
+++ b/sys/arm/include/sf_buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index 3ec678606f4c..4b6fa37b2241 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h
index 8461770e1190..8020d8d140c2 100644
--- a/sys/arm/include/stdarg.h
+++ b/sys/arm/include/stdarg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 850fdc2845c4..de48587cfd19 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -1,8 +1,6 @@
/* $NetBSD: sysarch.h,v 1.5 2003/09/11 09:40:12 kleink Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996-1997 Mark Brinicombe.
* All rights reserved.
*
diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h
index 2fdc5b68230b..67a640f0cf01 100644
--- a/sys/arm/include/ucontext.h
+++ b/sys/arm/include/ucontext.h
@@ -1,8 +1,6 @@
/* $NetBSD: mcontext.h,v 1.4 2003/10/08 22:43:01 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 4b2ab474fbf9..8a673f4f5987 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -1,8 +1,6 @@
/* $NetBSD: undefined.h,v 1.4 2001/12/20 01:20:23 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995-1996 Mark Brinicombe.
* Copyright (c) 1995 Brini.
* All rights reserved.
diff --git a/sys/arm/include/utrap.h b/sys/arm/include/utrap.h
index b261d87d566f..38a40b0166e5 100644
--- a/sys/arm/include/utrap.h
+++ b/sys/arm/include/utrap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/arm/include/vdso.h b/sys/arm/include/vdso.h
index 8d805bba0d88..7bb4000a7c4c 100644
--- a/sys/arm/include/vdso.h
+++ b/sys/arm/include/vdso.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
diff --git a/sys/arm/include/vfp.h b/sys/arm/include/vfp.h
index 15098d9a4c80..15ae54030005 100644
--- a/sys/arm/include/vfp.h
+++ b/sys/arm/include/vfp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2012 Mark Tinguely
*
* All rights reserved.
diff --git a/sys/arm/include/vm.h b/sys/arm/include/vm.h
index 64b48e53bffd..9c6d420ff21a 100644
--- a/sys/arm/include/vm.h
+++ b/sys/arm/include/vm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index ba43e9e91e6e..9ada97d1a9b3 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -1,8 +1,6 @@
/* $NetBSD: vmparam.h,v 1.26 2003/08/07 16:27:47 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index eac482511566..45ca363528c5 100644
--- a/sys/arm/lpc/if_lpe.c
+++ b/sys/arm/lpc/if_lpe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/if_lpereg.h b/sys/arm/lpc/if_lpereg.h
index a40bf8b57aa7..8e1512be0d44 100644
--- a/sys/arm/lpc/if_lpereg.h
+++ b/sys/arm/lpc/if_lpereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_dmac.c b/sys/arm/lpc/lpc_dmac.c
index 86f5503e9769..a4c64c678176 100644
--- a/sys/arm/lpc/lpc_dmac.c
+++ b/sys/arm/lpc/lpc_dmac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_fb.c b/sys/arm/lpc/lpc_fb.c
index 14a90658d89f..e4969159a45c 100644
--- a/sys/arm/lpc/lpc_fb.c
+++ b/sys/arm/lpc/lpc_fb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_gpio.c b/sys/arm/lpc/lpc_gpio.c
index e23cbe0557f5..b062792c55b6 100644
--- a/sys/arm/lpc/lpc_gpio.c
+++ b/sys/arm/lpc/lpc_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_intc.c b/sys/arm/lpc/lpc_intc.c
index 2923270816f3..d26ef9099c74 100644
--- a/sys/arm/lpc/lpc_intc.c
+++ b/sys/arm/lpc/lpc_intc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_machdep.c b/sys/arm/lpc/lpc_machdep.c
index c59ab8c5fe28..d193ac9f8d02 100644
--- a/sys/arm/lpc/lpc_machdep.c
+++ b/sys/arm/lpc/lpc_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/lpc/lpc_mmc.c b/sys/arm/lpc/lpc_mmc.c
index 3fde8d1f1e6e..5f028a011605 100644
--- a/sys/arm/lpc/lpc_mmc.c
+++ b/sys/arm/lpc/lpc_mmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_ohci.c b/sys/arm/lpc/lpc_ohci.c
index 11e685f5f0b7..74a6ea379896 100644
--- a/sys/arm/lpc/lpc_ohci.c
+++ b/sys/arm/lpc/lpc_ohci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_pll.c b/sys/arm/lpc/lpc_pll.c
index 9ba24de0f024..a6f06c88e83b 100644
--- a/sys/arm/lpc/lpc_pll.c
+++ b/sys/arm/lpc/lpc_pll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_pwr.c b/sys/arm/lpc/lpc_pwr.c
index 21b893024235..2b56e8cf6444 100644
--- a/sys/arm/lpc/lpc_pwr.c
+++ b/sys/arm/lpc/lpc_pwr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_rtc.c b/sys/arm/lpc/lpc_rtc.c
index 2ef06c88503d..80c378d3ddb9 100644
--- a/sys/arm/lpc/lpc_rtc.c
+++ b/sys/arm/lpc/lpc_rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_spi.c b/sys/arm/lpc/lpc_spi.c
index 67c114cf150b..87d3dcff0ec5 100644
--- a/sys/arm/lpc/lpc_spi.c
+++ b/sys/arm/lpc/lpc_spi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpc_timer.c b/sys/arm/lpc/lpc_timer.c
index 0c0019eef657..f745cf01b39c 100644
--- a/sys/arm/lpc/lpc_timer.c
+++ b/sys/arm/lpc/lpc_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpcreg.h b/sys/arm/lpc/lpcreg.h
index d094e8f95ac7..b63dfbc5accd 100644
--- a/sys/arm/lpc/lpcreg.h
+++ b/sys/arm/lpc/lpcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/lpcvar.h b/sys/arm/lpc/lpcvar.h
index dafbef0839cd..ed05320ca9d5 100644
--- a/sys/arm/lpc/lpcvar.h
+++ b/sys/arm/lpc/lpcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/lpc/ssd1289.c b/sys/arm/lpc/ssd1289.c
index 41227f686994..cdbd49008bdb 100644
--- a/sys/arm/lpc/ssd1289.c
+++ b/sys/arm/lpc/ssd1289.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Jakub Wojciech Klama <jceel@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c
index 740dd490605e..172d3d71b4dc 100644
--- a/sys/arm/mv/armadaxp/armadaxp.c
+++ b/sys/arm/mv/armadaxp/armadaxp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Semihalf.
* All rights reserved.
*
diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c
index 4f7276bf224b..2a9265df85b5 100644
--- a/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ b/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Semihalf.
* All rights reserved.
*
diff --git a/sys/arm/mv/discovery/discovery.c b/sys/arm/mv/discovery/discovery.c
index e917623d4a54..3968b78d4cc7 100644
--- a/sys/arm/mv/discovery/discovery.c
+++ b/sys/arm/mv/discovery/discovery.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index ed28d595d35d..670816715afe 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
index ed99ee646aec..244b3fd54748 100644
--- a/sys/arm/mv/ic.c
+++ b/sys/arm/mv/ic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
diff --git a/sys/arm/mv/kirkwood/kirkwood.c b/sys/arm/mv/kirkwood/kirkwood.c
index 0505ab8c8525..e6fd44275972 100644
--- a/sys/arm/mv/kirkwood/kirkwood.c
+++ b/sys/arm/mv/kirkwood/kirkwood.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index 25450932e064..3fc06d73e32d 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2011 MARVELL INTERNATIONAL LTD.
* Copyright (c) 2012 Semihalf.
diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c
index d165b159cee3..497860f6d1e3 100644
--- a/sys/arm/mv/mv_common.c
+++ b/sys/arm/mv/mv_common.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008-2011 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/mv_localbus.c b/sys/arm/mv/mv_localbus.c
index bea574bb4aed..5013da299b93 100644
--- a/sys/arm/mv/mv_localbus.c
+++ b/sys/arm/mv/mv_localbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index 856e2da7ecc5..782fcf0112c3 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 13564bd3eaae..55d3f15bb897 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 MARVELL INTERNATIONAL LTD.
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010-2015 Semihalf
diff --git a/sys/arm/mv/mv_ts.c b/sys/arm/mv/mv_ts.c
index dbb22d043d69..35cd06221e43 100644
--- a/sys/arm/mv/mv_ts.c
+++ b/sys/arm/mv/mv_ts.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/mv/mvreg.h b/sys/arm/mv/mvreg.h
index 6e128f08da52..abfefc186f7f 100644
--- a/sys/arm/mv/mvreg.h
+++ b/sys/arm/mv/mvreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2007-2011 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index bad2a3483c31..c08064feb1da 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/mv/mvwin.h b/sys/arm/mv/mvwin.h
index e12889307625..7e773a909f6e 100644
--- a/sys/arm/mv/mvwin.h
+++ b/sys/arm/mv/mvwin.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2007-2011 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/orion/db88f5xxx.c b/sys/arm/mv/orion/db88f5xxx.c
index 1e5e728d000c..95983e55a294 100644
--- a/sys/arm/mv/orion/db88f5xxx.c
+++ b/sys/arm/mv/orion/db88f5xxx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/orion/orion.c b/sys/arm/mv/orion/orion.c
index 8a927b8d8f33..d4c3a165dedc 100644
--- a/sys/arm/mv/orion/orion.c
+++ b/sys/arm/mv/orion/orion.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/rtc.c b/sys/arm/mv/rtc.c
index 61c879d525e3..caa28fe2f1cf 100644
--- a/sys/arm/mv/rtc.c
+++ b/sys/arm/mv/rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index e0ca2dee2189..c0a38ab385f4 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
diff --git a/sys/arm/rockchip/rk30xx_gpio.c b/sys/arm/rockchip/rk30xx_gpio.c
index 17583f083185..60dd57b819ca 100644
--- a/sys/arm/rockchip/rk30xx_gpio.c
+++ b/sys/arm/rockchip/rk30xx_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Luiz Otavio O Souza.
diff --git a/sys/arm/rockchip/rk30xx_grf.c b/sys/arm/rockchip/rk30xx_grf.c
index 2019e48fdee2..ce61e8c4e5fd 100644
--- a/sys/arm/rockchip/rk30xx_grf.c
+++ b/sys/arm/rockchip/rk30xx_grf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_grf.h b/sys/arm/rockchip/rk30xx_grf.h
index 9ddb635e64ef..7b5fd80abb17 100644
--- a/sys/arm/rockchip/rk30xx_grf.h
+++ b/sys/arm/rockchip/rk30xx_grf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_machdep.c b/sys/arm/rockchip/rk30xx_machdep.c
index 25f3e2c6e999..bb3731504d90 100644
--- a/sys/arm/rockchip/rk30xx_machdep.c
+++ b/sys/arm/rockchip/rk30xx_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_pmu.c b/sys/arm/rockchip/rk30xx_pmu.c
index 2572ddebdf0a..514e961d0d13 100644
--- a/sys/arm/rockchip/rk30xx_pmu.c
+++ b/sys/arm/rockchip/rk30xx_pmu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_pmu.h b/sys/arm/rockchip/rk30xx_pmu.h
index eaba0938200e..5d8eb4dc6baa 100644
--- a/sys/arm/rockchip/rk30xx_pmu.h
+++ b/sys/arm/rockchip/rk30xx_pmu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_wdog.c b/sys/arm/rockchip/rk30xx_wdog.c
index 03c55320e8b8..47d2b1c9ae1d 100644
--- a/sys/arm/rockchip/rk30xx_wdog.c
+++ b/sys/arm/rockchip/rk30xx_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/rockchip/rk30xx_wdog.h b/sys/arm/rockchip/rk30xx_wdog.h
index 5c1a85a9d3bf..c8f5a1d77c84 100644
--- a/sys/arm/rockchip/rk30xx_wdog.h
+++ b/sys/arm/rockchip/rk30xx_wdog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/samsung/exynos/exynos5_machdep.c b/sys/arm/samsung/exynos/exynos5_machdep.c
index b75f53ba3595..76a5af13bb19 100644
--- a/sys/arm/samsung/exynos/exynos5_machdep.c
+++ b/sys/arm/samsung/exynos/exynos5_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index 317cd34bce59..2fabf136925c 100644
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c
index 25a7e8fcb420..ae5bad684241 100644
--- a/sys/arm/ti/aintc.c
+++ b/sys/arm/ti/aintc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index 6010fc6d20b9..dd286cfb68c3 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index a069ed5cd8f2..c23aa24fb65d 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_lcd.h b/sys/arm/ti/am335x/am335x_lcd.h
index f230a930e42d..ed0779f98410 100644
--- a/sys/arm/ti/am335x/am335x_lcd.h
+++ b/sys/arm/ti/am335x/am335x_lcd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
index abb33a661025..e8ab873fcf3e 100644
--- a/sys/arm/ti/am335x/am335x_lcd_syscons.c
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_pmic.c b/sys/arm/ti/am335x/am335x_pmic.c
index a32be805e959..8bb272b42ae8 100644
--- a/sys/arm/ti/am335x/am335x_pmic.c
+++ b/sys/arm/ti/am335x/am335x_pmic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_prcm.c b/sys/arm/ti/am335x/am335x_prcm.c
index 502e1385ea6e..71fe72ef2f2f 100644
--- a/sys/arm/ti/am335x/am335x_prcm.c
+++ b/sys/arm/ti/am335x/am335x_prcm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_pwm.h b/sys/arm/ti/am335x/am335x_pwm.h
index 956913dcc292..8666b9a2a89a 100644
--- a/sys/arm/ti/am335x/am335x_pwm.h
+++ b/sys/arm/ti/am335x/am335x_pwm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_reg.h b/sys/arm/ti/am335x/am335x_reg.h
index cceaa9815e93..ca617e3f19e4 100644
--- a/sys/arm/ti/am335x/am335x_reg.h
+++ b/sys/arm/ti/am335x/am335x_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_scm.h b/sys/arm/ti/am335x/am335x_scm.h
index ff7af52fe3b8..6116be063adf 100644
--- a/sys/arm/ti/am335x/am335x_scm.h
+++ b/sys/arm/ti/am335x/am335x_scm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_scm_padconf.c b/sys/arm/ti/am335x/am335x_scm_padconf.c
index ab6d78ebb580..ebb65ddba2f6 100644
--- a/sys/arm/ti/am335x/am335x_scm_padconf.c
+++ b/sys/arm/ti/am335x/am335x_scm_padconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/am335x/am335x_usbss.c b/sys/arm/ti/am335x/am335x_usbss.c
index 8dd4b91917ce..6ddc562c5a91 100644
--- a/sys/arm/ti/am335x/am335x_usbss.c
+++ b/sys/arm/ti/am335x/am335x_usbss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index 8f16fc2f8669..2e722e1aca5c 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
* All rights reserved.
diff --git a/sys/arm/ti/cpsw/if_cpswreg.h b/sys/arm/ti/cpsw/if_cpswreg.h
index 9f73df19a064..c0ee3586fc45 100644
--- a/sys/arm/ti/cpsw/if_cpswreg.h
+++ b/sys/arm/ti/cpsw/if_cpswreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/cpsw/if_cpswvar.h b/sys/arm/ti/cpsw/if_cpswvar.h
index 9c51b76b9db4..003af222b81b 100644
--- a/sys/arm/ti/cpsw/if_cpswvar.h
+++ b/sys/arm/ti/cpsw/if_cpswvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/omap4/omap4_l2cache.c b/sys/arm/ti/omap4/omap4_l2cache.c
index 238bbab00e2d..8fddc6f71989 100644
--- a/sys/arm/ti/omap4/omap4_l2cache.c
+++ b/sys/arm/ti/omap4/omap4_l2cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index 5b63cbfb63ce..055a8aad5f03 100644
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/ti/omap4/omap4_prcm_clks.c b/sys/arm/ti/omap4/omap4_prcm_clks.c
index ea382c5b6b11..3aa10f675657 100644
--- a/sys/arm/ti/omap4/omap4_prcm_clks.c
+++ b/sys/arm/ti/omap4/omap4_prcm_clks.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/omap4/omap4_reg.h b/sys/arm/ti/omap4/omap4_reg.h
index 2bf87e11fac5..5a071c28f7c6 100644
--- a/sys/arm/ti/omap4/omap4_reg.h
+++ b/sys/arm/ti/omap4/omap4_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/omap4/omap4_scm_padconf.c b/sys/arm/ti/omap4/omap4_scm_padconf.c
index fc88df36da82..e43581e8db57 100644
--- a/sys/arm/ti/omap4/omap4_scm_padconf.c
+++ b/sys/arm/ti/omap4/omap4_scm_padconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/omap4/omap4_smc.h b/sys/arm/ti/omap4/omap4_smc.h
index cb22f10440fa..5fd14aaa7ece 100644
--- a/sys/arm/ti/omap4/omap4_smc.h
+++ b/sys/arm/ti/omap4/omap4_smc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/ti/omap4/pandaboard/pandaboard.c b/sys/arm/ti/omap4/pandaboard/pandaboard.c
index e5e5f8972533..f557f736c56d 100644
--- a/sys/arm/ti/omap4/pandaboard/pandaboard.c
+++ b/sys/arm/ti/omap4/pandaboard/pandaboard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_cpuid.c b/sys/arm/ti/ti_cpuid.c
index 8b6bde3b0b34..7048efee2aea 100644
--- a/sys/arm/ti/ti_cpuid.c
+++ b/sys/arm/ti/ti_cpuid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_cpuid.h b/sys/arm/ti/ti_cpuid.h
index c72b36dfee3c..86ac98287267 100644
--- a/sys/arm/ti/ti_cpuid.h
+++ b/sys/arm/ti/ti_cpuid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_edma3.c b/sys/arm/ti/ti_edma3.c
index e9fc25935aed..080e7bddbe77 100644
--- a/sys/arm/ti/ti_edma3.c
+++ b/sys/arm/ti/ti_edma3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/ti_edma3.h b/sys/arm/ti/ti_edma3.h
index 501b70a643e8..f149c9c9e1b3 100644
--- a/sys/arm/ti/ti_edma3.h
+++ b/sys/arm/ti/ti_edma3.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/ti_gpio.c b/sys/arm/ti/ti_gpio.c
index 0c7d1cd09f45..fbaa2dd20678 100644
--- a/sys/arm/ti/ti_gpio.c
+++ b/sys/arm/ti/ti_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
* Copyright (c) 2014 Luiz Otavio O Souza <loos@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index 0893e80b8caa..a8ccadba0dbd 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
* Copyright (c) 2014 Luiz Otavio O Souza <loos@freebsd.org>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_i2c.h b/sys/arm/ti/ti_i2c.h
index 835fa58d6951..d8dac60b1c4c 100644
--- a/sys/arm/ti/ti_i2c.h
+++ b/sys/arm/ti/ti_i2c.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_machdep.c b/sys/arm/ti/ti_machdep.c
index 65c9be8328cd..907b18b6151e 100644
--- a/sys/arm/ti/ti_machdep.c
+++ b/sys/arm/ti/ti_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
index 83f81018c111..9729ed40fc4a 100644
--- a/sys/arm/ti/ti_mbox.c
+++ b/sys/arm/ti/ti_mbox.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/ti_mbox.h b/sys/arm/ti/ti_mbox.h
index 31f82a3ce7b1..48ea3caecf28 100644
--- a/sys/arm/ti/ti_mbox.h
+++ b/sys/arm/ti/ti_mbox.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/ti/ti_prcm.c b/sys/arm/ti/ti_prcm.c
index 3b6bbabe6910..e049cbb598bf 100644
--- a/sys/arm/ti/ti_prcm.c
+++ b/sys/arm/ti/ti_prcm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_prcm.h b/sys/arm/ti/ti_prcm.h
index 6df39436cb2f..61b696076dda 100644
--- a/sys/arm/ti/ti_prcm.h
+++ b/sys/arm/ti/ti_prcm.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index 002e46510e43..e3f84b2a3517 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2017 Manuel Stuehn
* All rights reserved.
diff --git a/sys/arm/ti/ti_pruss.h b/sys/arm/ti/ti_pruss.h
index 855ac2d69790..44552a5fa535 100644
--- a/sys/arm/ti/ti_pruss.h
+++ b/sys/arm/ti/ti_pruss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2017 Manuel Stuehn
* All rights reserved.
diff --git a/sys/arm/ti/ti_scm.c b/sys/arm/ti/ti_scm.c
index 93c53bb2838c..ae36a9b63a71 100644
--- a/sys/arm/ti/ti_scm.c
+++ b/sys/arm/ti/ti_scm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_scm.h b/sys/arm/ti/ti_scm.h
index f1df004e2bda..1342ddc6d03b 100644
--- a/sys/arm/ti/ti_scm.h
+++ b/sys/arm/ti/ti_scm.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 132290d60f0f..6b188ddd0728 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_sdma.c b/sys/arm/ti/ti_sdma.c
index b184ae6ce0c2..7e5e9574e4c6 100644
--- a/sys/arm/ti/ti_sdma.c
+++ b/sys/arm/ti/ti_sdma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_sdma.h b/sys/arm/ti/ti_sdma.h
index 5b96766b2fb1..2d7e626b2f9a 100644
--- a/sys/arm/ti/ti_sdma.h
+++ b/sys/arm/ti/ti_sdma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_sdmareg.h b/sys/arm/ti/ti_sdmareg.h
index 8fa8d7ba02d4..c19af123837a 100644
--- a/sys/arm/ti/ti_sdmareg.h
+++ b/sys/arm/ti/ti_sdmareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/ti_smc.h b/sys/arm/ti/ti_smc.h
index 537df2d3637d..7fae8ab4f79e 100644
--- a/sys/arm/ti/ti_smc.h
+++ b/sys/arm/ti/ti_smc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/ti/tivar.h b/sys/arm/ti/tivar.h
index ecc0a4487947..248ad901fa91 100644
--- a/sys/arm/ti/tivar.h
+++ b/sys/arm/ti/tivar.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c
index 50f2bd9ea513..8cafcf48685d 100644
--- a/sys/arm/ti/twl/twl.c
+++ b/sys/arm/ti/twl/twl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl.h b/sys/arm/ti/twl/twl.h
index 44203a765623..07f2cfd8c9c9 100644
--- a/sys/arm/ti/twl/twl.h
+++ b/sys/arm/ti/twl/twl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl_clks.c b/sys/arm/ti/twl/twl_clks.c
index 0b41fb0136cf..33efa0af1df4 100644
--- a/sys/arm/ti/twl/twl_clks.c
+++ b/sys/arm/ti/twl/twl_clks.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl_clks.h b/sys/arm/ti/twl/twl_clks.h
index ccc397e3e76b..c5d89f38531d 100644
--- a/sys/arm/ti/twl/twl_clks.h
+++ b/sys/arm/ti/twl/twl_clks.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl_vreg.c b/sys/arm/ti/twl/twl_vreg.c
index 0250e127d22e..6662c5d1d031 100644
--- a/sys/arm/ti/twl/twl_vreg.c
+++ b/sys/arm/ti/twl/twl_vreg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/twl/twl_vreg.h b/sys/arm/ti/twl/twl_vreg.h
index 45543705e255..dc77dfcfaaca 100644
--- a/sys/arm/ti/twl/twl_vreg.h
+++ b/sys/arm/ti/twl/twl_vreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/usb/omap_ehci.c b/sys/arm/ti/usb/omap_ehci.c
index ac97da5c8d1e..f7e2057b852c 100644
--- a/sys/arm/ti/usb/omap_ehci.c
+++ b/sys/arm/ti/usb/omap_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/ti/usb/omap_usb.h b/sys/arm/ti/usb/omap_usb.h
index 246828d31f9d..d6950d6483cb 100644
--- a/sys/arm/ti/usb/omap_usb.h
+++ b/sys/arm/ti/usb/omap_usb.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2010
* Ben Gray <ben.r.gray@gmail.com>.
* All rights reserved.
diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index 388f76031a6c..96092ba18a26 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh
* Copyright (c) 2005 Olivier Houchard
* Copyright (c) 2012 Thomas Skibo
diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c
index 7bc7e9ebd37e..385afd16a33b 100644
--- a/sys/arm/xilinx/zy7_devcfg.c
+++ b/sys/arm/xilinx/zy7_devcfg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c
index a26fd09359ec..6468faa7ac13 100644
--- a/sys/arm/xilinx/zy7_ehci.c
+++ b/sys/arm/xilinx/zy7_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c
index c4d47fcfa10d..25d22f87e4dd 100644
--- a/sys/arm/xilinx/zy7_gpio.c
+++ b/sys/arm/xilinx/zy7_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_l2cache.c b/sys/arm/xilinx/zy7_l2cache.c
index 8ce3fd34792c..818fd0321aeb 100644
--- a/sys/arm/xilinx/zy7_l2cache.c
+++ b/sys/arm/xilinx/zy7_l2cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_machdep.c b/sys/arm/xilinx/zy7_machdep.c
index 0399c0a009fa..7eb4308b31d9 100644
--- a/sys/arm/xilinx/zy7_machdep.c
+++ b/sys/arm/xilinx/zy7_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_reg.h b/sys/arm/xilinx/zy7_reg.h
index d790ac35b4a3..2f55ffedaaca 100644
--- a/sys/arm/xilinx/zy7_reg.h
+++ b/sys/arm/xilinx/zy7_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c
index 7e4a1698a085..c630fe6f7ce4 100644
--- a/sys/arm/xilinx/zy7_slcr.c
+++ b/sys/arm/xilinx/zy7_slcr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xilinx/zy7_slcr.h b/sys/arm/xilinx/zy7_slcr.h
index d1e1641f32dc..3afec02a8b3c 100644
--- a/sys/arm/xilinx/zy7_slcr.h
+++ b/sys/arm/xilinx/zy7_slcr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index df957261ef41..898bbaa36876 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -1,8 +1,6 @@
/* $NetBSD: hpc_machdep.c,v 1.70 2003/09/16 08:18:22 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/xscale/i8134x/i81342.c b/sys/arm/xscale/i8134x/i81342.c
index ace6004cf9c0..7a6b315661fc 100644
--- a/sys/arm/xscale/i8134x/i81342.c
+++ b/sys/arm/xscale/i8134x/i81342.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/i81342_mcu.c b/sys/arm/xscale/i8134x/i81342_mcu.c
index a144774233ff..7a3d2bf946d5 100644
--- a/sys/arm/xscale/i8134x/i81342_mcu.c
+++ b/sys/arm/xscale/i8134x/i81342_mcu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 973a3bc96cbc..32716a93acda 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/i81342_space.c b/sys/arm/xscale/i8134x/i81342_space.c
index ed27675e4a0f..65ac92820639 100644
--- a/sys/arm/xscale/i8134x/i81342_space.c
+++ b/sys/arm/xscale/i8134x/i81342_space.c
@@ -1,8 +1,6 @@
/* $NetBSD: i80321_space.c,v 1.6 2003/10/06 15:43:35 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/i81342reg.h b/sys/arm/xscale/i8134x/i81342reg.h
index 07bec22ef89c..24021945381a 100644
--- a/sys/arm/xscale/i8134x/i81342reg.h
+++ b/sys/arm/xscale/i8134x/i81342reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/i81342var.h b/sys/arm/xscale/i8134x/i81342var.h
index 92574964610e..c7fde4b138e7 100644
--- a/sys/arm/xscale/i8134x/i81342var.h
+++ b/sys/arm/xscale/i8134x/i81342var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/iq81342_7seg.c b/sys/arm/xscale/i8134x/iq81342_7seg.c
index 7264d1c9e656..4fda6411d37d 100644
--- a/sys/arm/xscale/i8134x/iq81342_7seg.c
+++ b/sys/arm/xscale/i8134x/iq81342_7seg.c
@@ -1,8 +1,6 @@
/* $NetBSD: iq31244_7seg.c,v 1.2 2003/07/15 00:25:01 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/iq81342reg.h b/sys/arm/xscale/i8134x/iq81342reg.h
index da1e67b83f21..b1e2516faf44 100644
--- a/sys/arm/xscale/i8134x/iq81342reg.h
+++ b/sys/arm/xscale/i8134x/iq81342reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/iq81342var.h b/sys/arm/xscale/i8134x/iq81342var.h
index 8c89a0f82ef7..af30b169260c 100644
--- a/sys/arm/xscale/i8134x/iq81342var.h
+++ b/sys/arm/xscale/i8134x/iq81342var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/obio.c b/sys/arm/xscale/i8134x/obio.c
index b4fa04d2a51b..f61893befdac 100644
--- a/sys/arm/xscale/i8134x/obio.c
+++ b/sys/arm/xscale/i8134x/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/obiovar.h b/sys/arm/xscale/i8134x/obiovar.h
index 14bef4402cd7..237dd9e7d944 100644
--- a/sys/arm/xscale/i8134x/obiovar.h
+++ b/sys/arm/xscale/i8134x/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/i8134x/uart_bus_i81342.c b/sys/arm/xscale/i8134x/uart_bus_i81342.c
index 07e8cd7e0950..34df098e74c9 100644
--- a/sys/arm/xscale/i8134x/uart_bus_i81342.c
+++ b/sys/arm/xscale/i8134x/uart_bus_i81342.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/i8134x/uart_cpu_i81342.c b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
index 5bae3931d451..1d98d78bcfe2 100644
--- a/sys/arm/xscale/i8134x/uart_cpu_i81342.c
+++ b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c
index fc9e67c5ef17..2000a4f4107f 100644
--- a/sys/arm/xscale/ixp425/avila_ata.c
+++ b/sys/arm/xscale/ixp425/avila_ata.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/avila_gpio.c b/sys/arm/xscale/ixp425/avila_gpio.c
index 99f0e803f583..d14d9c280388 100644
--- a/sys/arm/xscale/ixp425/avila_gpio.c
+++ b/sys/arm/xscale/ixp425/avila_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
* Copyright (c) 2010, Andrew Thompson <thompsa@FreeBSD.org>
diff --git a/sys/arm/xscale/ixp425/avila_led.c b/sys/arm/xscale/ixp425/avila_led.c
index a4a27d8727ed..ed41782efc44 100644
--- a/sys/arm/xscale/ixp425/avila_led.c
+++ b/sys/arm/xscale/ixp425/avila_led.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Kevin Lo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index a84de1f3402b..f26d3ca7936e 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -1,8 +1,6 @@
/* $NetBSD: hpc_machdep.c,v 1.70 2003/09/16 08:18:22 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/cambria_exp_space.c b/sys/arm/xscale/ixp425/cambria_exp_space.c
index 68b7f3ce7b91..9dce5778b8e3 100644
--- a/sys/arm/xscale/ixp425/cambria_exp_space.c
+++ b/sys/arm/xscale/ixp425/cambria_exp_space.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/cambria_fled.c b/sys/arm/xscale/ixp425/cambria_fled.c
index d7fec5e22cb9..c2f214d9837b 100644
--- a/sys/arm/xscale/ixp425/cambria_fled.c
+++ b/sys/arm/xscale/ixp425/cambria_fled.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/cambria_gpio.c b/sys/arm/xscale/ixp425/cambria_gpio.c
index 8ed35c4e2084..c8714182c6ee 100644
--- a/sys/arm/xscale/ixp425/cambria_gpio.c
+++ b/sys/arm/xscale/ixp425/cambria_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/cambria_led.c b/sys/arm/xscale/ixp425/cambria_led.c
index 747d7df0a75c..f99a1aa1a89b 100644
--- a/sys/arm/xscale/ixp425/cambria_led.c
+++ b/sys/arm/xscale/ixp425/cambria_led.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index d797154ee1d4..fa3eacbeed8c 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/if_npereg.h b/sys/arm/xscale/ixp425/if_npereg.h
index b9adf47b97d9..a7422c71a408 100644
--- a/sys/arm/xscale/ixp425/if_npereg.h
+++ b/sys/arm/xscale/ixp425/if_npereg.h
@@ -29,9 +29,7 @@
* $FreeBSD$
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2001-2005, Intel Corporation.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixdp425_pci.c b/sys/arm/xscale/ixp425/ixdp425_pci.c
index e693dc47f5c5..9fc3694d371c 100644
--- a/sys/arm/xscale/ixp425/ixdp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixdp425_pci.c
@@ -1,7 +1,5 @@
/* $NetBSD: ixdp425_pci.c,v 1.5 2005/12/11 12:17:09 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixdp425reg.h b/sys/arm/xscale/ixp425/ixdp425reg.h
index e07af7a1bd8f..d9f29bfec337 100644
--- a/sys/arm/xscale/ixp425/ixdp425reg.h
+++ b/sys/arm/xscale/ixp425/ixdp425reg.h
@@ -1,7 +1,5 @@
/* $NetBSD: ixdp425reg.h,v 1.6 2005/12/11 12:17:09 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index 96d67555f499..aca7d7723728 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425.c,v 1.10 2005/12/11 12:16:51 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425_a4x_space.c b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
index ae4abab49206..1b128bbf0e25 100644
--- a/sys/arm/xscale/ixp425/ixp425_a4x_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_a4x_space.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_iic.c b/sys/arm/xscale/ixp425/ixp425_iic.c
index 0ffaace2cc35..bb66236b6967 100644
--- a/sys/arm/xscale/ixp425/ixp425_iic.c
+++ b/sys/arm/xscale/ixp425/ixp425_iic.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006 Kevin Lo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/ixp425_intr.h b/sys/arm/xscale/ixp425/ixp425_intr.h
index ae9bf1cf629c..6c2e650160c5 100644
--- a/sys/arm/xscale/ixp425/ixp425_intr.h
+++ b/sys/arm/xscale/ixp425/ixp425_intr.h
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_intr.h,v 1.6 2005/12/24 20:06:52 perry Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_mem.c b/sys/arm/xscale/ixp425/ixp425_mem.c
index e4a616520082..12a553b8b8f3 100644
--- a/sys/arm/xscale/ixp425/ixp425_mem.c
+++ b/sys/arm/xscale/ixp425/ixp425_mem.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_mem.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_npe.c b/sys/arm/xscale/ixp425/ixp425_npe.c
index 8a2b941a211f..720b0f4a7dd8 100644
--- a/sys/arm/xscale/ixp425/ixp425_npe.c
+++ b/sys/arm/xscale/ixp425/ixp425_npe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_npereg.h b/sys/arm/xscale/ixp425/ixp425_npereg.h
index 40e68e6fb549..94aff85f61ca 100644
--- a/sys/arm/xscale/ixp425/ixp425_npereg.h
+++ b/sys/arm/xscale/ixp425/ixp425_npereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_npevar.h b/sys/arm/xscale/ixp425/ixp425_npevar.h
index d06b56ec29db..fdab8bb9ffcd 100644
--- a/sys/arm/xscale/ixp425/ixp425_npevar.h
+++ b/sys/arm/xscale/ixp425/ixp425_npevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index c4f973158e80..d9878783b40e 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_pci.c,v 1.5 2006/04/10 03:36:03 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425_pci_space.c b/sys/arm/xscale/ixp425/ixp425_pci_space.c
index 0aae0de01d20..bec3d9c9a980 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci_space.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_pci_space.c,v 1.6 2006/04/10 03:36:03 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.c b/sys/arm/xscale/ixp425/ixp425_qmgr.c
index 914c7c72c747..16c2c250021f 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.c
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.c
@@ -28,8 +28,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2005, Intel Corporation.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.h b/sys/arm/xscale/ixp425/ixp425_qmgr.h
index 62a3edcba85e..0eb6dc7ed7bf 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.h
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.h
@@ -30,8 +30,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2005, Intel Corporation.
* All rights reserved.
*
diff --git a/sys/arm/xscale/ixp425/ixp425_space.c b/sys/arm/xscale/ixp425/ixp425_space.c
index 05db437f1329..932c71bf5394 100644
--- a/sys/arm/xscale/ixp425/ixp425_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_space.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_space.c,v 1.6 2006/04/10 03:36:03 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425_timer.c b/sys/arm/xscale/ixp425/ixp425_timer.c
index 186fdfd56254..e6b6ecd6fcba 100644
--- a/sys/arm/xscale/ixp425/ixp425_timer.c
+++ b/sys/arm/xscale/ixp425/ixp425_timer.c
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425_timer.c,v 1.11 2006/04/10 03:36:03 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425_wdog.c b/sys/arm/xscale/ixp425/ixp425_wdog.c
index ede52063d114..c3111d29c6e5 100644
--- a/sys/arm/xscale/ixp425/ixp425_wdog.c
+++ b/sys/arm/xscale/ixp425/ixp425_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/ixp425reg.h b/sys/arm/xscale/ixp425/ixp425reg.h
index 4f3b258a3090..f353d4449fb1 100644
--- a/sys/arm/xscale/ixp425/ixp425reg.h
+++ b/sys/arm/xscale/ixp425/ixp425reg.h
@@ -1,7 +1,5 @@
/* $NetBSD: ixp425reg.h,v 1.19 2005/12/11 12:16:51 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/ixp425var.h b/sys/arm/xscale/ixp425/ixp425var.h
index 7aa3d4db676c..761836b30793 100644
--- a/sys/arm/xscale/ixp425/ixp425var.h
+++ b/sys/arm/xscale/ixp425/ixp425var.h
@@ -1,8 +1,6 @@
/* $NetBSD: ixp425var.h,v 1.10 2006/04/10 03:36:03 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
* All rights reserved.
diff --git a/sys/arm/xscale/ixp425/uart_bus_ixp425.c b/sys/arm/xscale/ixp425/uart_bus_ixp425.c
index a5436e04d999..c3f16b8a667e 100644
--- a/sys/arm/xscale/ixp425/uart_bus_ixp425.c
+++ b/sys/arm/xscale/ixp425/uart_bus_ixp425.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Kevin Lo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/ixp425/uart_cpu_ixp425.c b/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
index ce068f4f5ea8..a375d5615b8d 100644
--- a/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
+++ b/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/arm/xscale/pxa/if_smc_smi.c b/sys/arm/xscale/pxa/if_smc_smi.c
index 4b9c58d8d865..2274ffb30ca6 100644
--- a/sys/arm/xscale/pxa/if_smc_smi.c
+++ b/sys/arm/xscale/pxa/if_smc_smi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Benno Rice
* All rights reserved.
*
diff --git a/sys/arm/xscale/pxa/pxa_gpio.c b/sys/arm/xscale/pxa/pxa_gpio.c
index 91f3865d3ba5..a3ad33d98a8b 100644
--- a/sys/arm/xscale/pxa/pxa_gpio.c
+++ b/sys/arm/xscale/pxa/pxa_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/pxa_icu.c b/sys/arm/xscale/pxa/pxa_icu.c
index d39fa3e09c7a..c375ccba48bc 100644
--- a/sys/arm/xscale/pxa/pxa_icu.c
+++ b/sys/arm/xscale/pxa/pxa_icu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/pxa_machdep.c b/sys/arm/xscale/pxa/pxa_machdep.c
index e28599be9bfd..bc3ab6f38946 100644
--- a/sys/arm/xscale/pxa/pxa_machdep.c
+++ b/sys/arm/xscale/pxa/pxa_machdep.c
@@ -1,8 +1,6 @@
/* $NetBSD: hpc_machdep.c,v 1.70 2003/09/16 08:18:22 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
diff --git a/sys/arm/xscale/pxa/pxa_obio.c b/sys/arm/xscale/pxa/pxa_obio.c
index e084a3b49471..60815881c04b 100644
--- a/sys/arm/xscale/pxa/pxa_obio.c
+++ b/sys/arm/xscale/pxa/pxa_obio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/pxa_smi.c b/sys/arm/xscale/pxa/pxa_smi.c
index f28021e91aa7..b08a7c7ac1e0 100644
--- a/sys/arm/xscale/pxa/pxa_smi.c
+++ b/sys/arm/xscale/pxa/pxa_smi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/pxa_space.c b/sys/arm/xscale/pxa/pxa_space.c
index 976c4c325b0d..2378efe9a9a7 100644
--- a/sys/arm/xscale/pxa/pxa_space.c
+++ b/sys/arm/xscale/pxa/pxa_space.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio_space.c,v 1.6 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/pxa/pxa_timer.c b/sys/arm/xscale/pxa/pxa_timer.c
index 4c093897f23a..e13793de6782 100644
--- a/sys/arm/xscale/pxa/pxa_timer.c
+++ b/sys/arm/xscale/pxa/pxa_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/pxareg.h b/sys/arm/xscale/pxa/pxareg.h
index eb1f53b2790b..03a167f0d8d9 100644
--- a/sys/arm/xscale/pxa/pxareg.h
+++ b/sys/arm/xscale/pxa/pxareg.h
@@ -1,8 +1,6 @@
/* $NetBSD: pxa2x0reg.h,v 1.9 2006/04/10 04:13:58 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
*
diff --git a/sys/arm/xscale/pxa/pxavar.h b/sys/arm/xscale/pxa/pxavar.h
index 01deea230fd0..85788229ef54 100644
--- a/sys/arm/xscale/pxa/pxavar.h
+++ b/sys/arm/xscale/pxa/pxavar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/arm/xscale/pxa/uart_bus_pxa.c b/sys/arm/xscale/pxa/uart_bus_pxa.c
index 62c342216d4d..c5df61938885 100644
--- a/sys/arm/xscale/pxa/uart_bus_pxa.c
+++ b/sys/arm/xscale/pxa/uart_bus_pxa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/pxa/uart_cpu_pxa.c b/sys/arm/xscale/pxa/uart_cpu_pxa.c
index 68c253c32adb..1cb4671178cc 100644
--- a/sys/arm/xscale/pxa/uart_cpu_pxa.c
+++ b/sys/arm/xscale/pxa/uart_cpu_pxa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index de47e47c0ccc..078b333a3268 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_domain.h b/sys/bsm/audit_domain.h
index 9d8de7fd7b93..22d2966c34da 100644
--- a/sys/bsm/audit_domain.h
+++ b/sys/bsm/audit_domain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_errno.h b/sys/bsm/audit_errno.h
index 81cfc3548e8e..939ddeb6b01e 100644
--- a/sys/bsm/audit_errno.h
+++ b/sys/bsm/audit_errno.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_fcntl.h b/sys/bsm/audit_fcntl.h
index 713a0a3c4deb..8b5f1a57800d 100644
--- a/sys/bsm/audit_fcntl.h
+++ b/sys/bsm/audit_fcntl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 501b03237b24..3ec98960a562 100644
--- a/sys/bsm/audit_internal.h
+++ b/sys/bsm/audit_internal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005-2008 Apple Inc.
* Copyright (c) 2005 SPARTA, Inc.
* All rights reserved.
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index 8998fb1ed571..3c16c739a749 100644
--- a/sys/bsm/audit_kevents.h
+++ b/sys/bsm/audit_kevents.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h
index a20a500d11be..b72236bc7b0e 100644
--- a/sys/bsm/audit_record.h
+++ b/sys/bsm/audit_record.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/bsm/audit_socket_type.h b/sys/bsm/audit_socket_type.h
index 0e583e04ee6d..1f580fce050e 100644
--- a/sys/bsm/audit_socket_type.h
+++ b/sys/bsm/audit_socket_type.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/compat/freebsd32/freebsd32_ioctl.c b/sys/compat/freebsd32/freebsd32_ioctl.c
index 9dd0fb1ece1d..b634b30960b9 100644
--- a/sys/compat/freebsd32/freebsd32_ioctl.c
+++ b/sys/compat/freebsd32/freebsd32_ioctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 David E. O'Brien
* All rights reserved.
*
diff --git a/sys/compat/freebsd32/freebsd32_ioctl.h b/sys/compat/freebsd32/freebsd32_ioctl.h
index 9ce740713bf2..18cfc95c569a 100644
--- a/sys/compat/freebsd32/freebsd32_ioctl.h
+++ b/sys/compat/freebsd32/freebsd32_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 David E. O'Brien
* All rights reserved.
*
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 357123334446..05258b223f54 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
* Copyright (c) 1999 Pierre Beyssac
* Copyright (c) 1993 Jan-Simon Pendry
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index ff40a85926be..1fb44ce268a1 100644
--- a/sys/compat/ndis/cfg_var.h
+++ b/sys/compat/ndis/cfg_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index f8864e2e7071..699b01ca0efd 100644
--- a/sys/compat/ndis/hal_var.h
+++ b/sys/compat/ndis/hal_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index 99fcc28ffd3b..55b22a22803e 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index 597b8362b37e..5572988ca3d4 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
index 6b9f69f99045..80b49207c25a 100644
--- a/sys/compat/ndis/ndis_var.h
+++ b/sys/compat/ndis/ndis_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index 9c8c19964504..48ddcd9d8baf 100644
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ b/sys/compat/ndis/ntoskrnl_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index 2e5758c592e1..9729f0b5e4bf 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
index b06a2e09f910..5ce096c08e02 100644
--- a/sys/compat/ndis/resource_var.h
+++ b/sys/compat/ndis/resource_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index ea30675d66b0..7bb3f28e6caf 100644
--- a/sys/compat/ndis/subr_hal.c
+++ b/sys/compat/ndis/subr_hal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index e1ba8cc12cd6..98a0a284ce8f 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index 5bf3e7aeee49..cfa97275d7ee 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
index 1cd698fdd51c..47bef25499c1 100644
--- a/sys/compat/ndis/subr_pe.c
+++ b/sys/compat/ndis/subr_pe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index 2c877ea533a5..eca2708bfc1a 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/usbd_var.h b/sys/compat/ndis/usbd_var.h
index 6566a29d52d6..019bd32a9715 100644
--- a/sys/compat/ndis/usbd_var.h
+++ b/sys/compat/ndis/usbd_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 51351c9d2a3a..4bc009699811 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index e6d6adc5fedd..d393be8a2793 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -1,7 +1,5 @@
#! /bin/sh
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c
index 4418ba628b26..b2451c71ae8f 100644
--- a/sys/crypto/sha1.c
+++ b/sys/crypto/sha1.c
@@ -1,7 +1,5 @@
/* $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index 95c07682b7ac..c1bc1a3a9021 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 40473793ceb1..ab375d5e7ae9 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index d54fe3326520..fcf772b59458 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, Garrett A. Wollman.
* Copyright (c) 1993, University of Vermont and State Agricultural College.
* All rights reserved.
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 1d01a69bcc44..79523c10f74d 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 2e95b6da1409..dc589c32e1c8 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec, Inc.
* All rights reserved.
*
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index b1d79b92250e..6dd84f5060fd 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 1a547ed039ab..89c0fa6d6738 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index 02babb5c0576..71a20ffd4012 100644
--- a/sys/dev/aac/aac_linux.c
+++ b/sys/dev/aac/aac_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Scott Long
* All rights reserved.
*
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 1685abe8a00e..83e7e63fda8e 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index a973f52f54ca..6f52d5d41cd4 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index d0800f3d5881..70859bbff051 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index f3bbb53b21e9..bcedff59f1f8 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c
index b51a1822ec0e..e66f1474356c 100644
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c
index baddaae2758e..5a3d2c680139 100644
--- a/sys/dev/aacraid/aacraid_cam.c
+++ b/sys/dev/aacraid/aacraid_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
diff --git a/sys/dev/aacraid/aacraid_debug.c b/sys/dev/aacraid/aacraid_debug.c
index 75d023339295..db3bab554a00 100644
--- a/sys/dev/aacraid/aacraid_debug.c
+++ b/sys/dev/aacraid/aacraid_debug.c
@@ -1,6 +1,5 @@
+
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
diff --git a/sys/dev/aacraid/aacraid_debug.h b/sys/dev/aacraid/aacraid_debug.h
index 5ef43a4dc462..d79bb9226201 100644
--- a/sys/dev/aacraid/aacraid_debug.h
+++ b/sys/dev/aacraid/aacraid_debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c
index 9ea9458ddec4..10dd11ac02c9 100644
--- a/sys/dev/aacraid/aacraid_linux.c
+++ b/sys/dev/aacraid/aacraid_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Scott Long
* Copyright (c) 2002-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
diff --git a/sys/dev/aacraid/aacraid_pci.c b/sys/dev/aacraid/aacraid_pci.c
index 1f17a7c9345d..0f67c742be0b 100644
--- a/sys/dev/aacraid/aacraid_pci.c
+++ b/sys/dev/aacraid/aacraid_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aacraid/aacraid_reg.h b/sys/dev/aacraid/aacraid_reg.h
index f58d36518cde..b02d1936862a 100644
--- a/sys/dev/aacraid/aacraid_reg.h
+++ b/sys/dev/aacraid/aacraid_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aacraid/aacraid_var.h b/sys/dev/aacraid/aacraid_var.h
index 942198177d72..55035a93dfff 100644
--- a/sys/dev/aacraid/aacraid_var.h
+++ b/sys/dev/aacraid/aacraid_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/adb/adb.h b/sys/dev/adb/adb.h
index 623dda13402f..acb5ae27d4c6 100644
--- a/sys/dev/adb/adb.h
+++ b/sys/dev/adb/adb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c
index 4c504a65a93d..fd46f27e9630 100644
--- a/sys/dev/adb/adb_bus.c
+++ b/sys/dev/adb/adb_bus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/adb/adb_buttons.c b/sys/dev/adb/adb_buttons.c
index 3d8726e152b2..b311b28daec0 100644
--- a/sys/dev/adb/adb_buttons.c
+++ b/sys/dev/adb/adb_buttons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2011, Justin Hibbits.
* Copyright (c) 2002, Miodrag Vallat.
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 88399d54af7f..cd2a9a7b7635 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/adb/adb_mouse.c b/sys/dev/adb/adb_mouse.c
index 8b9e3fae7b63..9f9d81f1f545 100644
--- a/sys/dev/adb/adb_mouse.c
+++ b/sys/dev/adb/adb_mouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/adb/adbvar.h b/sys/dev/adb/adbvar.h
index 5f8184e102bb..47afb3554229 100644
--- a/sys/dev/adb/adbvar.h
+++ b/sys/dev/adb/adbvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index 10bb4058992d..4180f57ae380 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 2577aab97476..49644b26e818 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -20,8 +20,6 @@
* ** This board has been sold by SIIG as the i540 SpeedMaster.
* *** This board has been sold by SIIG as the i542 SpeedMaster.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, 1997 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index a33e5a106f04..8b4b3f5874cf 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -33,8 +33,6 @@
* * This board has been sold by SIIG as the Fast SCSI Pro PCI.
* ** This board has been sold by Iomega as a Jaz Jet PCI adapter.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 2ef987d45a2b..153c474d19f3 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -8,8 +8,6 @@
* ABP940UA, ABP950, ABP960, ABP960U, ABP960UA,
* ABP970, ABP970U
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996-2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index f7ee79459f61..04c7f0b30305 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -2,8 +2,6 @@
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. SCSI controllers
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index c8183233deb6..75d6884b9131 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -1,8 +1,6 @@
/*-
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-1997, 1999-2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index 3be4bb3a8ff3..6952ca960c92 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -2,8 +2,6 @@
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-1997, 1999-2000 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index fa76428a4fc6..f8fa3d0ce929 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -8,8 +8,6 @@
* ABP3940U2W - Bus-Master PCI LVD/Ultra2-Wide (253 CDB)
* ABP3950U2W - Bus-Master PCI LVD/Ultra2-Wide (253 CDB)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index cc7943fe7ff2..9485109f938c 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -6,8 +6,6 @@
*
* adw_pci.c ABP[3]940UW, ABP950UW, ABP3940U2W
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index c88580ca1af8..e201cdfa6513 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -2,8 +2,6 @@
* Low level routines for Second Generation
* Advanced Systems Inc. SCSI controllers chips
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 62977445363e..a73098539f2f 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -2,8 +2,6 @@
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998, 1999, 2000 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index 35af9a1f5f1d..4d760372596b 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -2,8 +2,6 @@
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. Second Generation SCSI controllers
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index 589a95e3be86..23ed1d89d3ef 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/ae/if_aereg.h b/sys/dev/ae/if_aereg.h
index c42da11f1e1b..4e0ae3bbe490 100644
--- a/sys/dev/ae/if_aereg.h
+++ b/sys/dev/ae/if_aereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/ae/if_aevar.h b/sys/dev/ae/if_aevar.h
index 030f3604dd16..a250fd2efa71 100644
--- a/sys/dev/ae/if_aevar.h
+++ b/sys/dev/ae/if_aevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index 59ac3bdedf2e..ff3b8c6a22db 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/age/if_agereg.h b/sys/dev/age/if_agereg.h
index b49c28aac05e..284e5a4ee65d 100644
--- a/sys/dev/age/if_agereg.h
+++ b/sys/dev/age/if_agereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/age/if_agevar.h b/sys/dev/age/if_agevar.h
index 3a4b97b95334..14792726ca1a 100644
--- a/sys/dev/age/if_agevar.h
+++ b/sys/dev/age/if_agevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 208cb395118e..47c0aaa046ce 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index 01c45df7a663..f44cc89d61c9 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index d80ed1783488..a39dec5bec85 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c
index b8c08b6ba106..f18a6a55446c 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004, 2005 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_apple.c b/sys/dev/agp/agp_apple.c
index 755fba53bf36..cc3723b321d6 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c
index ee31fdbb4cee..eaf0efa80f97 100644
--- a/sys/dev/agp/agp_ati.c
+++ b/sys/dev/agp/agp_ati.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Eric Anholt
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 3057cb850dd8..bd42da87017b 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* Copyright (c) 2000 Ruslan Ermilov
* Copyright (c) 2011 The FreeBSD Foundation
diff --git a/sys/dev/agp/agp_i810.h b/sys/dev/agp/agp_i810.h
index 211675c4a67d..1df5e78a162c 100644
--- a/sys/dev/agp/agp_i810.h
+++ b/sys/dev/agp/agp_i810.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index 226e2f5a6f34..719758034ce1 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c
index 40b999490d9f..61ae551d5ef1 100644
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index 06e57e9885b5..91620de16d28 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index c0f35b4d1042..8b054fecac85 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agppriv.h b/sys/dev/agp/agppriv.h
index f6fa3c5526bd..2436af29d57a 100644
--- a/sys/dev/agp/agppriv.h
+++ b/sys/dev/agp/agppriv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agpreg.h b/sys/dev/agp/agpreg.h
index 3a0abfeccd04..3f473da67e03 100644
--- a/sys/dev/agp/agpreg.h
+++ b/sys/dev/agp/agpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/agp/agpvar.h b/sys/dev/agp/agpvar.h
index c3c901dcf537..2c2c87a08713 100644
--- a/sys/dev/agp/agpvar.h
+++ b/sys/dev/agp/agpvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 4b551a2f4a94..8fe82a43d8ca 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -1,4 +1,4 @@
-/*-
+/*
* Generic register and struct definitions for the Adaptech 154x/164x
* SCSI host adapters. Product specific probe and attach routines can
* be found in:
@@ -6,8 +6,6 @@
* aha 1640 aha_mca.c
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 M. Warner Losh.
* All Rights Reserved.
*
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 0ada1c7a5a52..db6fa0c3fc3b 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -3,8 +3,6 @@
* Adaptec 154x.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2003 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 3029f24d7bdc..5c0f4cae9988 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Generic register and struct definitions for the Adaptech 1540, 1542,
* 1640, 1642 SCSI host adapters. Product specific probe and attach
* routines can be found in:
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 45920b11c191..6ef9c5ed2443 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index bb41a820cee9..07e78a5caafd 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c
index 9bb4d9717763..e049297b82d9 100644
--- a/sys/dev/ahci/ahciem.c
+++ b/sys/dev/ahci/ahciem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index ffb72627d6a3..30a7d69a385d 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 88187f21fbd7..53962aed9d35 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Charles Hannum.
* Copyright (c) 1994 Jarle Greipsland.
* All rights reserved.
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index 3258269acded..5d4b08b65f2e 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 5caf36da818e..c16c90ec67d6 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index 62eba734507b..078d74838132 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index fd0592829079..e655b6fc53b3 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -1,8 +1,6 @@
/*-
* FreeBSD, VLB/ISA product support functions
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index 5e255ff22c8c..a5efb0b9dbfe 100644
--- a/sys/dev/aic7xxx/aic7770.c
+++ b/sys/dev/aic7xxx/aic7770.c
@@ -2,8 +2,6 @@
* Product specific probe and attach routines for:
* 27/284X and aic7770 motherboard SCSI controllers
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-1998, 2000, 2001 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index cb469e21d7b2..958876a53277 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -1,8 +1,6 @@
/*-
* Core routines and tables shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2002, 2004 Justin T. Gibbs.
* Copyright (c) 2000-2003 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index 38b152ef4051..93811ef20240 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -1,8 +1,6 @@
/*-
* Core definitions and data structures shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2002 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 61720d9c3893..96acb83d7b25 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.h
@@ -1,8 +1,6 @@
/*-
* Inline routines shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2003 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index 61431c27ee79..439e043a6898 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -2,8 +2,6 @@
* Product specific probe and attach routines for:
* aic7901 and aic7902 SCSI controllers
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 7a21818ac9c2..ec4908b14ebb 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -1,8 +1,6 @@
/*-
* Core routines and tables shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2002 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 133f8a0a92ae..a673bb599cbc 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -1,8 +1,6 @@
/*-
* Core definitions and data structures shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 4494f48ae962..3827015edcbb 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -3,8 +3,6 @@
* settings for the aic7xxx based adaptec SCSI controllers. It can
* also be used for 93C26 and 93C06 serial EEPROMS.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994, 1995, 2000 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h
index d495fc4c601c..256caebff90c 100644
--- a/sys/dev/aic7xxx/aic7xxx_inline.h
+++ b/sys/dev/aic7xxx/aic7xxx_inline.h
@@ -1,8 +1,6 @@
/*-
* Inline routines shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index f46dab180710..ce941c79983c 100644
--- a/sys/dev/aic7xxx/aic7xxx_pci.c
+++ b/sys/dev/aic7xxx/aic7xxx_pci.c
@@ -3,8 +3,6 @@
* 3940, 2940, aic7895, aic7890, aic7880,
* aic7870, aic7860 and aic7850 SCSI controllers
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 776b5bfa583a..6a788023a2df 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -1,8 +1,6 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 705c22f77f8b..0cc1c2b7afcb 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -1,8 +1,6 @@
/*-
* Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index c479c8fdf2db..87fe1a25bf0a 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -2,8 +2,6 @@
/*-
* Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index b994ff67edb6..820310b469cd 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
@@ -2,8 +2,6 @@
* Instruction formats for the sequencer program downloaded to
* Aic7xxx SCSI host adapters
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
index e5ac7603a735..923cd5d6d234 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -3,8 +3,6 @@
* Sub-parser for macro invocation in the Aic7xxx SCSI
* Host adapter sequencer assembler.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
index cabed636d66f..03fb6b4929ca 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -3,8 +3,6 @@
* Sub-Lexical Analyzer for macro invokation in
* the Aic7xxx SCSI Host adapter sequencer assembler.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 5198fa74d77c..45da98f139dd 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -2,8 +2,6 @@
/*-
* Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index c6c65b2202f6..273621f79132 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -1,8 +1,6 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 616dfd28fdeb..3242152c943b 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -1,8 +1,6 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index af10c1abc138..ca7ae9d17b54 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/alc/if_alcreg.h b/sys/dev/alc/if_alcreg.h
index 3b4ee133b01a..29d877da9fb4 100644
--- a/sys/dev/alc/if_alcreg.h
+++ b/sys/dev/alc/if_alcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/alc/if_alcvar.h b/sys/dev/alc/if_alcvar.h
index 8dea20196dae..a1c3382f015a 100644
--- a/sys/dev/alc/if_alcvar.h
+++ b/sys/dev/alc/if_alcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
index 7d3291c4e551..e7d030636cab 100644
--- a/sys/dev/ale/if_ale.c
+++ b/sys/dev/ale/if_ale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ale/if_alereg.h b/sys/dev/ale/if_alereg.h
index e5727377a5e7..5804c53724a2 100644
--- a/sys/dev/ale/if_alereg.h
+++ b/sys/dev/ale/if_alereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ale/if_alevar.h b/sys/dev/ale/if_alevar.h
index 628a67b5623a..8995c693f8b0 100644
--- a/sys/dev/ale/if_alevar.h
+++ b/sys/dev/ale/if_alevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/altera/atse/a_api.h b/sys/dev/altera/atse/a_api.h
index 4cb2a81903c0..4bd380df6377 100644
--- a/sys/dev/altera/atse/a_api.h
+++ b/sys/dev/altera/atse/a_api.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
*
diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
index 68771ca53e97..f5a461b0afc3 100644
--- a/sys/dev/altera/atse/if_atse.c
+++ b/sys/dev/altera/atse/if_atse.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012, 2013 Bjoern A. Zeeb
+ * Copyright (c) 2012,2013 Bjoern A. Zeeb
* Copyright (c) 2014 Robert N. M. Watson
* All rights reserved.
*
@@ -137,7 +135,6 @@ a_onchip_fifo_mem_core_write(struct resource *res, uint32_t off,
DPRINTF("[%s:%d] FIFOW %s 0x%08x = 0x%08x\n", f, l, desc, off, val4);
bus_write_4(res, off, val4);
}
-
static inline uint32_t
a_onchip_fifo_mem_core_read(struct resource *res, uint32_t off,
const char *desc, const char *f, const int l)
@@ -146,7 +143,6 @@ a_onchip_fifo_mem_core_read(struct resource *res, uint32_t off,
val4 = le32toh(bus_read_4(res, off));
DPRINTF("[%s:%d] FIFOR %s 0x%08x = 0x%08x\n", f, l, desc, off, val4);
-
return (val4);
}
@@ -289,7 +285,6 @@ csr_read_4(struct atse_softc *sc, uint32_t reg, const char *f, const int l)
val4 = le32toh(bus_read_4(sc->atse_mem_res, reg * 4));
DPRINTF("[%s:%d] CSR R %s 0x%08x (0x%08x) = 0x%08x\n", f, l,
"atse_mem_res", reg, reg * 4, val4);
-
return (val4);
}
@@ -320,7 +315,6 @@ pxx_read_2(struct atse_softc *sc, bus_addr_t bmcr, uint32_t reg, const char *f,
val = le32toh(val4) & 0x0000ffff;
DPRINTF("[%s:%d] %s R %s 0x%08x (0x%08jx) = 0x%04x\n", f, l, s,
"atse_mem_res", reg, (bmcr + reg) * 4, val);
-
return (val);
}
@@ -349,7 +343,6 @@ atse_tx_locked(struct atse_softc *sc, int *sent)
{
struct mbuf *m;
uint32_t val4, fill_level;
- int leftm;
int c;
ATSE_LOCK_ASSERT(sc);
@@ -400,13 +393,15 @@ atse_tx_locked(struct atse_softc *sc, int *sent)
/* Set EOP *before* writing the last symbol. */
if (sc->atse_tx_m_offset >= (sc->atse_tx_buf_len - 4) &&
fill_level < AVALON_FIFO_TX_BASIC_OPTS_DEPTH) {
+ int leftm;
+ uint32_t x;
/* Set EndOfPacket. */
val4 = A_ONCHIP_FIFO_MEM_CORE_EOP;
-
/* Set EMPTY. */
leftm = sc->atse_tx_buf_len - sc->atse_tx_m_offset;
val4 |= ((4 - leftm) << A_ONCHIP_FIFO_MEM_CORE_EMPTY_SHIFT);
+ x = val4;
ATSE_TX_META_WRITE(sc, val4);
/* Write last symbol. */
@@ -445,7 +440,7 @@ atse_start_locked(struct ifnet *ifp)
return;
#if 1
- /*
+ /*
* Disable the watchdog while sending, we are batching packets.
* Though we should never reach 5 seconds, and are holding the lock,
* but who knows.
@@ -490,8 +485,8 @@ atse_start(struct ifnet *ifp)
static int
atse_stop_locked(struct atse_softc *sc)
{
- uint32_t mask, val4;
struct ifnet *ifp;
+ uint32_t mask, val4;
int i;
ATSE_LOCK_ASSERT(sc);
@@ -532,8 +527,8 @@ atse_stop_locked(struct atse_softc *sc)
static uint8_t
atse_mchash(struct atse_softc *sc __unused, const uint8_t *addr)
{
- uint8_t x, y;
int i, j;
+ uint8_t x, y;
x = 0;
for (i = 0; i < ETHER_ADDR_LEN; i++) {
@@ -542,15 +537,14 @@ atse_mchash(struct atse_softc *sc __unused, const uint8_t *addr)
y ^= (addr[i] >> j) & 0x01;
x |= (y << i);
}
-
return (x);
}
static int
atse_rxfilter_locked(struct atse_softc *sc)
{
- struct ifmultiaddr *ifma;
struct ifnet *ifp;
+ struct ifmultiaddr *ifma;
uint32_t val4;
int i;
@@ -573,7 +567,7 @@ atse_rxfilter_locked(struct atse_softc *sc)
for (i = 0; i <= MHASH_LEN; i++)
CSR_WRITE_4(sc, MHASH_START + i, 0x1);
} else {
- /*
+ /*
* Can hold MHASH_LEN entries.
* XXX-BZ bitstring.h would be more general.
*/
@@ -640,9 +634,8 @@ atse_ethernet_option_bits_read(device_t dev)
error = atse_ethernet_option_bits_read_fdt(dev);
if (error == 0)
return (0);
-
+
device_printf(dev, "Cannot read Ethernet addresses from flash.\n");
-
return (error);
}
@@ -796,9 +789,9 @@ atse_set_eth_address(struct atse_softc *sc, int n)
static int
atse_reset(struct atse_softc *sc)
{
+ int i;
uint32_t val4, mask;
uint16_t val;
- int i;
/* 1. External PHY Initialization using MDIO. */
/*
@@ -827,7 +820,6 @@ atse_reset(struct atse_softc *sc)
val = PCS_READ_2(sc, PCS_CONTROL);
val |= PCS_CONTROL_RESET;
PCS_WRITE_2(sc, PCS_CONTROL, val);
-
/* Wait for reset bit to clear; i=100 is excessive. */
for (i = 0; i < 100; i++) {
val = PCS_READ_2(sc, PCS_CONTROL);
@@ -835,7 +827,6 @@ atse_reset(struct atse_softc *sc)
break;
DELAY(10);
}
-
if ((val & PCS_CONTROL_RESET) != 0) {
device_printf(sc->atse_dev, "PCS reset timed out.\n");
return (ENXIO);
@@ -886,7 +877,7 @@ atse_reset(struct atse_softc *sc)
CSR_WRITE_4(sc, BASE_CFG_PAUSE_QUANT, 0xFFFF);
val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
- /*
+ /*
* If 1000BASE-X/SGMII PCS is initialized, set the ETH_SPEED (bit 3)
* and ENA_10 (bit 25) in command_config register to 0. If half duplex
* is reported in the PHY/PCS status register, set the HD_ENA (bit 10)
@@ -945,7 +936,7 @@ atse_reset(struct atse_softc *sc)
device_printf(sc->atse_dev, "MAC reset timed out.\n");
return (ENXIO);
}
-
+
/* f. Enable MAC transmit and receive datapath. */
mask = BASE_CFG_COMMAND_CONFIG_TX_ENA|BASE_CFG_COMMAND_CONFIG_RX_ENA;
val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
@@ -1001,7 +992,7 @@ atse_init_locked(struct atse_softc *sc)
sc->atse_flags &= ATSE_FLAGS_LINK; /* Preserve. */
#ifdef DEVICE_POLLING
- /* Only enable interrupts if we are not polling. */
+ /* Only enable interrupts if we are not polling. */
if (ifp->if_capenable & IFCAP_POLLING) {
ATSE_RX_INTR_DISABLE(sc);
ATSE_TX_INTR_DISABLE(sc);
@@ -1048,6 +1039,7 @@ atse_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
struct ifreq *ifr;
int error, mask;
+
error = 0;
sc = ifp->if_softc;
ifr = (struct ifreq *)data;
@@ -1064,7 +1056,7 @@ atse_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
atse_init_locked(sc);
} else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
atse_stop_locked(sc);
- sc->atse_if_flags = ifp->if_flags;
+ sc->atse_if_flags = ifp->if_flags;
ATSE_UNLOCK(sc);
break;
case SIOCSIFCAP:
@@ -1201,7 +1193,7 @@ atse_tick(void *xsc)
/*
* Set media options.
*/
-static int
+static int
atse_ifmedia_upd(struct ifnet *ifp)
{
struct atse_softc *sc;
@@ -1235,16 +1227,15 @@ atse_update_rx_err(struct atse_softc *sc, uint32_t mask)
static int
atse_rx_locked(struct atse_softc *sc)
{
- uint32_t fill, i, j;
- uint32_t data, meta;
struct ifnet *ifp;
struct mbuf *m;
- int rx_npkts;
+ uint32_t fill, i, j;
+ uint32_t data, meta;
+ int rx_npkts = 0;
ATSE_LOCK_ASSERT(sc);
ifp = sc->atse_ifp;
- rx_npkts = 0;
j = 0;
meta = 0;
do {
@@ -1303,7 +1294,7 @@ outer:
/* XXX-BZ any better counter? */
if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
}
-
+
if ((sc->atse_flags & ATSE_FLAGS_SOP_SEEN) == 0)
{
sc->atse_flags |= ATSE_FLAGS_SOP_SEEN;
@@ -1412,7 +1403,7 @@ atse_rx_intr(void *arg)
if (ifp->if_capenable & IFCAP_POLLING) {
ATSE_UNLOCK(sc);
return;
- }
+ }
#endif
atse_intr_debug(sc, "rx");
@@ -1469,7 +1460,7 @@ atse_tx_intr(void *arg)
if (ifp->if_capenable & IFCAP_POLLING) {
ATSE_UNLOCK(sc);
return;
- }
+ }
#endif
/* XXX-BZ build histogram. */
@@ -1517,7 +1508,7 @@ atse_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
ATSE_LOCK(sc);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
ATSE_UNLOCK(sc);
- return (rx_npkts);
+ return (rx_npkts);
}
sc->atse_rx_cycles = count;
@@ -1667,9 +1658,9 @@ static int
sysctl_atse_mac_stats_proc(SYSCTL_HANDLER_ARGS)
{
struct atse_softc *sc;
- int error, offset, s;
+ int error, offset, s;
- sc = arg1;
+ sc = arg1;
offset = arg2;
s = CSR_READ_4(sc, offset);
@@ -1677,7 +1668,7 @@ sysctl_atse_mac_stats_proc(SYSCTL_HANDLER_ARGS)
if (error || !req->newptr)
return (error);
- return (0);
+ return (0);
}
static struct atse_rx_err_stats_regs {
@@ -1685,12 +1676,12 @@ static struct atse_rx_err_stats_regs {
const char *descr;
} atse_rx_err_stats_regs[] = {
-#define ATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on EOP. */
-#define ATSE_RX_ERR_ELEN 1 /* Frame/payload length not valid. */
-#define ATSE_RX_ERR_CRC32 2 /* CRC-32 error. */
-#define ATSE_RX_ERR_FIFO_THRES_TRUNC 3 /* FIFO thresh., truncated frame. */
-#define ATSE_RX_ERR_4 4 /* ? */
-#define ATSE_RX_ERR_5 5 /* / */
+#define ATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on EOP. */
+#define ATSE_RX_ERR_ELEN 1 /* Frame/payload length not valid. */
+#define ATSE_RX_ERR_CRC32 2 /* CRC-32 error. */
+#define ATSE_RX_ERR_FIFO_THRES_TRUNC 3 /* FIFO thresh., truncated frame. */
+#define ATSE_RX_ERR_4 4 /* ? */
+#define ATSE_RX_ERR_5 5 /* / */
{ "rx_err_fifo_thres_eop",
"FIFO threshold reached, reported on EOP." },
@@ -1710,9 +1701,9 @@ static int
sysctl_atse_rx_err_stats_proc(SYSCTL_HANDLER_ARGS)
{
struct atse_softc *sc;
- int error, offset, s;
+ int error, offset, s;
- sc = arg1;
+ sc = arg1;
offset = arg2;
s = sc->atse_rx_err[offset];
@@ -1720,7 +1711,7 @@ sysctl_atse_rx_err_stats_proc(SYSCTL_HANDLER_ARGS)
if (error || !req->newptr)
return (error);
- return (0);
+ return (0);
}
static void
@@ -1732,8 +1723,8 @@ atse_sysctl_stats_attach(device_t dev)
int i;
sc = device_get_softc(dev);
- sctx = device_get_sysctl_ctx(dev);
- soid = device_get_sysctl_tree(dev);
+ sctx = device_get_sysctl_ctx(dev);
+ soid = device_get_sysctl_tree(dev);
/* MAC statistics. */
for (i = 0; i < nitems(atse_mac_stats_regs); i++) {
@@ -2043,11 +2034,11 @@ atse_miibus_statchg(device_t dev)
sc = device_get_softc(dev);
ATSE_LOCK_ASSERT(sc);
- mii = device_get_softc(sc->atse_miibus);
- ifp = sc->atse_ifp;
- if (mii == NULL || ifp == NULL ||
- (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
- return;
+ mii = device_get_softc(sc->atse_miibus);
+ ifp = sc->atse_ifp;
+ if (mii == NULL || ifp == NULL ||
+ (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+ return;
val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
@@ -2078,14 +2069,14 @@ atse_miibus_statchg(device_t dev)
}
}
- if ((sc->atse_flags & ATSE_FLAGS_LINK) == 0) {
+ if ((sc->atse_flags & ATSE_FLAGS_LINK) == 0) {
/* XXX-BZ need to stop the MAC? */
- return;
- }
+ return;
+ }
if (IFM_OPTIONS(mii->mii_media_active & IFM_FDX) != 0)
val4 &= ~BASE_CFG_COMMAND_CONFIG_HD_ENA;
- else
+ else
val4 |= BASE_CFG_COMMAND_CONFIG_HD_ENA;
/* XXX-BZ flow control? */
diff --git a/sys/dev/altera/atse/if_atse_fdt.c b/sys/dev/altera/atse/if_atse_fdt.c
index 83a7b9d71c29..64d5b290b114 100644
--- a/sys/dev/altera/atse/if_atse_fdt.c
+++ b/sys/dev/altera/atse/if_atse_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Bjoern A. Zeeb
* All rights reserved.
*
diff --git a/sys/dev/altera/atse/if_atse_nexus.c b/sys/dev/altera/atse/if_atse_nexus.c
index 9d54d05a68a1..f52f448b53ff 100644
--- a/sys/dev/altera/atse/if_atse_nexus.c
+++ b/sys/dev/altera/atse/if_atse_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012,2013 Bjoern A. Zeeb
* All rights reserved.
*
diff --git a/sys/dev/altera/atse/if_atsereg.h b/sys/dev/altera/atse/if_atsereg.h
index 4998acc5fe4c..8caba4f34ce2 100644
--- a/sys/dev/altera/atse/if_atsereg.h
+++ b/sys/dev/altera/atse/if_atsereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
*
diff --git a/sys/dev/altera/avgen/altera_avgen.c b/sys/dev/altera/avgen/altera_avgen.c
index 88b441cc8b16..f880e8608dcd 100644
--- a/sys/dev/altera/avgen/altera_avgen.c
+++ b/sys/dev/altera/avgen/altera_avgen.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012-2013, 2016 Robert N. M. Watson
+ * Copyright (c) 2012-2013 Robert N. M. Watson
* All rights reserved.
*
* This software was developed by SRI International and the University of
@@ -34,7 +32,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/conf.h>
@@ -48,8 +45,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/uio.h>
-#include <geom/geom_disk.h>
-
#include <machine/bus.h>
#include <machine/resource.h>
@@ -70,19 +65,14 @@ static d_mmap_t altera_avgen_mmap;
static d_read_t altera_avgen_read;
static d_write_t altera_avgen_write;
-#define ALTERA_AVGEN_DEVNAME "altera_avgen"
-#define ALTERA_AVGEN_DEVNAME_FMT (ALTERA_AVGEN_DEVNAME "%d")
-
static struct cdevsw avg_cdevsw = {
.d_version = D_VERSION,
.d_mmap = altera_avgen_mmap,
.d_read = altera_avgen_read,
.d_write = altera_avgen_write,
- .d_name = ALTERA_AVGEN_DEVNAME,
+ .d_name = "altera_avgen",
};
-#define ALTERA_AVGEN_SECTORSIZE 512 /* Not configurable at this time. */
-
static int
altera_avgen_read(struct cdev *dev, struct uio *uio, int flag)
{
@@ -237,103 +227,11 @@ altera_avgen_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
return (0);
}
-/*
- * NB: We serialise block reads and writes in case the OS is generating
- * concurrent I/O against the same block, in which case we want one I/O (or
- * another) to win. This is not sufficient to provide atomicity for the
- * sector in the presence of a fail stop -- however, we're just writing this
- * to non-persistent DRAM .. right?
- */
-static void
-altera_avgen_disk_strategy(struct bio *bp)
-{
- struct altera_avgen_softc *sc;
- void *data;
- long bcount;
- daddr_t pblkno;
-
- sc = bp->bio_disk->d_drv1;
- data = bp->bio_data;
- bcount = bp->bio_bcount;
- pblkno = bp->bio_pblkno;
-
- /*
- * Serialize block reads / writes.
- */
- mtx_lock(&sc->avg_disk_mtx);
- switch (bp->bio_cmd) {
- case BIO_READ:
- if (!(sc->avg_flags & ALTERA_AVALON_FLAG_GEOM_READ)) {
- biofinish(bp, NULL, EIO);
- break;
- }
- switch (sc->avg_width) {
- case 1:
- bus_read_region_1(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint8_t *)data, bcount);
- break;
-
- case 2:
- bus_read_region_2(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint16_t *)data, bcount / 2);
- break;
-
- case 4:
- bus_read_region_4(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint32_t *)data, bcount / 4);
- break;
-
- default:
- panic("%s: unexpected width %u", __func__,
- sc->avg_width);
- }
- break;
-
- case BIO_WRITE:
- if (!(sc->avg_flags & ALTERA_AVALON_FLAG_GEOM_WRITE)) {
- biofinish(bp, NULL, EROFS);
- break;
- }
- switch (sc->avg_width) {
- case 1:
- bus_write_region_1(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint8_t *)data, bcount);
- break;
-
- case 2:
- bus_write_region_2(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint16_t *)data, bcount / 2);
- break;
-
- case 4:
- bus_write_region_4(sc->avg_res,
- bp->bio_pblkno * ALTERA_AVGEN_SECTORSIZE,
- (uint32_t *)data, bcount / 4);
- break;
-
- default:
- panic("%s: unexpected width %u", __func__,
- sc->avg_width);
- }
- break;
-
- default:
- panic("%s: unsupported I/O operation %d", __func__,
- bp->bio_cmd);
- }
- mtx_unlock(&sc->avg_disk_mtx);
- biofinish(bp, NULL, 0);
-}
static int
altera_avgen_process_options(struct altera_avgen_softc *sc,
- const char *str_fileio, const char *str_geomio, const char *str_mmapio,
- const char *str_devname, int devunit)
+ const char *str_fileio, const char *str_mmapio, const char *str_devname,
+ int devunit)
{
const char *cp;
device_t dev = sc->avg_dev;
@@ -341,30 +239,12 @@ altera_avgen_process_options(struct altera_avgen_softc *sc,
/*
* Check for valid combinations of options.
*/
- if (str_fileio == NULL && str_geomio == NULL && str_mmapio == NULL) {
- device_printf(dev,
- "at least one of %s, %s, or %s must be specified\n",
- ALTERA_AVALON_STR_FILEIO, ALTERA_AVALON_STR_GEOMIO,
- ALTERA_AVALON_STR_MMAPIO);
- return (ENXIO);
- }
-
- /*
- * Validity check: a device can either be a GEOM device (in which case
- * we use GEOM to register the device node), or a special device --
- * but not both as that causes a collision in /dev.
- */
- if (str_geomio != NULL && (str_fileio != NULL || str_mmapio != NULL)) {
+ if (str_fileio == NULL && str_mmapio == NULL) {
device_printf(dev,
- "at most one of %s and (%s or %s) may be specified\n",
- ALTERA_AVALON_STR_GEOMIO, ALTERA_AVALON_STR_FILEIO,
- ALTERA_AVALON_STR_MMAPIO);
+ "at least one of %s or %s must be specified\n",
+ ALTERA_AVALON_STR_FILEIO, ALTERA_AVALON_STR_MMAPIO);
return (ENXIO);
}
-
- /*
- * Ensure that a unit is specified if a name is also specified.
- */
if (str_devname == NULL && devunit != -1) {
device_printf(dev, "%s requires %s be specified\n",
ALTERA_AVALON_STR_DEVUNIT, ALTERA_AVALON_STR_DEVNAME);
@@ -408,25 +288,6 @@ altera_avgen_process_options(struct altera_avgen_softc *sc,
}
}
}
- if (str_geomio != NULL) {
- for (cp = str_geomio; *cp != '\0'; cp++){
- switch (*cp) {
- case ALTERA_AVALON_CHAR_READ:
- sc->avg_flags |= ALTERA_AVALON_FLAG_GEOM_READ;
- break;
-
- case ALTERA_AVALON_CHAR_WRITE:
- sc->avg_flags |= ALTERA_AVALON_FLAG_GEOM_WRITE;
- break;
-
- default:
- device_printf(dev,
- "invalid %s character %c\n",
- ALTERA_AVALON_STR_GEOMIO, *cp);
- return (ENXIO);
- }
- }
- }
if (str_mmapio != NULL) {
for (cp = str_mmapio; *cp != '\0'; cp++) {
switch (*cp) {
@@ -456,14 +317,13 @@ altera_avgen_process_options(struct altera_avgen_softc *sc,
int
altera_avgen_attach(struct altera_avgen_softc *sc, const char *str_fileio,
- const char *str_geomio, const char *str_mmapio, const char *str_devname,
- int devunit)
+ const char *str_mmapio, const char *str_devname, int devunit)
{
device_t dev = sc->avg_dev;
int error;
- error = altera_avgen_process_options(sc, str_fileio, str_geomio,
- str_mmapio, str_devname, devunit);
+ error = altera_avgen_process_options(sc, str_fileio, str_mmapio,
+ str_devname, devunit);
if (error)
return (error);
@@ -479,59 +339,23 @@ altera_avgen_attach(struct altera_avgen_softc *sc, const char *str_fileio,
}
}
- /*
- * If a GEOM permission is requested, then create the device via GEOM.
- * Otherwise, create a special device. We checked during options
- * processing that both weren't requested a once.
- */
- if (str_devname != NULL) {
- sc->avg_name = strdup(str_devname, M_TEMP);
+ /* Device node allocation. */
+ if (str_devname == NULL) {
+ str_devname = "altera_avgen%d";
devunit = sc->avg_unit;
- } else
- sc->avg_name = strdup(ALTERA_AVGEN_DEVNAME, M_TEMP);
- if (sc->avg_flags & (ALTERA_AVALON_FLAG_GEOM_READ |
- ALTERA_AVALON_FLAG_GEOM_WRITE)) {
- mtx_init(&sc->avg_disk_mtx, "altera_avgen_disk", NULL,
- MTX_DEF);
- sc->avg_disk = disk_alloc();
- sc->avg_disk->d_drv1 = sc;
- sc->avg_disk->d_strategy = altera_avgen_disk_strategy;
- if (devunit == -1)
- devunit = 0;
- sc->avg_disk->d_name = sc->avg_name;
- sc->avg_disk->d_unit = devunit;
-
- /*
- * NB: As avg_res is a multiple of PAGE_SIZE, it is also a
- * multiple of ALTERA_AVGEN_SECTORSIZE.
- */
- sc->avg_disk->d_sectorsize = ALTERA_AVGEN_SECTORSIZE;
- sc->avg_disk->d_mediasize = rman_get_size(sc->avg_res);
- sc->avg_disk->d_maxsize = ALTERA_AVGEN_SECTORSIZE;
- disk_create(sc->avg_disk, DISK_VERSION);
- } else {
- /* Device node allocation. */
- if (str_devname == NULL) {
- str_devname = ALTERA_AVGEN_DEVNAME_FMT;
- devunit = sc->avg_unit;
- }
- if (devunit != -1)
- sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit,
- UID_ROOT, GID_WHEEL, S_IRUSR | S_IWUSR, "%s%d",
- str_devname, devunit);
- else
- sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit,
- UID_ROOT, GID_WHEEL, S_IRUSR | S_IWUSR,
- "%s", str_devname);
- if (sc->avg_cdev == NULL) {
- device_printf(sc->avg_dev, "%s: make_dev failed\n",
- __func__);
- return (ENXIO);
- }
-
- /* XXXRW: Slight race between make_dev(9) and here. */
- sc->avg_cdev->si_drv1 = sc;
}
+ if (devunit != -1)
+ sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT,
+ GID_WHEEL, S_IRUSR | S_IWUSR, str_devname, devunit);
+ else
+ sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT,
+ GID_WHEEL, S_IRUSR | S_IWUSR, str_devname);
+ if (sc->avg_cdev == NULL) {
+ device_printf(sc->avg_dev, "%s: make_dev failed\n", __func__);
+ return (ENXIO);
+ }
+ /* XXXRW: Slight race between make_dev(9) and here. */
+ sc->avg_cdev->si_drv1 = sc;
return (0);
}
@@ -539,15 +363,5 @@ void
altera_avgen_detach(struct altera_avgen_softc *sc)
{
- KASSERT((sc->avg_disk != NULL) || (sc->avg_cdev != NULL),
- ("%s: neither GEOM nor special device", __func__));
-
- if (sc->avg_disk != NULL) {
- disk_gone(sc->avg_disk);
- disk_destroy(sc->avg_disk);
- free(sc->avg_name, M_TEMP);
- mtx_destroy(&sc->avg_disk_mtx);
- } else {
- destroy_dev(sc->avg_cdev);
- }
+ destroy_dev(sc->avg_cdev);
}
diff --git a/sys/dev/altera/avgen/altera_avgen.h b/sys/dev/altera/avgen/altera_avgen.h
index 12496911f7c1..fb25a3cc276b 100644
--- a/sys/dev/altera/avgen/altera_avgen.h
+++ b/sys/dev/altera/avgen/altera_avgen.h
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012, 2016 Robert N. M. Watson
+ * Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
* This software was developed by SRI International and the University of
@@ -41,7 +39,6 @@ struct altera_avgen_softc {
*/
device_t avg_dev;
int avg_unit;
- char *avg_name;
/*
* The device node and memory-mapped I/O region.
@@ -55,13 +52,6 @@ struct altera_avgen_softc {
*/
u_int avg_flags;
u_int avg_width;
- u_int avg_sectorsize;
-
- /*
- * disk(9) state, if required for this device.
- */
- struct disk *avg_disk;
- struct mtx avg_disk_mtx;
};
/*
@@ -73,8 +63,6 @@ struct altera_avgen_softc {
#define ALTERA_AVALON_FLAG_MMAP_READ 0x04
#define ALTERA_AVALON_FLAG_MMAP_WRITE 0x08
#define ALTERA_AVALON_FLAG_MMAP_EXEC 0x10
-#define ALTERA_AVALON_FLAG_GEOM_READ 0x20
-#define ALTERA_AVALON_FLAG_GEOM_WRITE 0x40
#define ALTERA_AVALON_CHAR_READ 'r'
#define ALTERA_AVALON_CHAR_WRITE 'w'
@@ -82,7 +70,6 @@ struct altera_avgen_softc {
#define ALTERA_AVALON_STR_WIDTH "width"
#define ALTERA_AVALON_STR_FILEIO "fileio"
-#define ALTERA_AVALON_STR_GEOMIO "geomio"
#define ALTERA_AVALON_STR_MMAPIO "mmapio"
#define ALTERA_AVALON_STR_DEVNAME "devname"
#define ALTERA_AVALON_STR_DEVUNIT "devunit"
@@ -91,8 +78,8 @@ struct altera_avgen_softc {
* Driver setup routines from the bus attachment/teardown.
*/
int altera_avgen_attach(struct altera_avgen_softc *sc,
- const char *str_fileio, const char *str_geomio,
- const char *str_mmapio, const char *str_devname, int devunit);
+ const char *str_fileio, const char *str_mmapio,
+ const char *str_devname, int devunit);
void altera_avgen_detach(struct altera_avgen_softc *sc);
extern devclass_t altera_avgen_devclass;
diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c
index 12a31d4e384c..79e07eae1e53 100644
--- a/sys/dev/altera/avgen/altera_avgen_fdt.c
+++ b/sys/dev/altera/avgen/altera_avgen_fdt.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012-2013, 2016 Robert N. M. Watson
+ * Copyright (c) 2012-2013 Robert N. M. Watson
* All rights reserved.
*
* This software was developed by SRI International and the University of
@@ -77,7 +75,7 @@ static int
altera_avgen_fdt_attach(device_t dev)
{
struct altera_avgen_softc *sc;
- char *str_fileio, *str_geomio, *str_mmapio;
+ char *str_fileio, *str_mmapio;
char *str_devname;
phandle_t node;
pcell_t cell;
@@ -92,7 +90,6 @@ altera_avgen_fdt_attach(device_t dev)
* expose the device via /dev.
*/
str_fileio = NULL;
- str_geomio = NULL;
str_mmapio = NULL;
str_devname = NULL;
devunit = -1;
@@ -102,8 +99,6 @@ altera_avgen_fdt_attach(device_t dev)
sc->avg_width = cell;
(void)OF_getprop_alloc(node, "sri-cambridge,fileio", sizeof(char),
(void **)&str_fileio);
- (void)OF_getprop_alloc(node, "sri-cambridge,geomio", sizeof(char),
- (void **)&str_geomio);
(void)OF_getprop_alloc(node, "sri-cambridge,mmapio", sizeof(char),
(void **)&str_mmapio);
(void)OF_getprop_alloc(node, "sri-cambridge,devname", sizeof(char),
@@ -119,15 +114,13 @@ altera_avgen_fdt_attach(device_t dev)
device_printf(dev, "couldn't map memory\n");
return (ENXIO);
}
- error = altera_avgen_attach(sc, str_fileio, str_geomio, str_mmapio,
- str_devname, devunit);
+ error = altera_avgen_attach(sc, str_fileio, str_mmapio, str_devname,
+ devunit);
if (error != 0)
bus_release_resource(dev, SYS_RES_MEMORY, sc->avg_rid,
sc->avg_res);
if (str_fileio != NULL)
OF_prop_free(str_fileio);
- if (str_geomio != NULL)
- OF_prop_free(str_geomio);
if (str_mmapio != NULL)
OF_prop_free(str_mmapio);
if (str_devname != NULL)
diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c
index edce8488cfeb..c3daab736623 100644
--- a/sys/dev/altera/avgen/altera_avgen_nexus.c
+++ b/sys/dev/altera/avgen/altera_avgen_nexus.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012-2013, 2016 Robert N. M. Watson
+ * Copyright (c) 2012-2013 Robert N. M. Watson
* All rights reserved.
*
* This software was developed by SRI International and the University of
@@ -66,7 +64,7 @@ static int
altera_avgen_nexus_attach(device_t dev)
{
struct altera_avgen_softc *sc;
- const char *str_fileio, *str_geomio, *str_mmapio;
+ const char *str_fileio, *str_mmapio;
const char *str_devname;
int devunit, error;
@@ -79,7 +77,6 @@ altera_avgen_nexus_attach(device_t dev)
* on the device, and whether it is cached.
*/
str_fileio = NULL;
- str_geomio = NULL;
str_mmapio = NULL;
str_devname = NULL;
devunit = -1;
@@ -93,8 +90,6 @@ altera_avgen_nexus_attach(device_t dev)
(void)resource_string_value(device_get_name(dev),
device_get_unit(dev), ALTERA_AVALON_STR_FILEIO, &str_fileio);
(void)resource_string_value(device_get_name(dev),
- device_get_unit(dev), ALTERA_AVALON_STR_GEOMIO, &str_geomio);
- (void)resource_string_value(device_get_name(dev),
device_get_unit(dev), ALTERA_AVALON_STR_MMAPIO, &str_mmapio);
(void)resource_string_value(device_get_name(dev),
device_get_unit(dev), ALTERA_AVALON_STR_DEVNAME, &str_devname);
@@ -109,8 +104,8 @@ altera_avgen_nexus_attach(device_t dev)
device_printf(dev, "couldn't map memory\n");
return (ENXIO);
}
- error = altera_avgen_attach(sc, str_fileio, str_geomio, str_mmapio,
- str_devname, devunit);
+ error = altera_avgen_attach(sc, str_fileio, str_mmapio, str_devname,
+ devunit);
if (error != 0)
bus_release_resource(dev, SYS_RES_MEMORY, sc->avg_rid,
sc->avg_res);
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart.h b/sys/dev/altera/jtag_uart/altera_jtag_uart.h
index 9fc2877930b7..b02b09f7bc5e 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart.h
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
index f49230202ff8..96d20ceb21f4 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
index b9ea707131da..c4ee8de14ad5 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
index 3f7b555eb03d..ff954fdeecb9 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
index a987639b7e5c..1e9a1b89657d 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011-2012, 2016 Robert N. M. Watson
+ * Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
*
* This software was developed by SRI International and the University of
@@ -42,12 +40,10 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/reboot.h>
-#include <sys/sysctl.h>
#include <sys/tty.h>
#include <ddb/ddb.h>
-#include <machine/atomic.h>
#include <machine/bus.h>
#include <dev/altera/jtag_uart/altera_jtag_uart.h>
@@ -69,9 +65,9 @@ static struct ttydevsw aju_ttydevsw = {
/*
* When polling for the AC bit, the number of times we have to not see it
- * before assuming JTAG has disappeared on us. By default, four seconds.
+ * before assuming JTAG has disappeared on us. By default, two seconds.
*/
-#define AJU_JTAG_MAXMISS 20
+#define AJU_JTAG_MAXMISS 10
/*
* Polling intervals for input/output and JTAG connection events.
@@ -80,53 +76,6 @@ static struct ttydevsw aju_ttydevsw = {
#define AJU_AC_POLLINTERVAL (hz/5)
/*
- * Statistics on JTAG removal events when sending, for debugging purposes
- * only.
- */
-static u_int aju_jtag_vanished;
-SYSCTL_UINT(_debug, OID_AUTO, aju_jtag_vanished, CTLFLAG_RW,
- &aju_jtag_vanished, 0, "Number of times JTAG has vanished");
-
-static u_int aju_jtag_appeared;
-SYSCTL_UINT(_debug, OID_AUTO, aju_jtag_appeared, CTLFLAG_RW,
- &aju_jtag_appeared, 0, "Number of times JTAG has appeared");
-
-SYSCTL_INT(_debug, OID_AUTO, aju_cons_jtag_present, CTLFLAG_RW,
- &aju_cons_jtag_present, 0, "JTAG console present flag");
-
-SYSCTL_UINT(_debug, OID_AUTO, aju_cons_jtag_missed, CTLFLAG_RW,
- &aju_cons_jtag_missed, 0, "JTAG console missed counter");
-
-/*
- * Interrupt-related statistics.
- */
-static u_int aju_intr_readable_enabled;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_readable_enabled, CTLFLAG_RW,
- &aju_intr_readable_enabled, 0, "Number of times read interrupt enabled");
-
-static u_int aju_intr_writable_disabled;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_writable_disabled, CTLFLAG_RW,
- &aju_intr_writable_disabled, 0,
- "Number of times write interrupt disabled");
-
-static u_int aju_intr_writable_enabled;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_writable_enabled, CTLFLAG_RW,
- &aju_intr_writable_enabled, 0,
- "Number of times write interrupt enabled");
-
-static u_int aju_intr_disabled;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_disabled, CTLFLAG_RW,
- &aju_intr_disabled, 0, "Number of times write interrupt disabled");
-
-static u_int aju_intr_read_count;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_read_count, CTLFLAG_RW,
- &aju_intr_read_count, 0, "Number of times read interrupt fired");
-
-static u_int aju_intr_write_count;
-SYSCTL_UINT(_debug, OID_AUTO, aju_intr_write_count, CTLFLAG_RW,
- &aju_intr_write_count, 0, "Number of times write interrupt fired");
-
-/*
* Low-level read and write register routines; the Altera UART is little
* endian, so we byte swap 32-bit reads and writes.
*/
@@ -211,7 +160,6 @@ aju_intr_readable_enable(struct altera_jtag_uart_softc *sc)
AJU_LOCK_ASSERT(sc);
- atomic_add_int(&aju_intr_readable_enabled, 1);
v = aju_control_read(sc);
v |= ALTERA_JTAG_UART_CONTROL_RE;
aju_control_write(sc, v);
@@ -224,7 +172,6 @@ aju_intr_writable_enable(struct altera_jtag_uart_softc *sc)
AJU_LOCK_ASSERT(sc);
- atomic_add_int(&aju_intr_writable_enabled, 1);
v = aju_control_read(sc);
v |= ALTERA_JTAG_UART_CONTROL_WE;
aju_control_write(sc, v);
@@ -237,7 +184,6 @@ aju_intr_writable_disable(struct altera_jtag_uart_softc *sc)
AJU_LOCK_ASSERT(sc);
- atomic_add_int(&aju_intr_writable_disabled, 1);
v = aju_control_read(sc);
v &= ~ALTERA_JTAG_UART_CONTROL_WE;
aju_control_write(sc, v);
@@ -250,7 +196,6 @@ aju_intr_disable(struct altera_jtag_uart_softc *sc)
AJU_LOCK_ASSERT(sc);
- atomic_add_int(&aju_intr_disabled, 1);
v = aju_control_read(sc);
v &= ~(ALTERA_JTAG_UART_CONTROL_RE | ALTERA_JTAG_UART_CONTROL_WE);
aju_control_write(sc, v);
@@ -304,7 +249,30 @@ aju_handle_output(struct altera_jtag_uart_softc *sc, struct tty *tp)
AJU_UNLOCK(sc);
while (ttydisc_getc_poll(tp) != 0) {
AJU_LOCK(sc);
- if (*sc->ajus_jtag_presentp == 0) {
+ v = aju_control_read(sc);
+ if ((v & ALTERA_JTAG_UART_CONTROL_WSPACE) != 0) {
+ AJU_UNLOCK(sc);
+ if (ttydisc_getc(tp, &ch, sizeof(ch)) != sizeof(ch))
+ panic("%s: ttydisc_getc", __func__);
+ AJU_LOCK(sc);
+
+ /*
+ * XXXRW: There is a slight race here in which we test
+ * for writability, drop the lock, get the character
+ * from the tty layer, re-acquire the lock, and then
+ * write. It's possible for other code --
+ * specifically, the low-level console -- to have
+ * written in the mean time, which might mean that
+ * there is no longer space. The BERI memory bus will
+ * cause this write to block, wedging the processor
+ * until space is available -- which could be a while
+ * if JTAG is not attached!
+ *
+ * The 'easy' fix is to drop the character if WSPACE
+ * has become unset. Not sure what the 'hard' fix is.
+ */
+ aju_data_write(sc, ch);
+ } else {
/*
* If JTAG is not present, then we will drop this
* character instead of perhaps scheduling an
@@ -313,50 +281,21 @@ aju_handle_output(struct altera_jtag_uart_softc *sc, struct tty *tp)
* later even though we aren't interested in sending
* anymore. Loop to drain TTY-layer buffer.
*/
- AJU_UNLOCK(sc);
- if (ttydisc_getc(tp, &ch, sizeof(ch)) !=
- sizeof(ch))
- panic("%s: ttydisc_getc", __func__);
- continue;
- }
- v = aju_control_read(sc);
- if ((v & ALTERA_JTAG_UART_CONTROL_WSPACE) == 0) {
- if (sc->ajus_irq_res != NULL &&
- (v & ALTERA_JTAG_UART_CONTROL_WE) == 0)
+ if (*sc->ajus_jtag_presentp == 0) {
+ if (ttydisc_getc(tp, &ch, sizeof(ch)) !=
+ sizeof(ch))
+ panic("%s: ttydisc_getc 2", __func__);
+ AJU_UNLOCK(sc);
+ continue;
+ }
+ if (sc->ajus_irq_res != NULL)
aju_intr_writable_enable(sc);
return;
}
AJU_UNLOCK(sc);
- if (ttydisc_getc(tp, &ch, sizeof(ch)) != sizeof(ch))
- panic("%s: ttydisc_getc 2", __func__);
- AJU_LOCK(sc);
-
- /*
- * XXXRW: There is a slight race here in which we test for
- * writability, drop the lock, get the character from the tty
- * layer, re-acquire the lock, and then write. It's possible
- * for other code -- specifically, the low-level console -- to
- * have* written in the mean time, which might mean that there
- * is no longer space. The BERI memory bus will cause this
- * write to block, wedging the processor until space is
- * available -- which could be a while if JTAG is not
- * attached!
- *
- * The 'easy' fix is to drop the character if WSPACE has
- * become unset. Not sure what the 'hard' fix is.
- */
- aju_data_write(sc, ch);
- AJU_UNLOCK(sc);
}
AJU_LOCK(sc);
-
- /*
- * If interrupts are configured, and there's no data to write, but we
- * had previously enabled write interrupts, disable them now.
- */
- v = aju_control_read(sc);
- if (sc->ajus_irq_res != NULL && (v & ALTERA_JTAG_UART_CONTROL_WE) != 0)
- aju_intr_writable_disable(sc);
+ aju_intr_writable_disable(sc);
}
static void
@@ -416,25 +355,16 @@ aju_ac_callout(void *arg)
v &= ~ALTERA_JTAG_UART_CONTROL_AC;
aju_control_write(sc, v);
if (*sc->ajus_jtag_presentp == 0) {
+ *sc->ajus_jtag_missedp = 0;
*sc->ajus_jtag_presentp = 1;
- atomic_add_int(&aju_jtag_appeared, 1);
aju_handle_output(sc, tp);
}
-
- /* Any hit eliminates all recent misses. */
- *sc->ajus_jtag_missedp = 0;
} else if (*sc->ajus_jtag_presentp != 0) {
- /*
- * If we've exceeded our tolerance for misses, mark JTAG as
- * disconnected and drain output. Otherwise, bump the miss
- * counter.
- */
- if (*sc->ajus_jtag_missedp > AJU_JTAG_MAXMISS) {
+ (*sc->ajus_jtag_missedp)++;
+ if (*sc->ajus_jtag_missedp >= AJU_JTAG_MAXMISS) {
*sc->ajus_jtag_presentp = 0;
- atomic_add_int(&aju_jtag_vanished, 1);
aju_handle_output(sc, tp);
- } else
- (*sc->ajus_jtag_missedp)++;
+ }
}
callout_reset(&sc->ajus_ac_callout, AJU_AC_POLLINTERVAL,
aju_ac_callout, sc);
@@ -452,14 +382,10 @@ aju_intr(void *arg)
tty_lock(tp);
AJU_LOCK(sc);
v = aju_control_read(sc);
- if (v & ALTERA_JTAG_UART_CONTROL_RI) {
- atomic_add_int(&aju_intr_read_count, 1);
+ if (v & ALTERA_JTAG_UART_CONTROL_RI)
aju_handle_input(sc, tp);
- }
- if (v & ALTERA_JTAG_UART_CONTROL_WI) {
- atomic_add_int(&aju_intr_write_count, 1);
+ if (v & ALTERA_JTAG_UART_CONTROL_WI)
aju_handle_output(sc, tp);
- }
AJU_UNLOCK(sc);
tty_unlock(tp);
}
diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c
index 57e10fed68bd..45088451bc33 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.c
+++ b/sys/dev/altera/sdcard/altera_sdcard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/sdcard/altera_sdcard.h b/sys/dev/altera/sdcard/altera_sdcard.h
index a486971faa37..96019b2d667c 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.h
+++ b/sys/dev/altera/sdcard/altera_sdcard.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/sdcard/altera_sdcard_disk.c b/sys/dev/altera/sdcard/altera_sdcard_disk.c
index caf8a13856fc..cae3a82cfbc3 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_disk.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
index 93f9cb888332..da77aefb347e 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/sdcard/altera_sdcard_io.c b/sys/dev/altera/sdcard/altera_sdcard_io.c
index dc1b615bd60a..55d2c4a2997a 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_io.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
index b6bbcdd949e2..bd5c6b81e6a3 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c
index 81cf2cbc854c..fa38c9123a48 100644
--- a/sys/dev/amdsbwd/amdsbwd.c
+++ b/sys/dev/amdsbwd/amdsbwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Andriy Gapon <avg@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 32a765816fe1..2080c92b8f2c 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, 2009 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2009 Norikatsu Shigemura <nork@FreeBSD.org>
* Copyright (c) 2009-2012 Jung-uk Kim <jkim@FreeBSD.org>
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 74f587aa6026..09d47f725458 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
* Copyright (c) 2005 Scott Long
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index 14395e066835..247f4dc1b52d 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index d13dd9018125..44e77c4e1ec1 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Jonathan Lemon
* Copyright (c) 1999, 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/amr/amr_linux.c b/sys/dev/amr/amr_linux.c
index 967907cc6846..10fef5ce19b0 100644
--- a/sys/dev/amr/amr_linux.c
+++ b/sys/dev/amr/amr_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Paul Saab
* All rights reserved.
*
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index f43754bf2c04..9e730aa26e21 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Eric Moore
* Copyright (c) 2002, 2004 LSI Logic Corporation
* All rights reserved.
diff --git a/sys/dev/amr/amr_tables.h b/sys/dev/amr/amr_tables.h
index 8cc114178a6d..b1a4e441af42 100644
--- a/sys/dev/amr/amr_tables.h
+++ b/sys/dev/amr/amr_tables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index c069555b7e18..9c81d2d9f268 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index b93ce49d2bb3..2e5d2173f505 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index ae1a4acbc892..71678396332d 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index bc1247e041a2..28e4f72148e9 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index c1871e513d4d..cae604c055c1 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index a6d3c81d52da..19e5cd07552d 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 4c9f94350ec9..6f26d7a39035 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 5fa071e0f8b7..db658cfa6139 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index b9a6d523cb10..ee69b8856019 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 821c95f04f53..4382a883e85a 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -9,8 +9,6 @@
********************************************************************************
********************************************************************************
**
-** SPDX-License-Identifier: BSD-3-Clause
-**
** Copyright (C) 2002 - 2012, Areca Technology Corporation All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index 398090177a81..aea0b396392f 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -8,8 +8,6 @@
** SATA/SAS RAID HOST Adapter
********************************************************************************
********************************************************************************
-** SPDX-License-Identifier: BSD-3-Clause
-**
** Copyright (C) 2002 - 2012, Areca Technology Corporation All rights reserved.
**
** Redistribution and use in source and binary forms,with or without
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index ae55c23f7ca5..0d1cba3f7df8 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
index 37eb1b4a9ab3..679c7363dd41 100644
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 38449cd08317..e336c444e97c 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 9c3ca0d7e520..cf8ed784e7b8 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 14a47c5f6842..5aa5a9b480f8 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index f51d993bf26a..56332a19dd6a 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c
index eabb21a8d01e..b29851342b98 100644
--- a/sys/dev/ata/ata-isa.c
+++ b/sys/dev/ata/ata-isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c
index 03a3b80ed19c..1c81c6fba923 100644
--- a/sys/dev/ata/ata-lowlevel.c
+++ b/sys/dev/ata/ata-lowlevel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 48a31e69883d..74df04458c7b 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 2fc8b278d589..e92c4da25a9a 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/ata-sata.c b/sys/dev/ata/ata-sata.c
index 9632c53ca8d2..2df5cb53d5c9 100644
--- a/sys/dev/ata/ata-sata.c
+++ b/sys/dev/ata/ata-sata.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c
index f5fad02cf89f..41269455e1f5 100644
--- a/sys/dev/ata/chipsets/ata-acard.c
+++ b/sys/dev/ata/chipsets/ata-acard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c
index 598b15304b4f..3aab7795a680 100644
--- a/sys/dev/ata/chipsets/ata-acerlabs.c
+++ b/sys/dev/ata/chipsets/ata-acerlabs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c
index 2ff84ee55273..a8f913d41914 100644
--- a/sys/dev/ata/chipsets/ata-amd.c
+++ b/sys/dev/ata/chipsets/ata-amd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c
index ef1abc9a4b2b..150685ec4321 100644
--- a/sys/dev/ata/chipsets/ata-ati.c
+++ b/sys/dev/ata/chipsets/ata-ati.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c
index 2dd19ec88f39..151f3169a4c5 100644
--- a/sys/dev/ata/chipsets/ata-cenatek.c
+++ b/sys/dev/ata/chipsets/ata-cenatek.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c
index ac04fcc8c11d..e4a1419e1ac0 100644
--- a/sys/dev/ata/chipsets/ata-cypress.c
+++ b/sys/dev/ata/chipsets/ata-cypress.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c
index b0eeb51eab84..c8582c3b7e79 100644
--- a/sys/dev/ata/chipsets/ata-cyrix.c
+++ b/sys/dev/ata/chipsets/ata-cyrix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-fsl.c b/sys/dev/ata/chipsets/ata-fsl.c
index 0a888a7c3947..c78e984282bd 100644
--- a/sys/dev/ata/chipsets/ata-fsl.c
+++ b/sys/dev/ata/chipsets/ata-fsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c
index 6ce3dbe861d3..4aee3c6d92f7 100644
--- a/sys/dev/ata/chipsets/ata-highpoint.c
+++ b/sys/dev/ata/chipsets/ata-highpoint.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index a5260fc63336..67379903c522 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c
index fcbc2f69a6c0..44370de9ec4b 100644
--- a/sys/dev/ata/chipsets/ata-ite.c
+++ b/sys/dev/ata/chipsets/ata-ite.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c
index d676af880cc9..5eb9ae8a7e7e 100644
--- a/sys/dev/ata/chipsets/ata-jmicron.c
+++ b/sys/dev/ata/chipsets/ata-jmicron.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c
index 2a57e4715902..60d6d46f96b1 100644
--- a/sys/dev/ata/chipsets/ata-marvell.c
+++ b/sys/dev/ata/chipsets/ata-marvell.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c
index 27e816af498a..38da14f0dfdc 100644
--- a/sys/dev/ata/chipsets/ata-micron.c
+++ b/sys/dev/ata/chipsets/ata-micron.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c
index 41987bc7f12b..8e29b10604dc 100644
--- a/sys/dev/ata/chipsets/ata-national.c
+++ b/sys/dev/ata/chipsets/ata-national.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c
index 2afc930bd94a..82e719d69fa1 100644
--- a/sys/dev/ata/chipsets/ata-netcell.c
+++ b/sys/dev/ata/chipsets/ata-netcell.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c
index 302bfe2ab914..1d17981140d5 100644
--- a/sys/dev/ata/chipsets/ata-nvidia.c
+++ b/sys/dev/ata/chipsets/ata-nvidia.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c
index 50bf4d12c226..0cc14351489e 100644
--- a/sys/dev/ata/chipsets/ata-promise.c
+++ b/sys/dev/ata/chipsets/ata-promise.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c
index 2a0727a4c939..540534fd9756 100644
--- a/sys/dev/ata/chipsets/ata-serverworks.c
+++ b/sys/dev/ata/chipsets/ata-serverworks.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c
index a6f2d93d8cd5..f48ecdf5bf70 100644
--- a/sys/dev/ata/chipsets/ata-siliconimage.c
+++ b/sys/dev/ata/chipsets/ata-siliconimage.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c
index 34d2c2467183..1acc37c3ae62 100644
--- a/sys/dev/ata/chipsets/ata-sis.c
+++ b/sys/dev/ata/chipsets/ata-sis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c
index 5c368d07cd4d..db1a87933813 100644
--- a/sys/dev/ata/chipsets/ata-via.c
+++ b/sys/dev/ata/chipsets/ata-via.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c
index bd22ceb7ac6c..3d633a44adda 100644
--- a/sys/dev/ath/ah_osdep.c
+++ b/sys/dev/ath/ah_osdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/ah_osdep.h b/sys/dev/ath/ah_osdep.h
index 2a34552b0a11..94601927ca23 100644
--- a/sys/dev/ath/ah_osdep.h
+++ b/sys/dev/ath/ah_osdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_dfs/null/dfs_null.c b/sys/dev/ath/ath_dfs/null/dfs_null.c
index 780a06a188b4..e31a61d85758 100644
--- a/sys/dev/ath/ath_dfs/null/dfs_null.c
+++ b/sys/dev/ath/ath_dfs/null/dfs_null.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9002phy.h b/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
index 2e69e27fc6fb..3d837cfcf595 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
index 5eeb420d5d3a..334ca60e99f7 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
index a607ece431bb..e08639c0ca15 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
index e688f529ae07..a743e21ef191 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
index ce529c70e45d..c6ecc4190d90 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
index 3da59311e5dc..5fd01b75572e 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
index 7048a90e0ba2..59d53b6f4609 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
index 48fe382d2cba..c91048af9706 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
index 981cbf429e0a..0255e1742606 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285phy.h b/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
index 8d6b41201a69..f8230536521e 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
index 09940a187e7d..d5024b062397 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
index 8636b7a39fde..1a7cda255976 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008-2010 Atheros Communications Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
index 9cc2186bb178..cbbe017667e4 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h b/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
index 1eb12b83d4cb..00ceeb82aecf 100644
--- a/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
+++ b/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2012, Qualcomm Atheros, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.c b/sys/dev/ath/ath_rate/amrr/amrr.c
index 9a7518373c19..c2520097d02e 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.c
+++ b/sys/dev/ath/ath_rate/amrr/amrr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 INRIA
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.h b/sys/dev/ath/ath_rate/amrr/amrr.h
index 9689c3c5272f..c97a00712c03 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.h
+++ b/sys/dev/ath/ath_rate/amrr/amrr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 INRIA
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c
index 05604c08823c..7c73926526e4 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.c
+++ b/sys/dev/ath/ath_rate/onoe/onoe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.h b/sys/dev/ath/ath_rate/onoe/onoe.h
index 16a7bdd56217..27bbe94920ff 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.h
+++ b/sys/dev/ath/ath_rate/onoe/onoe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c
index abb4cd7ab88f..815c68b7a245 100644
--- a/sys/dev/ath/ath_rate/sample/sample.c
+++ b/sys/dev/ath/ath_rate/sample/sample.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 John Bicket
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h
index 4728aa7f2ca8..5495141c60be 100644
--- a/sys/dev/ath/ath_rate/sample/sample.h
+++ b/sys/dev/ath/ath_rate/sample/sample.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 John Bicket
* All rights reserved.
*
diff --git a/sys/dev/ath/ath_rate/sample/tx_schedules.h b/sys/dev/ath/ath_rate/sample/tx_schedules.h
index 02805bec6566..f749e575c899 100644
--- a/sys/dev/ath/ath_rate/sample/tx_schedules.h
+++ b/sys/dev/ath/ath_rate/sample/tx_schedules.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 John Bicket
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 437f39b845f1..4ef95241593a 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c
index 48f70d51c027..0b546a069b8b 100644
--- a/sys/dev/ath/if_ath_ahb.c
+++ b/sys/dev/ath/if_ath_ahb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_alq.c b/sys/dev/ath/if_ath_alq.c
index d5f53a6670bd..8ca53ae2c579 100644
--- a/sys/dev/ath/if_ath_alq.c
+++ b/sys/dev/ath/if_ath_alq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_alq.h b/sys/dev/ath/if_ath_alq.h
index 609c444a72fc..988882d61573 100644
--- a/sys/dev/ath/if_ath_alq.h
+++ b/sys/dev/ath/if_ath_alq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c
index 3213465d40f3..c700230149e5 100644
--- a/sys/dev/ath/if_ath_beacon.c
+++ b/sys/dev/ath/if_ath_beacon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_beacon.h b/sys/dev/ath/if_ath_beacon.h
index e4a9e7918af2..a9402680ee27 100644
--- a/sys/dev/ath/if_ath_beacon.h
+++ b/sys/dev/ath/if_ath_beacon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_btcoex.c b/sys/dev/ath/if_ath_btcoex.c
index da0603978e4d..f071fc4ee7d2 100644
--- a/sys/dev/ath/if_ath_btcoex.c
+++ b/sys/dev/ath/if_ath_btcoex.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_btcoex.h b/sys/dev/ath/if_ath_btcoex.h
index db8262e50974..b35665bb80eb 100644
--- a/sys/dev/ath/if_ath_btcoex.h
+++ b/sys/dev/ath/if_ath_btcoex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_debug.c b/sys/dev/ath/if_ath_debug.c
index 3ed6a4d8d715..d21ad6fea6f0 100644
--- a/sys/dev/ath/if_ath_debug.c
+++ b/sys/dev/ath/if_ath_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_debug.h b/sys/dev/ath/if_ath_debug.h
index da1ece11d518..8a04790f8204 100644
--- a/sys/dev/ath/if_ath_debug.h
+++ b/sys/dev/ath/if_ath_debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c
index 7b259fea7f48..ff1df8463e01 100644
--- a/sys/dev/ath/if_ath_keycache.c
+++ b/sys/dev/ath/if_ath_keycache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_keycache.h b/sys/dev/ath/if_ath_keycache.h
index 1efb47d01e46..c67e55563848 100644
--- a/sys/dev/ath/if_ath_keycache.h
+++ b/sys/dev/ath/if_ath_keycache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_led.c b/sys/dev/ath/if_ath_led.c
index 3cd519a8d198..a55e0364689e 100644
--- a/sys/dev/ath/if_ath_led.c
+++ b/sys/dev/ath/if_ath_led.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_led.h b/sys/dev/ath/if_ath_led.h
index b03829152676..54de4c4ac2cf 100644
--- a/sys/dev/ath/if_ath_led.h
+++ b/sys/dev/ath/if_ath_led.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c
index aa4b9a2177cb..5c102fb97607 100644
--- a/sys/dev/ath/if_ath_lna_div.c
+++ b/sys/dev/ath/if_ath_lna_div.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_lna_div.h b/sys/dev/ath/if_ath_lna_div.h
index 247f1806920b..997466a7bf56 100644
--- a/sys/dev/ath/if_ath_lna_div.h
+++ b/sys/dev/ath/if_ath_lna_div.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_misc.h b/sys/dev/ath/if_ath_misc.h
index 989bc5c7bed7..fbc4d67d72f6 100644
--- a/sys/dev/ath/if_ath_misc.h
+++ b/sys/dev/ath/if_ath_misc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index db6297e6e303..88cbaffb1f5c 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c
index 63ed8ec43127..cacd8f8c721f 100644
--- a/sys/dev/ath/if_ath_rx.c
+++ b/sys/dev/ath/if_ath_rx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_rx.h b/sys/dev/ath/if_ath_rx.h
index a61313da63d5..62be699f752b 100644
--- a/sys/dev/ath/if_ath_rx.h
+++ b/sys/dev/ath/if_ath_rx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c
index 3f0498140ca8..578e1cfbfc6f 100644
--- a/sys/dev/ath/if_ath_rx_edma.c
+++ b/sys/dev/ath/if_ath_rx_edma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_rx_edma.h b/sys/dev/ath/if_ath_rx_edma.h
index d53ecb4e92ca..e786daa6c433 100644
--- a/sys/dev/ath/if_ath_rx_edma.h
+++ b/sys/dev/ath/if_ath_rx_edma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c
index 5c1641f0e2ac..e4afdaefbbb8 100644
--- a/sys/dev/ath/if_ath_spectral.c
+++ b/sys/dev/ath/if_ath_spectral.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_spectral.h b/sys/dev/ath/if_ath_spectral.h
index ceb372357d21..3e069dbdd31d 100644
--- a/sys/dev/ath/if_ath_spectral.h
+++ b/sys/dev/ath/if_ath_spectral.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_sysctl.c b/sys/dev/ath/if_ath_sysctl.c
index 3e4e47246357..749285a6a5d5 100644
--- a/sys/dev/ath/if_ath_sysctl.c
+++ b/sys/dev/ath/if_ath_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_sysctl.h b/sys/dev/ath/if_ath_sysctl.h
index fca5fb9d3dd7..1fef2be224a4 100644
--- a/sys/dev/ath/if_ath_sysctl.h
+++ b/sys/dev/ath/if_ath_sysctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tdma.c b/sys/dev/ath/if_ath_tdma.c
index 47b6c3124b0f..e3460c6374c3 100644
--- a/sys/dev/ath/if_ath_tdma.c
+++ b/sys/dev/ath/if_ath_tdma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tdma.h b/sys/dev/ath/if_ath_tdma.h
index 62f3240a3d0a..1e90a5f29744 100644
--- a/sys/dev/ath/if_ath_tdma.h
+++ b/sys/dev/ath/if_ath_tdma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tsf.h b/sys/dev/ath/if_ath_tsf.h
index f7837e2d5dc2..cce089fab846 100644
--- a/sys/dev/ath/if_ath_tsf.h
+++ b/sys/dev/ath/if_ath_tsf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index c38b90fa9753..d2b1d85ea9e3 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2010-2012 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx.h b/sys/dev/ath/if_ath_tx.h
index 517007716e9f..19f7707a2431 100644
--- a/sys/dev/ath/if_ath_tx.h
+++ b/sys/dev/ath/if_ath_tx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tx_edma.c b/sys/dev/ath/if_ath_tx_edma.c
index 03112bb128aa..486c06a8a6ba 100644
--- a/sys/dev/ath/if_ath_tx_edma.c
+++ b/sys/dev/ath/if_ath_tx_edma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tx_edma.h b/sys/dev/ath/if_ath_tx_edma.h
index 8718ce1d770a..d4975a69969c 100644
--- a/sys/dev/ath/if_ath_tx_edma.h
+++ b/sys/dev/ath/if_ath_tx_edma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c
index 9cdbef2ecb5f..5a55f60762df 100644
--- a/sys/dev/ath/if_ath_tx_ht.c
+++ b/sys/dev/ath/if_ath_tx_ht.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath_tx_ht.h b/sys/dev/ath/if_ath_tx_ht.h
index 970a9de62006..38885ef82461 100644
--- a/sys/dev/ath/if_ath_tx_ht.h
+++ b/sys/dev/ath/if_ath_tx_ht.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
*
diff --git a/sys/dev/ath/if_athdfs.h b/sys/dev/ath/if_athdfs.h
index 82978f815672..cc4db1572a6b 100644
--- a/sys/dev/ath/if_athdfs.h
+++ b/sys/dev/ath/if_athdfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
*
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index 646edb7702d7..7b69ab5fe6c2 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/ath/if_athrate.h b/sys/dev/ath/if_athrate.h
index 5aec9e6b3870..a97d686da6b4 100644
--- a/sys/dev/ath/if_athrate.h
+++ b/sys/dev/ath/if_athrate.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
* Copyright (c) 2004 Video54 Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index bce0dd0a0d25..488b9f403ba4 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 895d358b3fa3..f380367bc308 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 9513e238f153..22227f364473 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index f8909cdbc988..695e6bfd84ab 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-1999
* Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdc_ebus.c b/sys/dev/atkbdc/atkbdc_ebus.c
index 704837e39c6e..7662ee10e99f 100644
--- a/sys/dev/atkbdc/atkbdc_ebus.c
+++ b/sys/dev/atkbdc/atkbdc_ebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index d83d7ac8bb9b..2f863fce8347 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 8ac80d95258d..436d97adab66 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index 54e40f4b839a..fa8f1f8000b8 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index 576dec967391..db590b96cc9f 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-1999
* Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index 94ef42ebaf48..3d09e444772a 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/auxio/auxio.c b/sys/dev/auxio/auxio.c
index 26915fc5668a..b104d5af5ee9 100644
--- a/sys/dev/auxio/auxio.c
+++ b/sys/dev/auxio/auxio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2004 Pyun YongHyeon
* All rights reserved.
*
diff --git a/sys/dev/auxio/auxioreg.h b/sys/dev/auxio/auxioreg.h
index 3f93cf40635e..0c9ce8e9fa93 100644
--- a/sys/dev/auxio/auxioreg.h
+++ b/sys/dev/auxio/auxioreg.h
@@ -2,8 +2,6 @@
/* $NetBSD: auxioreg.h,v 1.4 2001/10/22 07:31:41 mrg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Matthew R. Green
* All rights reserved.
*
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index a52588ff1b15..cdf234ee4a5e 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2006-2014 QLogic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bce/if_bcefw.h b/sys/dev/bce/if_bcefw.h
index 4ba867014182..cae01feafc29 100644
--- a/sys/dev/bce/if_bcefw.h
+++ b/sys/dev/bce/if_bcefw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2006-2014 QLogic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index d9bd23ccfd16..2f166eadea7c 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006-2014 QLogic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index cfac86cd832e..eaad8f0b5981 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Stuart Walsh<stu@ipng.org.uk>
* and Duncan Barclay<dmlb@dmlb.org>
*
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index 668d2604ffc3..b50627edbf89 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Stuart Walsh
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 1edf2a274632..929bedc5ee0a 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index eb7686e70d05..0cf9ca18c9bc 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index ca1cf431ff3e..ea2b45869444 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index e891b0f69bcb..c05e40c31ea3 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -14,8 +14,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index 4c11b237f629..be76fb304d46 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index 38f53a4e6134..30a90a880d68 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -15,8 +15,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 6b5bf365cf60..e069778da185 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index 0c326c7bc82a..980ced76621a 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -16,8 +16,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 0e9464822e60..06a65473084e 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index 8ea53559ff62..5008e6bfb9ce 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 5009c51e75fe..77c5971bacd4 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -12,8 +12,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 2000 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_mem.h b/sys/dev/bktr/bktr_mem.h
index 91b4b1c5afca..8feb55206c11 100644
--- a/sys/dev/bktr/bktr_mem.h
+++ b/sys/dev/bktr/bktr_mem.h
@@ -14,8 +14,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 2000 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 83596ea5081f..aa41454f0cab 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index cd4ea20b3b8d..6456616be281 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -11,8 +11,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 2d6c961b3a36..4a3af1a490b0 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,8 +1,6 @@
/*-
* $FreeBSD$
*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1999 Roger Hardiman
* Copyright (c) 1998 Amancio Hasty
* Copyright (c) 1995 Mark Tinguely and Jim Lowe
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index bee8fc0f2685..d6bf61008dc9 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index 284999c759f4..cc00150151ff 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -11,8 +11,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 9a1959c6206e..8e769ecbe92f 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Mark Tinguely and Jim Lowe
* All rights reserved.
*
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index f6f12d0f95d5..8c45e6723a97 100644
--- a/sys/dev/bktr/msp34xx.c
+++ b/sys/dev/bktr/msp34xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2001 Gerd Knorr <kraxel@bytesex.org>
* All rights reserved.
*
diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c
index cecb2e0d634c..860e1771a9b1 100644
--- a/sys/dev/bm/if_bm.c
+++ b/sys/dev/bm/if_bm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2008 Nathan Whitehorn. All rights reserved.
* Copyright 2003 by Peter Grehan. All rights reserved.
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
diff --git a/sys/dev/bm/if_bmreg.h b/sys/dev/bm/if_bmreg.h
index 665c651bdf2b..39d9b485d3d6 100644
--- a/sys/dev/bm/if_bmreg.h
+++ b/sys/dev/bm/if_bmreg.h
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright 1991-1998 by Open Software Foundation, Inc.
* All Rights Reserved
*
@@ -18,9 +18,7 @@
* NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bm/if_bmvar.h b/sys/dev/bm/if_bmvar.h
index c7d09334a782..b50d65b479ed 100644
--- a/sys/dev/bm/if_bmvar.h
+++ b/sys/dev/bm/if_bmvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn
* Copyright (c) 2003 Peter Grehan
* All rights reserved
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index da2af71ceccd..1ff34a7d8b9a 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -6,8 +6,6 @@
* sys/dev/buslogic/bt_eisa.c BT-74X, BT-75x cards, SDC3222F
* sys/dev/buslogic/bt_pci.c BT-946, BT-948, BT-956, BT-958 cards
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 398dfb4e56c8..ce121c32ae29 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -2,8 +2,6 @@
* Product specific probe and attach routines for:
* Buslogic BT-54X and BT-445 cards
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Justin T. Gibbs
* All rights reserved.
*
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 115561894f4d..48c90e08e553 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -2,8 +2,6 @@
* Product specific probe and attach routines for:
* Buslogic BT946, BT948, BT956, BT958 SCSI controllers
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995, 1997, 1998 Justin T. Gibbs
* All rights reserved.
*
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 24644c2ed6fa..a22c5aab6b0b 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -7,8 +7,6 @@
* sys/dev/buslogic/bt_eisa.c BT-74X, BT-75x cards, SDC3222F
* sys/dev/buslogic/bt_pci.c BT-946, BT-948, BT-956, BT-958 cards
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/dev/bvm/bvm_console.c b/sys/dev/bvm/bvm_console.c
index 6ce8c21f40f6..a7b1bc5ac068 100644
--- a/sys/dev/bvm/bvm_console.c
+++ b/sys/dev/bvm/bvm_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/dev/bvm/bvm_dbg.c b/sys/dev/bvm/bvm_dbg.c
index 5aa0fe731d79..1ba7ce06c430 100644
--- a/sys/dev/bvm/bvm_dbg.c
+++ b/sys/dev/bvm/bvm_dbg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/sys/dev/bwi/bitops.h b/sys/dev/bwi/bitops.h
index af4f3ea0c3f9..0d6dee8d862f 100644
--- a/sys/dev/bwi/bitops.h
+++ b/sys/dev/bwi/bitops.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
* Programmed for NetBSD by David Young.
diff --git a/sys/dev/bwi/bwimac.c b/sys/dev/bwi/bwimac.c
index f998873a713b..54d2fde57cc1 100644
--- a/sys/dev/bwi/bwimac.c
+++ b/sys/dev/bwi/bwimac.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/bwimac.h b/sys/dev/bwi/bwimac.h
index 3572114fbc81..a6d90083c60b 100644
--- a/sys/dev/bwi/bwimac.h
+++ b/sys/dev/bwi/bwimac.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/bwiphy.c b/sys/dev/bwi/bwiphy.c
index a17735590007..60afb191d240 100644
--- a/sys/dev/bwi/bwiphy.c
+++ b/sys/dev/bwi/bwiphy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/bwiphy.h b/sys/dev/bwi/bwiphy.h
index e3fb8252f1c2..f865f1f36c97 100644
--- a/sys/dev/bwi/bwiphy.h
+++ b/sys/dev/bwi/bwiphy.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/bwirf.c b/sys/dev/bwi/bwirf.c
index dbf658d5caa7..e65a80ddc412 100644
--- a/sys/dev/bwi/bwirf.c
+++ b/sys/dev/bwi/bwirf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/bwirf.h b/sys/dev/bwi/bwirf.h
index d381563d48bd..af2ce1745c6d 100644
--- a/sys/dev/bwi/bwirf.h
+++ b/sys/dev/bwi/bwirf.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c
index a6748200e7eb..991071b876af 100644
--- a/sys/dev/bwi/if_bwi.c
+++ b/sys/dev/bwi/if_bwi.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/if_bwi_pci.c b/sys/dev/bwi/if_bwi_pci.c
index 87fc1fb6b4b0..c2badc504a9b 100644
--- a/sys/dev/bwi/if_bwi_pci.c
+++ b/sys/dev/bwi/if_bwi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/sys/dev/bwi/if_bwireg.h b/sys/dev/bwi/if_bwireg.h
index 67c80cec9615..f376911186af 100644
--- a/sys/dev/bwi/if_bwireg.h
+++ b/sys/dev/bwi/if_bwireg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwi/if_bwivar.h b/sys/dev/bwi/if_bwivar.h
index 46b5d0315b7b..07c20fef2b0c 100644
--- a/sys/dev/bwi/if_bwivar.h
+++ b/sys/dev/bwi/if_bwivar.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 10af0d2193da..5fdc24c938c5 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/bwn/if_bwnreg.h b/sys/dev/bwn/if_bwnreg.h
index b499439f79e4..5bebdef04004 100644
--- a/sys/dev/bwn/if_bwnreg.h
+++ b/sys/dev/bwn/if_bwnreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/bwn/if_bwnvar.h b/sys/dev/bwn/if_bwnvar.h
index 83237453ba68..f4934ead01d2 100644
--- a/sys/dev/bwn/if_bwnvar.h
+++ b/sys/dev/bwn/if_bwnvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/bxe/57710_init_values.c b/sys/dev/bxe/57710_init_values.c
index 7824cfc641b0..500981db061c 100644
--- a/sys/dev/bxe/57710_init_values.c
+++ b/sys/dev/bxe/57710_init_values.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/57710_int_offsets.h b/sys/dev/bxe/57710_int_offsets.h
index 98ed67c1913d..95c32eb8a689 100644
--- a/sys/dev/bxe/57710_int_offsets.h
+++ b/sys/dev/bxe/57710_int_offsets.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/57711_init_values.c b/sys/dev/bxe/57711_init_values.c
index b6bec1d4b636..1cb556e7cdcd 100644
--- a/sys/dev/bxe/57711_init_values.c
+++ b/sys/dev/bxe/57711_init_values.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/57711_int_offsets.h b/sys/dev/bxe/57711_int_offsets.h
index df9378b670c2..bf4d1cdfee8e 100644
--- a/sys/dev/bxe/57711_int_offsets.h
+++ b/sys/dev/bxe/57711_int_offsets.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/57712_init_values.c b/sys/dev/bxe/57712_init_values.c
index 9e730584dae9..772a142f1a58 100644
--- a/sys/dev/bxe/57712_init_values.c
+++ b/sys/dev/bxe/57712_init_values.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/57712_int_offsets.h b/sys/dev/bxe/57712_int_offsets.h
index dcab46d5e6b4..f6593d65704e 100644
--- a/sys/dev/bxe/57712_int_offsets.h
+++ b/sys/dev/bxe/57712_int_offsets.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 03392e001943..cf8cfb66ecc5 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe.h b/sys/dev/bxe/bxe.h
index c63fb1ccbbd0..3c298f2a67c5 100644
--- a/sys/dev/bxe/bxe.h
+++ b/sys/dev/bxe/bxe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_dcb.h b/sys/dev/bxe/bxe_dcb.h
index efd1238a9707..79515e001063 100644
--- a/sys/dev/bxe/bxe_dcb.h
+++ b/sys/dev/bxe/bxe_dcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_debug.c b/sys/dev/bxe/bxe_debug.c
index cd7678d7844e..671d29fb0de5 100644
--- a/sys/dev/bxe/bxe_debug.c
+++ b/sys/dev/bxe/bxe_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_elink.c b/sys/dev/bxe/bxe_elink.c
index bdd8affdb437..e3ad174c43f4 100644
--- a/sys/dev/bxe/bxe_elink.c
+++ b/sys/dev/bxe/bxe_elink.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_elink.h b/sys/dev/bxe/bxe_elink.h
index e5a52a18738a..8a634f0103f6 100644
--- a/sys/dev/bxe/bxe_elink.h
+++ b/sys/dev/bxe/bxe_elink.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_stats.c b/sys/dev/bxe/bxe_stats.c
index c982eb06e00a..249417a45df6 100644
--- a/sys/dev/bxe/bxe_stats.c
+++ b/sys/dev/bxe/bxe_stats.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/bxe_stats.h b/sys/dev/bxe/bxe_stats.h
index 63e98c4159b1..3ae8ad6e2c77 100644
--- a/sys/dev/bxe/bxe_stats.h
+++ b/sys/dev/bxe/bxe_stats.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2014 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_fw_defs.h b/sys/dev/bxe/ecore_fw_defs.h
index 0f05ad32f31e..754e2302c599 100644
--- a/sys/dev/bxe/ecore_fw_defs.h
+++ b/sys/dev/bxe/ecore_fw_defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_hsi.h b/sys/dev/bxe/ecore_hsi.h
index 5048ff5dfc78..a3b4c4b5b9f0 100644
--- a/sys/dev/bxe/ecore_hsi.h
+++ b/sys/dev/bxe/ecore_hsi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_init.h b/sys/dev/bxe/ecore_init.h
index e36514209f98..05c5bf761239 100644
--- a/sys/dev/bxe/ecore_init.h
+++ b/sys/dev/bxe/ecore_init.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_init_ops.h b/sys/dev/bxe/ecore_init_ops.h
index 2409b3370fd9..c5acf8457316 100644
--- a/sys/dev/bxe/ecore_init_ops.h
+++ b/sys/dev/bxe/ecore_init_ops.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_mfw_req.h b/sys/dev/bxe/ecore_mfw_req.h
index 1c1528d08443..6d6d33077b24 100644
--- a/sys/dev/bxe/ecore_mfw_req.h
+++ b/sys/dev/bxe/ecore_mfw_req.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_reg.h b/sys/dev/bxe/ecore_reg.h
index c869defa1777..efe5cde5dbfa 100644
--- a/sys/dev/bxe/ecore_reg.h
+++ b/sys/dev/bxe/ecore_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_sp.c b/sys/dev/bxe/ecore_sp.c
index 566a8dc4382c..10e83016232b 100644
--- a/sys/dev/bxe/ecore_sp.c
+++ b/sys/dev/bxe/ecore_sp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/bxe/ecore_sp.h b/sys/dev/bxe/ecore_sp.h
index bbc6dd9c83a3..10d6c08fbcf9 100644
--- a/sys/dev/bxe/ecore_sp.h
+++ b/sys/dev/bxe/ecore_sp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2007-2017 QLogic Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index a7010b5ac11a..01f4bedc93b6 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2014 Thomas Skibo <thomasskibo@yahoo.com>
* All rights reserved.
*
diff --git a/sys/dev/cadence/if_cgem_hw.h b/sys/dev/cadence/if_cgem_hw.h
index 1569857d9633..30fb6dd3971f 100644
--- a/sys/dev/cadence/if_cgem_hw.h
+++ b/sys/dev/cadence/if_cgem_hw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 74dfbf22cb5a..400475379d96 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008 M. Warner Losh. All Rights Reserved.
* Copyright (c) 2000,2001 Jonathan Chen. All rights reserved.
*
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index e7bf55e013a4..55c4d3594ef3 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008, M. Warner Losh
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index 69020ab8c650..086e4ea2f64f 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/cardbus/cardbus_device.c b/sys/dev/cardbus/cardbus_device.c
index de0a53a93f21..f39ffb08c314 100644
--- a/sys/dev/cardbus/cardbus_device.c
+++ b/sys/dev/cardbus/cardbus_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2008, M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 34ea6bd5f1f3..c0634c87bba0 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 310923655a19..7730ffdb3396 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, M. Warner Losh
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index d6e77dfed21f..554b245260f5 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2001-2003 Thomas Moestl
* Copyright (c) 2007-2009 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/cas/if_casreg.h b/sys/dev/cas/if_casreg.h
index fda2e13b6789..0d1c1d822b9b 100644
--- a/sys/dev/cas/if_casreg.h
+++ b/sys/dev/cas/if_casreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/cas/if_casvar.h b/sys/dev/cas/if_casvar.h
index ff6b6c0bed4b..653572c8b201 100644
--- a/sys/dev/cas/if_casvar.h
+++ b/sys/dev/cas/if_casvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c
index f3ca4dda5352..5b3b06c478f7 100644
--- a/sys/dev/cesa/cesa.c
+++ b/sys/dev/cesa/cesa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2011 Semihalf.
* All rights reserved.
*
diff --git a/sys/dev/cesa/cesa.h b/sys/dev/cesa/cesa.h
index 89571573eafd..e8f6372d02de 100644
--- a/sys/dev/cesa/cesa.h
+++ b/sys/dev/cesa/cesa.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause-FreeBSD
- *
* Copyright (C) 2009-2011 Semihalf.
* All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_api.c b/sys/dev/cfe/cfe_api.c
index cff8bf385592..bf3fa66e895e 100644
--- a/sys/dev/cfe/cfe_api.c
+++ b/sys/dev/cfe/cfe_api.c
@@ -2,8 +2,6 @@
/* from: SiByte Id: cfe_api.c,v 1.16 2002/07/09 23:29:11 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2000, 2001, 2002
* Broadcom Corporation. All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_api.h b/sys/dev/cfe/cfe_api.h
index d12b33a72739..943459dd7164 100644
--- a/sys/dev/cfe/cfe_api.h
+++ b/sys/dev/cfe/cfe_api.h
@@ -2,8 +2,6 @@
/* from: SiByte Id: cfe_api.h,v 1.29 2002/07/09 23:29:11 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2000, 2001, 2002
* Broadcom Corporation. All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_api_int.h b/sys/dev/cfe/cfe_api_int.h
index 087a8235e94b..dfdde478f692 100644
--- a/sys/dev/cfe/cfe_api_int.h
+++ b/sys/dev/cfe/cfe_api_int.h
@@ -2,8 +2,6 @@
/* from: SiByte Id: cfe_api_int.h,v 1.21 2002/07/09 23:29:11 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2000, 2001, 2002
* Broadcom Corporation. All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_console.c b/sys/dev/cfe/cfe_console.c
index 44daa34ebea1..e42f08779596 100644
--- a/sys/dev/cfe/cfe_console.c
+++ b/sys/dev/cfe/cfe_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_env.c b/sys/dev/cfe/cfe_env.c
index 589f751b85d5..9b2a3a306e1c 100644
--- a/sys/dev/cfe/cfe_env.c
+++ b/sys/dev/cfe/cfe_env.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_error.h b/sys/dev/cfe/cfe_error.h
index 8eaf5be8014e..6b57d14c6423 100644
--- a/sys/dev/cfe/cfe_error.h
+++ b/sys/dev/cfe/cfe_error.h
@@ -2,8 +2,6 @@
/* from: SiByte Id: cfe_error.h,v 1.2 2002/07/09 19:37:52 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2000, 2001, 2002
* Broadcom Corporation. All rights reserved.
*
diff --git a/sys/dev/cfe/cfe_ioctl.h b/sys/dev/cfe/cfe_ioctl.h
index 632c3ac71baa..a45ba1d004b8 100644
--- a/sys/dev/cfe/cfe_ioctl.h
+++ b/sys/dev/cfe/cfe_ioctl.h
@@ -1,15 +1,14 @@
+/* $NetBSD: cfe_ioctl.h,v 1.2 2003/02/07 17:52:08 cgd Exp $ */
+
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright 2000, 2001, 2002, 2003
+ * Copyright 2000, 2001
* Broadcom Corporation. All rights reserved.
*
- * This software is furnished under license and may be used and
- * copied only in accordance with the following terms and
- * conditions. Subject to these conditions, you may download,
- * copy, install, use, modify and distribute modified or unmodified
- * copies of this software in source and/or binary form. No title
- * or ownership is transferred hereby.
+ * This software is furnished under license and may be used and copied only
+ * in accordance with the following terms and conditions. Subject to these
+ * conditions, you may download, copy, install, use, modify and distribute
+ * modified or unmodified copies of this software in source and/or binary
+ * form. No title or ownership is transferred hereby.
*
* 1) Any source code used, modified or distributed must reproduce and
* retain this copyright notice and list of conditions as they appear in
@@ -42,7 +41,7 @@
*
* IOCTL function numbers and I/O data structures.
*
- * Author: Mitch Lichtenberg
+ * Author: Mitch Lichtenberg (mpl@broadcom.com)
*
********************************************************************* */
@@ -54,115 +53,23 @@
#define IOCTL_NVRAM_GETINFO 1 /* return nvram_info_t */
#define IOCTL_NVRAM_ERASE 2 /* erase sector containing nvram_info_t area */
#define IOCTL_FLASH_ERASE_SECTOR 3 /* erase an arbitrary sector */
-#define IOCTL_FLASH_ERASE_ALL 4 /* Erase the entire flash */
-#define IOCTL_FLASH_WRITE_ALL 5 /* write entire flash */
-#define IOCTL_FLASH_GETINFO 6 /* get flash device info */
-#define IOCTL_FLASH_GETSECTORS 7 /* get sector information */
-#define IOCTL_FLASH_ERASE_RANGE 8 /* erase range of bytes */
-#define IOCTL_NVRAM_UNLOCK 9 /* allow r/w beyond logical end of device */
-#define IOCTL_FLASH_PROTECT_RANGE 10 /* Protect a group of sectors */
-#define IOCTL_FLASH_UNPROTECT_RANGE 11 /* unprotect a group of sectors */
-#define IOCTL_FLASH_DATA_WIDTH_MODE 12 /* switch flash and gen bus to support 8 or 16-bit mode I/Os */
-#define IOCTL_FLASH_BURST_MODE 13 /* configure gen bus for burst mode */
-
-typedef struct flash_range_s {
- unsigned int range_base;
- unsigned int range_length;
-} flash_range_t;
-
-typedef struct flash_info_s {
- unsigned long long flash_base; /* flash physical base address */
- unsigned int flash_size; /* available device size in bytes */
- unsigned int flash_type; /* type, from FLASH_TYPE below */
- unsigned int flash_flags; /* Various flags (FLASH_FLAG_xxx) */
-} flash_info_t;
-
-typedef struct flash_sector_s {
- int flash_sector_idx;
- int flash_sector_status;
- unsigned int flash_sector_offset;
- unsigned int flash_sector_size;
-} flash_sector_t;
-
-#define FLASH_SECTOR_OK 0
-#define FLASH_SECTOR_INVALID -1
-
-#define FLASH_TYPE_UNKNOWN 0 /* not sure what kind of flash */
-#define FLASH_TYPE_SRAM 1 /* not flash: it's SRAM */
-#define FLASH_TYPE_ROM 2 /* not flash: it's ROM */
-#define FLASH_TYPE_FLASH 3 /* it's flash memory of some sort */
-
-#define FLASH_FLAG_NOERASE 1 /* Byte-range writes supported,
- Erasing is not necessary */
+#define IOCTL_FLASH_ERASE_ALL 4 /* Erase the entire flash */
typedef struct nvram_info_s {
- int nvram_offset; /* offset of environment area */
- int nvram_size; /* size of environment area */
- int nvram_eraseflg; /* true if we need to erase first */
+ int nvram_offset; /* offset of environment area */
+ int nvram_size; /* size of environment area */
+ int nvram_eraseflg; /* true if we need to erase first */
} nvram_info_t;
/* *********************************************************************
* Ethernet stuff
********************************************************************* */
-#define IOCTL_ETHER_GETHWADDR 1 /* Get hardware address (6bytes) */
-#define IOCTL_ETHER_SETHWADDR 2 /* Set hardware address (6bytes) */
-#define IOCTL_ETHER_GETSPEED 3 /* Get Speed and Media (int) */
-#define IOCTL_ETHER_SETSPEED 4 /* Set Speed and Media (int) */
-#define IOCTL_ETHER_GETLINK 5 /* get link status (int) */
-#define IOCTL_ETHER_GETLOOPBACK 7 /* get loopback state */
-#define IOCTL_ETHER_SETLOOPBACK 8 /* set loopback state */
-#define IOCTL_ETHER_SETPACKETFIFO 9 /* set packet fifo mode (int) */
-#define IOCTL_ETHER_SETSTROBESIG 10 /* set strobe signal (int) */
-
-#define ETHER_LOOPBACK_OFF 0 /* no loopback */
-#define ETHER_LOOPBACK_INT 1 /* Internal loopback */
-#define ETHER_LOOPBACK_EXT 2 /* External loopback (through PHY) */
-
-#define ETHER_SPEED_AUTO 0 /* Auto detect */
-#define ETHER_SPEED_UNKNOWN 0 /* Speed not known (on link status) */
-#define ETHER_SPEED_10HDX 1 /* 10MB hdx and fdx */
-#define ETHER_SPEED_10FDX 2
-#define ETHER_SPEED_100HDX 3 /* 100MB hdx and fdx */
-#define ETHER_SPEED_100FDX 4
-#define ETHER_SPEED_1000HDX 5 /* 1000MB hdx and fdx */
-#define ETHER_SPEED_1000FDX 6
-
-#define ETHER_FIFO_8 0 /* 8-bit packet fifo mode */
-#define ETHER_FIFO_16 1 /* 16-bit packet fifo mode */
-#define ETHER_ETHER 2 /* Standard ethernet mode */
-
-#define ETHER_STROBE_GMII 0 /* GMII style strobe signal */
-#define ETHER_STROBE_ENCODED 1 /* Encoded */
-#define ETHER_STROBE_SOP 2 /* SOP flagged. Only in 8-bit mode*/
-#define ETHER_STROBE_EOP 3 /* EOP flagged. Only in 8-bit mode*/
-
-/* *********************************************************************
- * Serial Ports
- ********************************************************************* */
-
-#define IOCTL_SERIAL_SETSPEED 1 /* get baud rate (int) */
-#define IOCTL_SERIAL_GETSPEED 2 /* set baud rate (int) */
-#define IOCTL_SERIAL_SETFLOW 3 /* Set Flow Control */
-#define IOCTL_SERIAL_GETFLOW 4 /* Get Flow Control */
-
-#define SERIAL_FLOW_NONE 0 /* no flow control */
-#define SERIAL_FLOW_SOFTWARE 1 /* software flow control (not impl) */
-#define SERIAL_FLOW_HARDWARE 2 /* hardware flow control */
+#define IOCTL_ETHER_GETHWADDR 1
/* *********************************************************************
* Block device stuff
********************************************************************* */
-#define IOCTL_BLOCK_GETBLOCKSIZE 1 /* get block size (int) */
-#define IOCTL_BLOCK_GETTOTALBLOCKS 2 /* get total bocks (long long) */
-#define IOCTL_BLOCK_GETDEVTYPE 3 /* get device type (struct) */
-
-typedef struct blockdev_info_s {
- unsigned long long blkdev_totalblocks;
- unsigned int blkdev_blocksize;
- unsigned int blkdev_devtype;
-} blockdev_info_t;
-
-#define BLOCK_DEVTYPE_DISK 0
-#define BLOCK_DEVTYPE_CDROM 1
+#define IOCTL_BLOCK_GETBLOCKSIZE 1
+#define IOCTL_BLOCK_GETTOTALBLOCKS 2
diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c
index 4c07d4e4d2ad..02581fc5831e 100644
--- a/sys/dev/cfe/cfe_resource.c
+++ b/sys/dev/cfe/cfe_resource.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/dev/cfi/cfi_bus_fdt.c b/sys/dev/cfi/cfi_bus_fdt.c
index 6e275b29106d..ad0632626506 100644
--- a/sys/dev/cfi/cfi_bus_fdt.c
+++ b/sys/dev/cfi/cfi_bus_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cfi/cfi_bus_ixp4xx.c b/sys/dev/cfi/cfi_bus_ixp4xx.c
index dd74f3f4ed0a..93d03fe0272b 100644
--- a/sys/dev/cfi/cfi_bus_ixp4xx.c
+++ b/sys/dev/cfi/cfi_bus_ixp4xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Roelof Jonkman, Carlson Wireless Inc.
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_bus_nexus.c b/sys/dev/cfi/cfi_bus_nexus.c
index 6620a34acb39..a87ee143dbe5 100644
--- a/sys/dev/cfi/cfi_bus_nexus.c
+++ b/sys/dev/cfi/cfi_bus_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 SRI International
* Copyright (c) 2009 Roelof Jonkman, Carlson Wireless Inc.
* Copyright (c) 2009 Sam Leffler, Errno Consulting
diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c
index 408fbd9c2d1c..d292e1a4188b 100644
--- a/sys/dev/cfi/cfi_core.c
+++ b/sys/dev/cfi/cfi_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* Copyright (c) 2012-2013, SRI International
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_dev.c b/sys/dev/cfi/cfi_dev.c
index 1c812a49cb31..7d1f92bed7da 100644
--- a/sys/dev/cfi/cfi_dev.c
+++ b/sys/dev/cfi/cfi_dev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* Copyright (c) 2012-2013, SRI International
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_disk.c b/sys/dev/cfi/cfi_disk.c
index c09946634b08..79807225d141 100644
--- a/sys/dev/cfi/cfi_disk.c
+++ b/sys/dev/cfi/cfi_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* Copyright (c) 2012-2013, SRI International
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_reg.h b/sys/dev/cfi/cfi_reg.h
index 60d8a3a9290d..c810e3f7448d 100644
--- a/sys/dev/cfi/cfi_reg.h
+++ b/sys/dev/cfi/cfi_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* Copyright (c) 2012-2013, SRI International
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_var.h b/sys/dev/cfi/cfi_var.h
index 8c83782e874c..e218a4dd5d65 100644
--- a/sys/dev/cfi/cfi_var.h
+++ b/sys/dev/cfi/cfi_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* Copyright (c) 2012-2013, SRI International
* All rights reserved.
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 5d797a626e33..41d1fdefc3d4 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Michael Smith
* Copyright (c) 2004 Paul Saab
* All rights reserved.
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index 149ae3fe364a..fba677d6679e 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 56d19d104542..bd85942925e2 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index 1412ababcd53..20693af7c6dd 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 17484f95a9f8..09083743ea1c 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index dd3bc401851a..e05f9ee58b8c 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cm/smc90cx6reg.h b/sys/dev/cm/smc90cx6reg.h
index 6e7d5a5b4af8..2fec634db496 100644
--- a/sys/dev/cm/smc90cx6reg.h
+++ b/sys/dev/cm/smc90cx6reg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cm/smc90cx6var.h b/sys/dev/cm/smc90cx6var.h
index cd8afdaa4ce1..f3fd24d7a4a5 100644
--- a/sys/dev/cm/smc90cx6var.h
+++ b/sys/dev/cm/smc90cx6var.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cmx/cmx_pccard.c b/sys/dev/cmx/cmx_pccard.c
index 43215fd6df94..89411e503289 100644
--- a/sys/dev/cmx/cmx_pccard.c
+++ b/sys/dev/cmx/cmx_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2007 Daniel Roethlisberger <daniel@roe.ch>
* All rights reserved.
*
diff --git a/sys/dev/cmx/cmxreg.h b/sys/dev/cmx/cmxreg.h
index 064dbaa508e1..a96a662d9709 100644
--- a/sys/dev/cmx/cmxreg.h
+++ b/sys/dev/cmx/cmxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2007 Daniel Roethlisberger <daniel@roe.ch>
* Copyright (c) 2000-2004 OMNIKEY GmbH (www.omnikey.com)
* All rights reserved.
diff --git a/sys/dev/cmx/cmxvar.h b/sys/dev/cmx/cmxvar.h
index 76222a53ad1a..1567c5eb00a7 100644
--- a/sys/dev/cmx/cmxvar.h
+++ b/sys/dev/cmx/cmxvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2007 Daniel Roethlisberger <daniel@roe.ch>
* All rights reserved.
*
diff --git a/sys/dev/coretemp/coretemp.c b/sys/dev/coretemp/coretemp.c
index 099d8a07495b..38f07fbbfa5b 100644
--- a/sys/dev/coretemp/coretemp.c
+++ b/sys/dev/coretemp/coretemp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/cpuctl/cpuctl.c b/sys/dev/cpuctl/cpuctl.c
index 48c59ad17bde..da7b34e5cc77 100644
--- a/sys/dev/cpuctl/cpuctl.c
+++ b/sys/dev/cpuctl/cpuctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index 3d0c09e06640..101b5765800e 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 Nate Lawson (SDG)
* All rights reserved.
*
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index b0b988f9972a..2756aec1d598 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 55446238875f..20b74046019e 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 260e81bd79fb..645fbddc58cf 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index 8eea27322d17..7ffe27602697 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index c49af45bb5ad..1765f9f7cab3 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/cxgb/bin2h.pl b/sys/dev/cxgb/bin2h.pl
index 3bdaa3437bfb..1fdc44f5f495 100644
--- a/sys/dev/cxgb/bin2h.pl
+++ b/sys/dev/cxgb/bin2h.pl
@@ -22,8 +22,6 @@ unless ($success) {
my $license = <<END;
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
-
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_ael1002.c b/sys/dev/cxgb/common/cxgb_ael1002.c
index 33814cf4285b..e1a3fbe9e58d 100644
--- a/sys/dev/cxgb/common/cxgb_ael1002.c
+++ b/sys/dev/cxgb/common/cxgb_ael1002.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_aq100x.c b/sys/dev/cxgb/common/cxgb_aq100x.c
index 78a76b2cc47c..b253e670e588 100644
--- a/sys/dev/cxgb/common/cxgb_aq100x.c
+++ b/sys/dev/cxgb/common/cxgb_aq100x.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h
index 2653bbe00c9f..32f0a9358e5d 100644
--- a/sys/dev/cxgb/common/cxgb_common.h
+++ b/sys/dev/cxgb/common/cxgb_common.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h
index 677ac0df998f..55c507852c9a 100644
--- a/sys/dev/cxgb/common/cxgb_firmware_exports.h
+++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_mc5.c b/sys/dev/cxgb/common/cxgb_mc5.c
index 54960ca23e50..5a62f125b035 100644
--- a/sys/dev/cxgb/common/cxgb_mc5.c
+++ b/sys/dev/cxgb/common/cxgb_mc5.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
index c905f1c0fc3e..4093aa706590 100644
--- a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
+++ b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h
index ab809b47d93a..644fa26a3395 100644
--- a/sys/dev/cxgb/common/cxgb_regs.h
+++ b/sys/dev/cxgb/common/cxgb_regs.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h
index e03b73bf8341..2aae7f894e39 100644
--- a/sys/dev/cxgb/common/cxgb_sge_defs.h
+++ b/sys/dev/cxgb/common/cxgb_sge_defs.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h
index 8b9ce796217f..b1dd56409419 100644
--- a/sys/dev/cxgb/common/cxgb_t3_cpl.h
+++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c
index 71893231f457..33e308e675a7 100644
--- a/sys/dev/cxgb/common/cxgb_t3_hw.c
+++ b/sys/dev/cxgb/common/cxgb_t3_hw.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h
index ebd02beb1b3d..7785466823dd 100644
--- a/sys/dev/cxgb/common/cxgb_tcb.h
+++ b/sys/dev/cxgb/common/cxgb_tcb.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_tn1010.c b/sys/dev/cxgb/common/cxgb_tn1010.c
index a4ec3c74dd05..1e8bf0b647da 100644
--- a/sys/dev/cxgb/common/cxgb_tn1010.c
+++ b/sys/dev/cxgb/common/cxgb_tn1010.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_vsc7323.c b/sys/dev/cxgb/common/cxgb_vsc7323.c
index 22926b77fda2..bfe152952b74 100644
--- a/sys/dev/cxgb/common/cxgb_vsc7323.c
+++ b/sys/dev/cxgb/common/cxgb_vsc7323.c
@@ -1,5 +1,5 @@
+
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_vsc8211.c b/sys/dev/cxgb/common/cxgb_vsc8211.c
index 5d3c551e0a4f..4928e4a83204 100644
--- a/sys/dev/cxgb/common/cxgb_vsc8211.c
+++ b/sys/dev/cxgb/common/cxgb_vsc8211.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_xgmac.c b/sys/dev/cxgb/common/cxgb_xgmac.c
index 1dedc37f6f50..ea4230e62d3f 100644
--- a/sys/dev/cxgb/common/cxgb_xgmac.c
+++ b/sys/dev/cxgb/common/cxgb_xgmac.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index e1d27de4af9d..08ca6c1129b6 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h
index e4db0ee0453e..3f3ac5a1866c 100644
--- a/sys/dev/cxgb/cxgb_ioctl.h
+++ b/sys/dev/cxgb/cxgb_ioctl.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index a9944d035308..f203e246c2f0 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index d3733752f530..364ab43efc8d 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index 5accbf5e4629..9aef0a3acba2 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index cf6ec7a52481..9981d00ae8cf 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h
index f5e5d949407c..1f81c97879ee 100644
--- a/sys/dev/cxgb/cxgb_t3fw.h
+++ b/sys/dev/cxgb/cxgb_t3fw.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/sys/mvec.h b/sys/dev/cxgb/sys/mvec.h
index bdd0b55c5489..dff6f03ba592 100644
--- a/sys/dev/cxgb/sys/mvec.h
+++ b/sys/dev/cxgb/sys/mvec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007, 2009 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index ca31cf1897c7..b535d13e4dd3 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/cxgb/t3b_protocol_sram.h b/sys/dev/cxgb/t3b_protocol_sram.h
index 65936a0cbf5e..b476be2d3ccb 100644
--- a/sys/dev/cxgb/t3b_protocol_sram.h
+++ b/sys/dev/cxgb/t3b_protocol_sram.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3b_tp_eeprom.h b/sys/dev/cxgb/t3b_tp_eeprom.h
index e073dee31575..8b47bdba1ec2 100644
--- a/sys/dev/cxgb/t3b_tp_eeprom.h
+++ b/sys/dev/cxgb/t3b_tp_eeprom.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3c_protocol_sram.h b/sys/dev/cxgb/t3c_protocol_sram.h
index 43a11d8b1559..1fe84748144f 100644
--- a/sys/dev/cxgb/t3c_protocol_sram.h
+++ b/sys/dev/cxgb/t3c_protocol_sram.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3c_tp_eeprom.h b/sys/dev/cxgb/t3c_tp_eeprom.h
index bbb322d7d44d..544472ebcfa0 100644
--- a/sys/dev/cxgb/t3c_tp_eeprom.h
+++ b/sys/dev/cxgb/t3c_tp_eeprom.h
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index fc2e370d68d7..27b3ad99708e 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index aa7806876793..902f81cbae43 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 70b2e46d3591..ea196764f729 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_hw.h b/sys/dev/cxgbe/common/t4_hw.h
index 4458840cdd56..f97c7a0889f5 100644
--- a/sys/dev/cxgbe/common/t4_hw.h
+++ b/sys/dev/cxgbe/common/t4_hw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_msg.h b/sys/dev/cxgbe/common/t4_msg.h
index c3e3ef7c76dd..f15c3a89a56a 100644
--- a/sys/dev/cxgbe/common/t4_msg.h
+++ b/sys/dev/cxgbe/common/t4_msg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_regs.h b/sys/dev/cxgbe/common/t4_regs.h
index c15a5b0b959c..56793b245575 100644
--- a/sys/dev/cxgbe/common/t4_regs.h
+++ b/sys/dev/cxgbe/common/t4_regs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_regs_values.h b/sys/dev/cxgbe/common/t4_regs_values.h
index b20de2683da5..bb1f61f3b20f 100644
--- a/sys/dev/cxgbe/common/t4_regs_values.h
+++ b/sys/dev/cxgbe/common/t4_regs_values.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/common/t4_tcb.h b/sys/dev/cxgbe/common/t4_tcb.h
index 89612b3d3c62..a09b13b50bb8 100644
--- a/sys/dev/cxgbe/common/t4_tcb.h
+++ b/sys/dev/cxgbe/common/t4_tcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c
index 365b1fc2f921..2d94dc3be4bf 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/cq.c b/sys/dev/cxgbe/iw_cxgbe/cq.c
index ae2337992619..68f41883d7cf 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cq.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c
index 0314043f807b..3c51abc2f674 100644
--- a/sys/dev/cxgbe/iw_cxgbe/device.c
+++ b/sys/dev/cxgbe/iw_cxgbe/device.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/ev.c b/sys/dev/cxgbe/iw_cxgbe/ev.c
index 7c42354644e0..f4ea0c751ad4 100644
--- a/sys/dev/cxgbe/iw_cxgbe/ev.c
+++ b/sys/dev/cxgbe/iw_cxgbe/ev.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/id_table.c b/sys/dev/cxgbe/iw_cxgbe/id_table.c
index 64ffdedf7ba5..6fab5dc8eb41 100644
--- a/sys/dev/cxgbe/iw_cxgbe/id_table.c
+++ b/sys/dev/cxgbe/iw_cxgbe/id_table.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Chelsio Communications. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
index afd301e714d3..c74133ac2433 100644
--- a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
+++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c
index e7e681677f70..27bd902a9640 100644
--- a/sys/dev/cxgbe/iw_cxgbe/mem.c
+++ b/sys/dev/cxgbe/iw_cxgbe/mem.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/provider.c b/sys/dev/cxgbe/iw_cxgbe/provider.c
index 9181bfca9764..0cc698a7e38f 100644
--- a/sys/dev/cxgbe/iw_cxgbe/provider.c
+++ b/sys/dev/cxgbe/iw_cxgbe/provider.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c
index 8de70cb15087..6c743d87c79a 100644
--- a/sys/dev/cxgbe/iw_cxgbe/qp.c
+++ b/sys/dev/cxgbe/iw_cxgbe/qp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/resource.c b/sys/dev/cxgbe/iw_cxgbe/resource.c
index 42591f98717b..ac0eef502498 100644
--- a/sys/dev/cxgbe/iw_cxgbe/resource.c
+++ b/sys/dev/cxgbe/iw_cxgbe/resource.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/t4.h b/sys/dev/cxgbe/iw_cxgbe/t4.h
index 8900e2a3a1b3..3e0d7a638e1f 100644
--- a/sys/dev/cxgbe/iw_cxgbe/t4.h
+++ b/sys/dev/cxgbe/iw_cxgbe/t4.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/iw_cxgbe/user.h b/sys/dev/cxgbe/iw_cxgbe/user.h
index 9f5777f6d5aa..d42f659771ae 100644
--- a/sys/dev/cxgbe/iw_cxgbe/user.h
+++ b/sys/dev/cxgbe/iw_cxgbe/user.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h
index 570ba7bcdcca..3eefc3b08c63 100644
--- a/sys/dev/cxgbe/offload.h
+++ b/sys/dev/cxgbe/offload.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/osdep.h b/sys/dev/cxgbe/osdep.h
index f6d065ac38eb..6fd704b08ec6 100644
--- a/sys/dev/cxgbe/osdep.h
+++ b/sys/dev/cxgbe/osdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/t4_ioctl.h b/sys/dev/cxgbe/t4_ioctl.h
index 8fa92935c62b..20a686da41ca 100644
--- a/sys/dev/cxgbe/t4_ioctl.h
+++ b/sys/dev/cxgbe/t4_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c
index 11f5331e3441..b4b1ee4d312d 100644
--- a/sys/dev/cxgbe/t4_l2t.c
+++ b/sys/dev/cxgbe/t4_l2t.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h
index 32758a884df0..2d861dc9a2fd 100644
--- a/sys/dev/cxgbe/t4_l2t.h
+++ b/sys/dev/cxgbe/t4_l2t.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index c530e60ee5cf..62f08d5c324a 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 0a44ee068f57..1ce743027fb6 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c
index 035c7b029d8f..59096bc31ec0 100644
--- a/sys/dev/cxgbe/t4_tracer.c
+++ b/sys/dev/cxgbe/t4_tracer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c
index 0924089f6b3f..b1acd5a58be8 100644
--- a/sys/dev/cxgbe/tom/t4_connect.c
+++ b/sys/dev/cxgbe/tom/t4_connect.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index 51c571501568..13fd8fda8055 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2015 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c
index efcc1747d4f5..25bc3014a6ab 100644
--- a/sys/dev/cxgbe/tom/t4_ddp.c
+++ b/sys/dev/cxgbe/tom/t4_ddp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c
index 52fe55b8f394..100e3027a13e 100644
--- a/sys/dev/cxgbe/tom/t4_listen.c
+++ b/sys/dev/cxgbe/tom/t4_listen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index 61d18cb8e73b..8cd77e6ead9e 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h
index 881dadbc4323..23519f0ad43f 100644
--- a/sys/dev/cxgbe/tom/t4_tom.h
+++ b/sys/dev/cxgbe/tom/t4_tom.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2015 Chelsio Communications, Inc.
* All rights reserved.
* Written by: Navdeep Parhar <np@FreeBSD.org>
diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c
index 231a4669e810..f89df02e1000 100644
--- a/sys/dev/cxgbe/tom/t4_tom_l2t.c
+++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.h b/sys/dev/cxgbe/tom/t4_tom_l2t.h
index dc8e04d8d978..9a7fb39fbd79 100644
--- a/sys/dev/cxgbe/tom/t4_tom_l2t.h
+++ b/sys/dev/cxgbe/tom/t4_tom_l2t.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 2d4663bee492..ad4fa145cf7e 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -2,8 +2,6 @@
* cyclades cyclom-y serial driver
* Andrew Herbert <andrew@werple.apana.org.au>, 17 August 1993
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Andrew Herbert.
* All rights reserved.
*
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index a53da4fc33e6..448cc033dcb0 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -2,8 +2,6 @@
* cyclades cyclom-y serial driver
* Andrew Herbert <andrew@werple.apana.org.au>, 17 August 1993
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Andrew Herbert.
* All rights reserved.
*
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 4bd833e27b19..3f9a1826f6b5 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index bb29064b471e..88a36eb4a65e 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce Evans.
* All rights reserved.
*
diff --git a/sys/dev/cy/cyvar.h b/sys/dev/cy/cyvar.h
index 0289ecba4f3e..6b770e8761fa 100644
--- a/sys/dev/cy/cyvar.h
+++ b/sys/dev/cy/cyvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Bruce D. Evans
* All rights reserved.
*
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 8b28d462a5b3..f96a9b360bb2 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index dba0f642906e..421e326d256c 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/if_dcreg.h b/sys/dev/dc/if_dcreg.h
index 9ae26cc6e59f..e290881fa017 100644
--- a/sys/dev/dc/if_dcreg.h
+++ b/sys/dev/dc/if_dcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index f2da30cc6cf0..f8d31de782ef 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index 07dda2940621..da5183e15cd3 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index c7ade863b6ef..e613f5bbe51d 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index 1fa7dcb92efe..cb206752be9f 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 3b17ffeaa5c4..01e61663e5b0 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index 7421b4734d78..bd6dfeff8009 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/de/dc21040reg.h b/sys/dev/de/dc21040reg.h
index 2d32950f78c5..d94eca623fb5 100644
--- a/sys/dev/de/dc21040reg.h
+++ b/sys/dev/de/dc21040reg.h
@@ -3,8 +3,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 0393bc5d1e81..68542d7006d1 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,7 +1,5 @@
/* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
* All rights reserved.
*
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index c2aeeb2b843d..e3e364d02575 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -3,8 +3,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
* All rights reserved.
*
diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c
index 45f1f6f9b713..fdfed2f6cedd 100644
--- a/sys/dev/dpms/dpms.c
+++ b/sys/dev/dpms/dpms.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 4e7ccc13407d..6c0e341db475 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
*
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 15a097e61b2f..f547a2214156 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index f9405c222b30..e3330cf11c30 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
*
diff --git a/sys/dev/drm2/drm_gem.c b/sys/dev/drm2/drm_gem.c
index 47d363a811ad..aaf99628c166 100644
--- a/sys/dev/drm2/drm_gem.c
+++ b/sys/dev/drm2/drm_gem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/drm2/drm_gem_names.c b/sys/dev/drm2/drm_gem_names.c
index 6b0046fc042e..8e47531e0439 100644
--- a/sys/dev/drm2/drm_gem_names.c
+++ b/sys/dev/drm2/drm_gem_names.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/drm2/drm_gem_names.h b/sys/dev/drm2/drm_gem_names.h
index bb97c0797f74..08f6fa470786 100644
--- a/sys/dev/drm2/drm_gem_names.h
+++ b/sys/dev/drm2/drm_gem_names.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/drm2/drm_linux_list_sort.c b/sys/dev/drm2/drm_linux_list_sort.c
index bd7085e2a86d..19c5c9ecc8ed 100644
--- a/sys/dev/drm2/drm_linux_list_sort.c
+++ b/sys/dev/drm2/drm_linux_list_sort.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c
index 4470c921c08e..40d432ce73f1 100644
--- a/sys/dev/drm2/i915/i915_gem.c
+++ b/sys/dev/drm2/i915/i915_gem.c
@@ -23,8 +23,6 @@
* Authors:
* Eric Anholt <eric@anholt.net>
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/e1000/e1000_80003es2lan.c b/sys/dev/e1000/e1000_80003es2lan.c
index 500d338e5133..e7c42d5386eb 100644
--- a/sys/dev/e1000/e1000_80003es2lan.c
+++ b/sys/dev/e1000/e1000_80003es2lan.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_80003es2lan.h b/sys/dev/e1000/e1000_80003es2lan.h
index cbf0eafa9407..89b15512bf82 100644
--- a/sys/dev/e1000/e1000_80003es2lan.h
+++ b/sys/dev/e1000/e1000_80003es2lan.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82540.c b/sys/dev/e1000/e1000_82540.c
index d90c8f9b73f1..2d03b8ff8e3f 100644
--- a/sys/dev/e1000/e1000_82540.c
+++ b/sys/dev/e1000/e1000_82540.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82541.c b/sys/dev/e1000/e1000_82541.c
index 04f3b356b6f1..55d51087b7b3 100644
--- a/sys/dev/e1000/e1000_82541.c
+++ b/sys/dev/e1000/e1000_82541.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82541.h b/sys/dev/e1000/e1000_82541.h
index ce29548a4d85..7a01fd43ad60 100644
--- a/sys/dev/e1000/e1000_82541.h
+++ b/sys/dev/e1000/e1000_82541.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82542.c b/sys/dev/e1000/e1000_82542.c
index 57deeb87a089..4cca9b2b2c61 100644
--- a/sys/dev/e1000/e1000_82542.c
+++ b/sys/dev/e1000/e1000_82542.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82543.c b/sys/dev/e1000/e1000_82543.c
index 48ad49294f31..ddfc2569116f 100644
--- a/sys/dev/e1000/e1000_82543.c
+++ b/sys/dev/e1000/e1000_82543.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82543.h b/sys/dev/e1000/e1000_82543.h
index 98289524f6d8..e8edda5d2b34 100644
--- a/sys/dev/e1000/e1000_82543.h
+++ b/sys/dev/e1000/e1000_82543.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c
index b173cd072edf..5ff17f098a21 100644
--- a/sys/dev/e1000/e1000_82571.c
+++ b/sys/dev/e1000/e1000_82571.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82571.h b/sys/dev/e1000/e1000_82571.h
index a39f63c53e2d..8e5ca56ae88c 100644
--- a/sys/dev/e1000/e1000_82571.h
+++ b/sys/dev/e1000/e1000_82571.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c
index 085196510645..5d68e8b9718c 100644
--- a/sys/dev/e1000/e1000_82575.c
+++ b/sys/dev/e1000/e1000_82575.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_82575.h b/sys/dev/e1000/e1000_82575.h
index 7e127ed79dbc..f81795605c01 100644
--- a/sys/dev/e1000/e1000_82575.h
+++ b/sys/dev/e1000/e1000_82575.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c
index cd82607c2433..52e260950d24 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_api.h b/sys/dev/e1000/e1000_api.h
index bf5f637cb3dd..074197bfe851 100644
--- a/sys/dev/e1000/e1000_api.h
+++ b/sys/dev/e1000/e1000_api.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h
index db7659e8d04f..4c2b09038551 100644
--- a/sys/dev/e1000/e1000_defines.h
+++ b/sys/dev/e1000/e1000_defines.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h
index 82e783fe93e5..e1464a7b655a 100644
--- a/sys/dev/e1000/e1000_hw.h
+++ b/sys/dev/e1000/e1000_hw.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index 13976b6d1dc7..cd8d7c7e1f56 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_i210.h b/sys/dev/e1000/e1000_i210.h
index c08a0dd7a581..f940915b0619 100644
--- a/sys/dev/e1000/e1000_i210.h
+++ b/sys/dev/e1000/e1000_i210.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c
index 7b6144a74a57..0d8485ff3fa0 100644
--- a/sys/dev/e1000/e1000_ich8lan.c
+++ b/sys/dev/e1000/e1000_ich8lan.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_ich8lan.h b/sys/dev/e1000/e1000_ich8lan.h
index d61f4df8ca66..6d812911e8b8 100644
--- a/sys/dev/e1000/e1000_ich8lan.h
+++ b/sys/dev/e1000/e1000_ich8lan.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c
index 100000976b1c..1c863073f082 100644
--- a/sys/dev/e1000/e1000_mac.c
+++ b/sys/dev/e1000/e1000_mac.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_mac.h b/sys/dev/e1000/e1000_mac.h
index cb8da2461800..ef9789bbb537 100644
--- a/sys/dev/e1000/e1000_mac.h
+++ b/sys/dev/e1000/e1000_mac.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c
index 5bf4b15acfa5..f8290a22fa9f 100644
--- a/sys/dev/e1000/e1000_manage.c
+++ b/sys/dev/e1000/e1000_manage.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_manage.h b/sys/dev/e1000/e1000_manage.h
index 2ef2e3a496a6..303e99e32141 100644
--- a/sys/dev/e1000/e1000_manage.h
+++ b/sys/dev/e1000/e1000_manage.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_mbx.c b/sys/dev/e1000/e1000_mbx.c
index 73694832c98f..34649bf739bd 100644
--- a/sys/dev/e1000/e1000_mbx.c
+++ b/sys/dev/e1000/e1000_mbx.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_mbx.h b/sys/dev/e1000/e1000_mbx.h
index f0b21992b249..fadd8494f5ed 100644
--- a/sys/dev/e1000/e1000_mbx.h
+++ b/sys/dev/e1000/e1000_mbx.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_nvm.c b/sys/dev/e1000/e1000_nvm.c
index 119cdc38199e..0a1a18d4a973 100644
--- a/sys/dev/e1000/e1000_nvm.c
+++ b/sys/dev/e1000/e1000_nvm.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_nvm.h b/sys/dev/e1000/e1000_nvm.h
index 4f40f9ae291b..64a4083eb209 100644
--- a/sys/dev/e1000/e1000_nvm.h
+++ b/sys/dev/e1000/e1000_nvm.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_osdep.c b/sys/dev/e1000/e1000_osdep.c
index 4d4347c143d5..2987cda07170 100644
--- a/sys/dev/e1000/e1000_osdep.c
+++ b/sys/dev/e1000/e1000_osdep.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index b126a7586660..c0bf4182ec62 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c
index 4396bd0a4236..9684b43f5503 100644
--- a/sys/dev/e1000/e1000_phy.c
+++ b/sys/dev/e1000/e1000_phy.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_phy.h b/sys/dev/e1000/e1000_phy.h
index 6d0687fc658d..d3d563f71e31 100644
--- a/sys/dev/e1000/e1000_phy.h
+++ b/sys/dev/e1000/e1000_phy.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_regs.h b/sys/dev/e1000/e1000_regs.h
index d99498174158..37d701722da1 100644
--- a/sys/dev/e1000/e1000_regs.h
+++ b/sys/dev/e1000/e1000_regs.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_vf.c b/sys/dev/e1000/e1000_vf.c
index 049477c601d6..4af985b87b9b 100644
--- a/sys/dev/e1000/e1000_vf.c
+++ b/sys/dev/e1000/e1000_vf.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/e1000_vf.h b/sys/dev/e1000/e1000_vf.h
index 9c76b6320153..e6f834e78abf 100644
--- a/sys/dev/e1000/e1000_vf.h
+++ b/sys/dev/e1000/e1000_vf.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 7ee015d01255..036de0eb24e8 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -1,29 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2016 Matt Macy <mmacy@nextbsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+/******************************************************************************
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index ee2b16214509..b6c816424188 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -1,29 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2016 Matt Macy <mmacy@nextbsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+/******************************************************************************
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ed/ax88x90reg.h b/sys/dev/ed/ax88x90reg.h
index 245d0784f5fc..d28d5aa6c9e2 100644
--- a/sys/dev/ed/ax88x90reg.h
+++ b/sys/dev/ed/ax88x90reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/ed/dl100xxreg.h b/sys/dev/ed/dl100xxreg.h
index 69870c2aedf1..3b9f1c9fac52 100644
--- a/sys/dev/ed/dl100xxreg.h
+++ b/sys/dev/ed/dl100xxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 696da5745d11..0730c964df08 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed_3c503.c b/sys/dev/ed/if_ed_3c503.c
index c7ff8edf448c..bcb9e44a94ca 100644
--- a/sys/dev/ed/if_ed_3c503.c
+++ b/sys/dev/ed/if_ed_3c503.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
* Copyright (c) 1995, David Greenman
diff --git a/sys/dev/ed/if_ed_hpp.c b/sys/dev/ed/if_ed_hpp.c
index 282b8e468e14..5dac104410d2 100644
--- a/sys/dev/ed/if_ed_hpp.c
+++ b/sys/dev/ed/if_ed_hpp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
* Copyright (c) 1995, David Greenman
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index ac36f4060b87..7b974dc27f63 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed_novell.c b/sys/dev/ed/if_ed_novell.c
index 5ef196bb4049..d81b50997bc2 100644
--- a/sys/dev/ed/if_ed_novell.c
+++ b/sys/dev/ed/if_ed_novell.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
* Copyright (c) 1995, David Greenman
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index bda04352df9f..571b8679dd58 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* Copyright (c) 1995, David Greenman
* All rights reserved.
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 78f9aff705ae..04130df2298f 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed_rtl80x9.c b/sys/dev/ed/if_ed_rtl80x9.c
index 3f160d05c4ad..745551036c3d 100644
--- a/sys/dev/ed/if_ed_rtl80x9.c
+++ b/sys/dev/ed/if_ed_rtl80x9.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, David Madole
* All rights reserved.
* Copyright (c) 2005, M. Warner Losh.
diff --git a/sys/dev/ed/if_ed_sic.c b/sys/dev/ed/if_ed_sic.c
index 0a1965407734..d9c67120fd75 100644
--- a/sys/dev/ed/if_ed_sic.c
+++ b/sys/dev/ed/if_ed_sic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
* Copyright (c) 1995, David Greenman
diff --git a/sys/dev/ed/if_ed_wd80x3.c b/sys/dev/ed/if_ed_wd80x3.c
index e736e9bd78cf..ccaa46e883df 100644
--- a/sys/dev/ed/if_ed_wd80x3.c
+++ b/sys/dev/ed/if_ed_wd80x3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
* Copyright (c) 1995, David Greenman
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index d6d2d81946b1..bd3be77c4db3 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/rtl80x9reg.h b/sys/dev/ed/rtl80x9reg.h
index 13d932b58d91..2120fcffa852 100644
--- a/sys/dev/ed/rtl80x9reg.h
+++ b/sys/dev/ed/rtl80x9reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, David Madole
* All rights reserved.
* Copyright (c) 2005, M. Warner Losh.
diff --git a/sys/dev/ed/tc5299jreg.h b/sys/dev/ed/tc5299jreg.h
index 42ab8239a110..414216007c52 100644
--- a/sys/dev/ed/tc5299jreg.h
+++ b/sys/dev/ed/tc5299jreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index e2c5acdb4336..9f6848a1de58 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 1b7dd1b85f69..e125daf101fd 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 4a202b2557df..e0e680c1ec77 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 30cc634d32fc..9453891488df 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 42bb06ca7633..c7b9cb39d5b0 100644
--- a/sys/dev/ep/if_epvar.h
+++ b/sys/dev/ep/if_epvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/esp/am53c974reg.h b/sys/dev/esp/am53c974reg.h
index 795aa88d1668..86260fd646c9 100644
--- a/sys/dev/esp/am53c974reg.h
+++ b/sys/dev/esp/am53c974reg.h
@@ -1,8 +1,6 @@
/* $NetBSD: pcscpreg.h,v 1.2 2008/04/28 20:23:55 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/esp/esp_pci.c b/sys/dev/esp/esp_pci.c
index 1e484b29415e..fc3af2b2442e 100644
--- a/sys/dev/esp/esp_pci.c
+++ b/sys/dev/esp/esp_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index c7f4cbbc9d29..4d658d6671f6 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2004 Scott Long
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 98d40ce70697..62f0ec6cd71f 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause NetBSD
- *
* Copyright (c) 2004 Scott Long
* Copyright (c) 2005, 2008 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index 557ae59ae720..dffbf7cd5770 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: ncr53c9xreg.h,v 1.16 2009/09/07 13:31:44 tsutsui Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Peter Galbavy. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index cebb214df369..c5c8343c47a5 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -1,8 +1,6 @@
/* $NetBSD: ncr53c9xvar.h,v 1.55 2011/07/31 18:39:00 jakllsch Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
index 734787964404..67cddc9e0fc2 100644
--- a/sys/dev/et/if_et.c
+++ b/sys/dev/et/if_et.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Sepherosa Ziehau. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/et/if_etreg.h b/sys/dev/et/if_etreg.h
index 04e103d5d7f1..52fa930d91ed 100644
--- a/sys/dev/et/if_etreg.h
+++ b/sys/dev/et/if_etreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Sepherosa Ziehau. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/et/if_etvar.h b/sys/dev/et/if_etvar.h
index 461324f2f0f1..e2e30ea2a2bc 100644
--- a/sys/dev/et/if_etvar.h
+++ b/sys/dev/et/if_etvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Sepherosa Ziehau. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 67cfb717486b..8396f8aee501 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.c b/sys/dev/etherswitch/arswitch/arswitch_7240.c
index 15523f7ea0e8..01ea9b3e9c1b 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_7240.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.h b/sys/dev/etherswitch/arswitch/arswitch_7240.h
index 14fcfa5918cc..838a6d1015a0 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_7240.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8216.c b/sys/dev/etherswitch/arswitch/arswitch_8216.c
index c8b29b19d0a6..bd5c2cb71d6e 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8216.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8216.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8216.h b/sys/dev/etherswitch/arswitch/arswitch_8216.h
index 2b99552c01c5..1795a20b921e 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8216.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8216.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8226.c b/sys/dev/etherswitch/arswitch/arswitch_8226.c
index ee9e17f67bae..5a86627345b5 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8226.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8226.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8226.h b/sys/dev/etherswitch/arswitch/arswitch_8226.h
index b58b7708ad2e..f430e1200f8c 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8226.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8226.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8316.c b/sys/dev/etherswitch/arswitch/arswitch_8316.c
index f56d9000108e..54d6618bd805 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8316.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8316.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8316.h b/sys/dev/etherswitch/arswitch/arswitch_8316.h
index 7a990a0d583a..ceb8ae73ff8c 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8316.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8316.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.c b/sys/dev/etherswitch/arswitch/arswitch_8327.c
index e65884b5c8f7..92e44fc9acb4 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2014 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.h b/sys/dev/etherswitch/arswitch/arswitch_8327.h
index 60e897e367a1..1f35d96639d1 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.c b/sys/dev/etherswitch/arswitch/arswitch_9340.c
index de6fc3195286..89f6caa58c28 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_9340.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.h b/sys/dev/etherswitch/arswitch/arswitch_9340.h
index a594ffaf82b5..cd7e8e3384e3 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_9340.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2031 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.c b/sys/dev/etherswitch/arswitch/arswitch_phy.c
index d9965745b72d..ceeb307efb6d 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.h b/sys/dev/etherswitch/arswitch/arswitch_phy.h
index fcfc263f3bf4..885be2711279 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c
index c4420bf429a0..420e51644132 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_reg.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.h b/sys/dev/etherswitch/arswitch/arswitch_reg.h
index b15147faa371..04612b2468cd 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_reg.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitch_vlans.c b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
index a9452841d66a..9853b22f5f3b 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_vlans.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_vlans.h b/sys/dev/etherswitch/arswitch/arswitch_vlans.h
index fa0e9b4dc572..b82db898822d 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_vlans.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_vlans.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitchreg.h b/sys/dev/etherswitch/arswitch/arswitchreg.h
index 2dd0b1a965e5..80f95b6502ab 100644
--- a/sys/dev/etherswitch/arswitch/arswitchreg.h
+++ b/sys/dev/etherswitch/arswitch/arswitchreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h
index 4010fd8851e4..a322a4fa9aac 100644
--- a/sys/dev/etherswitch/arswitch/arswitchvar.h
+++ b/sys/dev/etherswitch/arswitch/arswitchvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/etherswitch.c b/sys/dev/etherswitch/etherswitch.c
index c00c68ea4f5f..ee9b71086bed 100644
--- a/sys/dev/etherswitch/etherswitch.c
+++ b/sys/dev/etherswitch/etherswitch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/ip17x/ip175c.c b/sys/dev/etherswitch/ip17x/ip175c.c
index b81d4dad40b1..30614a424170 100644
--- a/sys/dev/etherswitch/ip17x/ip175c.c
+++ b/sys/dev/etherswitch/ip17x/ip175c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip175c.h b/sys/dev/etherswitch/ip17x/ip175c.h
index b61aca4d7d02..8abb4b696196 100644
--- a/sys/dev/etherswitch/ip17x/ip175c.h
+++ b/sys/dev/etherswitch/ip17x/ip175c.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip175d.c b/sys/dev/etherswitch/ip17x/ip175d.c
index 45ba44d58ec0..5d43641b1127 100644
--- a/sys/dev/etherswitch/ip17x/ip175d.c
+++ b/sys/dev/etherswitch/ip17x/ip175d.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip175d.h b/sys/dev/etherswitch/ip17x/ip175d.h
index 6dba68c8d3bf..d8a3033c2094 100644
--- a/sys/dev/etherswitch/ip17x/ip175d.h
+++ b/sys/dev/etherswitch/ip17x/ip175d.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
index 3d8c9dde1516..e39663498679 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_phy.c b/sys/dev/etherswitch/ip17x/ip17x_phy.c
index 50cbbe5dfef7..d110b26a69f0 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_phy.c
+++ b/sys/dev/etherswitch/ip17x/ip17x_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_phy.h b/sys/dev/etherswitch/ip17x/ip17x_phy.h
index 3ecd18821eb9..e2638aefda60 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_phy.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_reg.h b/sys/dev/etherswitch/ip17x/ip17x_reg.h
index b79e0c064809..09b119669c8c 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_reg.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_var.h b/sys/dev/etherswitch/ip17x/ip17x_var.h
index 5fed094723b0..a1f418754d96 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_var.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_vlans.c b/sys/dev/etherswitch/ip17x/ip17x_vlans.c
index d6b5883692d6..6746344f48d6 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_vlans.c
+++ b/sys/dev/etherswitch/ip17x/ip17x_vlans.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_vlans.h b/sys/dev/etherswitch/ip17x/ip17x_vlans.h
index 5d4c0ef56887..705926a48610 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_vlans.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_vlans.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/miiproxy.c b/sys/dev/etherswitch/miiproxy.c
index d667cfec2c3e..b0f2398058cd 100644
--- a/sys/dev/etherswitch/miiproxy.c
+++ b/sys/dev/etherswitch/miiproxy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/miiproxy.h b/sys/dev/etherswitch/miiproxy.h
index fc30af10ada2..4883c57dabd7 100644
--- a/sys/dev/etherswitch/miiproxy.h
+++ b/sys/dev/etherswitch/miiproxy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index f4a8fcd77275..6e990d979969 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015-2016 Hiroki Mori.
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
index 33c4b3694aaf..66ca0ad245ee 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015-2016 Hiroki Mori.
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
index 7cb3ccf7da87..876aa9da2267 100644
--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index e2ebf7c045fc..58321689ed04 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
* All rights reserved.
*
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index ab572fff1ef5..02d4a751026d 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Matthew N. Dodd
* All rights reserved.
*
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index bcc2cfb7e254..6d13a72fd2fc 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Mitsuru IWASAKI
* All rights reserved.
*
diff --git a/sys/dev/ex/if_exreg.h b/sys/dev/ex/if_exreg.h
index 8c260ede28c0..8b86f36daf57 100644
--- a/sys/dev/ex/if_exreg.h
+++ b/sys/dev/ex/if_exreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
* All rights reserved.
*
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index a5f806b6c97c..44576a33404b 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, Javier Mart^mn Rueda (jmrueda@diatel.upm.es)
* All rights reserved.
*
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 899375bce733..ea611a87e86b 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2005 M Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index ee69cc24bd57..c445efe60583 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 M Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index c4a8a556bbb9..bc29c81a0990 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 M Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 2fd0bd105972..89cf877641c8 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* Copyright (c) 2005 - 2006 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/fb/creatorreg.h b/sys/dev/fb/creatorreg.h
index 2cdb2dff1b93..c73af6fb40f6 100644
--- a/sys/dev/fb/creatorreg.h
+++ b/sys/dev/fb/creatorreg.h
@@ -21,8 +21,6 @@
* from: XFree86: ffb_dac.h,v 1.1 2000/05/23 04:47:44 dawes Exp
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 39d415395b3e..183abdc3bfcb 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
index 02b8eb3ada44..6110e4afd25e 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 5e8f2cd105f3..0ae2d54526e7 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/fb/gallant12x22.c b/sys/dev/fb/gallant12x22.c
index 6cb82fac6602..73e6dd2cacc6 100644
--- a/sys/dev/fb/gallant12x22.c
+++ b/sys/dev/fb/gallant12x22.c
@@ -2,8 +2,6 @@
/* $NetBSD: gallant12x22.h,v 1.2 1999/05/18 21:51:58 ad Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c
index 7c719bbe1cd9..42824835fcb9 100644
--- a/sys/dev/fb/machfb.c
+++ b/sys/dev/fb/machfb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Bang Jun-Young
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 37ecddbaeb43..4a438fa690fe 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index c3e1946ad0e8..4a7226f9ce42 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index c80c6d58338b..517a3efd73f3 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index 8d82bca31ac9..5340b2e5d504 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
* Copyright (c) 1999 Dag-Erling Coïdan Smørgrav
diff --git a/sys/dev/fb/splash_txt.c b/sys/dev/fb/splash_txt.c
index 1477c3bf52b4..7bd9ff95bc5f 100644
--- a/sys/dev/fb/splash_txt.c
+++ b/sys/dev/fb/splash_txt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
* Copyright (c) 2005 Antony Mawer <antony@mawer.org>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index be81e4ad7cd7..36ba9a708d89 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c
index 79dc30201225..f73d626a9a63 100644
--- a/sys/dev/fb/vesa.c
+++ b/sys/dev/fb/vesa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Kazutaka YOKOTA and Michael Smith
* Copyright (c) 2009-2013 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/fb/vesa.h b/sys/dev/fb/vesa.h
index d38af0ee645c..17314394f9b3 100644
--- a/sys/dev/fb/vesa.h
+++ b/sys/dev/fb/vesa.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Michael Smith and Kazutaka YOKOTA
* All rights reserved.
*
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index a5e966a88385..537552a8a844 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* Copyright (c) 1992-1998 Søren Schmidt
* All rights reserved.
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 229231d1f843..249d32c5957a 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5c5dc43dabde..699ccbb2ca64 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 1adebe845304..afef4096316b 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Nate Lawson (SDG)
* All rights reserved.
*
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 55d9c85ca9c2..a3a0e6167501 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index c63295052379..767a4d157a13 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 972ef065c909..edaef7959de2 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c
index 69a8a12ac2aa..4e0d6e206c5b 100644
--- a/sys/dev/fdt/fdt_common.c
+++ b/sys/dev/fdt/fdt_common.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2014 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h
index be3cf5fdd271..94f84ff3fe49 100644
--- a/sys/dev/fdt/fdt_common.h
+++ b/sys/dev/fdt/fdt_common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/fdt/fdt_powerpc.c b/sys/dev/fdt/fdt_powerpc.c
index 016427f90e5e..80cfa4b3a93a 100644
--- a/sys/dev/fdt/fdt_powerpc.c
+++ b/sys/dev/fdt/fdt_powerpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c
index 5470256073e0..2765f53aa1ba 100644
--- a/sys/dev/fdt/fdt_slicer.c
+++ b/sys/dev/fdt/fdt_slicer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index c8a9d5d7a6db..8d43a7057bcf 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c
index 164e25594242..d93547af9dfe 100644
--- a/sys/dev/ffec/if_ffec.c
+++ b/sys/dev/ffec/if_ffec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/ffec/if_ffecreg.h b/sys/dev/ffec/if_ffecreg.h
index 00bb896f6694..bb1d19790c14 100644
--- a/sys/dev/ffec/if_ffecreg.h
+++ b/sys/dev/ffec/if_ffecreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c
index 8ae6b55c44c8..26e1bc38d071 100644
--- a/sys/dev/filemon/filemon.c
+++ b/sys/dev/filemon/filemon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
* Copyright (c) 2015-2016, EMC Corp.
diff --git a/sys/dev/filemon/filemon.h b/sys/dev/filemon/filemon.h
index 4a97dfd010ad..b3fa061727eb 100644
--- a/sys/dev/filemon/filemon.h
+++ b/sys/dev/filemon/filemon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c
index fbc101afda34..6c71d27a767c 100644
--- a/sys/dev/filemon/filemon_wrapper.c
+++ b/sys/dev/filemon/filemon_wrapper.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
* Copyright (c) 2015-2016, EMC Corp.
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 3798188fdcb1..c5b24ff78d73 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index e91e5c26adab..442fd6f624fb 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 1cac818fb106..a420a4a9f04e 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
*
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 494ff45c61db..e9a86060b45c 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 251173a7e71b..e53d3b678cd6 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index 2442a9131779..87f44ac840bb 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index 27599c41bdf8..45598f2828d7 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index dfa942d91448..ec67971ad229 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index 2faa4d3d3618..034481d086d0 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index f79dec68eccf..de717947e844 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 03df023b7531..5162c065f674 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 5fa94ebe65d7..7523f2cbc54f 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 38b7a5d25f0d..95fe26ed2b22 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 84de76aa7758..985bc6aff5ee 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi SHimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi SHimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index 6b9c11e8cc60..c54881e582b4 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 6351c5bfc3b4..058649fc0cc4 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 1ecf31cd82f0..393d93156b7d 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 3541d199c0b2..07b41ef6230b 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index cb043cb35481..4b8eb76d0605 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index bc72709a3915..3928ef13ae5b 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index acf6fb93598b..57e7904b5f81 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 0cff5d694ab8..b1fe91ee2d5e 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 93ad991e3a76..79f2e2840eb8 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index f1b302528213..cf4457d3ac41 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c
index 678e1d31fe8d..87107b03fcbf 100644
--- a/sys/dev/flash/at45d.c
+++ b/sys/dev/flash/at45d.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh
* Copyright (c) 2011-2012 Ian Lepore
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index fc38252b36ac..4303da80bad0 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2009 Oleksandr Tymoshenko. All rights reserved.
* Copyright (c) 2018 Ian Lepore. All rights reserved.
diff --git a/sys/dev/flash/mx25lreg.h b/sys/dev/flash/mx25lreg.h
index 4a72f60c1855..5e303e121ebc 100644
--- a/sys/dev/flash/mx25lreg.h
+++ b/sys/dev/flash/mx25lreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 7a866dc19286..543eba9c91f5 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, David Greenman
* Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index d1e6a45a2766..7ee8588400a3 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, David Greenman
* Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 476a1a2c361a..78200ce3b3fd 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/fxp/inphy.c b/sys/dev/fxp/inphy.c
index dfa793b03167..8a9a60c68069 100644
--- a/sys/dev/fxp/inphy.c
+++ b/sys/dev/fxp/inphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/fxp/inphyreg.h b/sys/dev/fxp/inphyreg.h
index a6373092f286..42c683dbf189 100644
--- a/sys/dev/fxp/inphyreg.h
+++ b/sys/dev/fxp/inphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index e49889f01278..dac793df56e6 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -1,6 +1,4 @@
/*-
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 1999-2001, Intel Corporation
All rights reserved.
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index d46b4ebff97c..b2a828dbbd54 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2001-2003 Thomas Moestl
* Copyright (c) 2007 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 0f91d0c228bd..e6cd7e711b55 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2007 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/gem/if_gem_sbus.c b/sys/dev/gem/if_gem_sbus.c
index 59f79e216781..4265b8c543c9 100644
--- a/sys/dev/gem/if_gem_sbus.c
+++ b/sys/dev/gem/if_gem_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2007 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h
index b5aa06edd5bf..394fd9019fee 100644
--- a/sys/dev/gem/if_gemreg.h
+++ b/sys/dev/gem/if_gemreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* All rights reserved.
*
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index a19f44be75e7..d89a322d127d 100644
--- a/sys/dev/gem/if_gemvar.h
+++ b/sys/dev/gem/if_gemvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (C) 2001 Eduardo Horvath.
* All rights reserved.
*
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index d5f5f248f4af..101f27b760e2 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Henrik Brix Andersen <brix@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/glxsb/glxsb.h b/sys/dev/glxsb/glxsb.h
index e9f95d395241..06219d33a282 100644
--- a/sys/dev/glxsb/glxsb.h
+++ b/sys/dev/glxsb/glxsb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/glxsb/glxsb_hash.c b/sys/dev/glxsb/glxsb_hash.c
index c5c2028103f2..20e479c5c10f 100644
--- a/sys/dev/glxsb/glxsb_hash.c
+++ b/sys/dev/glxsb/glxsb_hash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index e2ee7999551b..908232330304 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
index e34142e10c88..40b40a6d5570 100644
--- a/sys/dev/gpio/gpiobusvar.h
+++ b/sys/dev/gpio/gpiobusvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/gpio/gpioc.c b/sys/dev/gpio/gpioc.c
index 846fcdb6678a..36705ba67a8a 100644
--- a/sys/dev/gpio/gpioc.c
+++ b/sys/dev/gpio/gpioc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c
index fdd226f2414f..f547be488589 100644
--- a/sys/dev/gpio/gpioiic.c
+++ b/sys/dev/gpio/gpioiic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2010 Luiz Otavio O Souza
* All rights reserved.
diff --git a/sys/dev/gpio/gpioled.c b/sys/dev/gpio/gpioled.c
index b3ba80479313..862ac5db4a3b 100644
--- a/sys/dev/gpio/gpioled.c
+++ b/sys/dev/gpio/gpioled.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/gpio/ofw_gpiobus.c b/sys/dev/gpio/ofw_gpiobus.c
index 34bfbdbd44b9..24ce0315be36 100644
--- a/sys/dev/gpio/ofw_gpiobus.c
+++ b/sys/dev/gpio/ofw_gpiobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* Copyright (c) 2013, Luiz Otavio O Souza <loos@FreeBSD.org>
* Copyright (c) 2013 The FreeBSD Foundation
diff --git a/sys/dev/gxemul/cons/gxemul_cons.c b/sys/dev/gxemul/cons/gxemul_cons.c
index 01c1d5d569de..15deaf0002bc 100644
--- a/sys/dev/gxemul/cons/gxemul_cons.c
+++ b/sys/dev/gxemul/cons/gxemul_cons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/gxemul/disk/gxemul_disk.c b/sys/dev/gxemul/disk/gxemul_disk.c
index 2189528cf1f6..7671784ac140 100644
--- a/sys/dev/gxemul/disk/gxemul_disk.c
+++ b/sys/dev/gxemul/disk/gxemul_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/gxemul/disk/gxemul_diskreg.h b/sys/dev/gxemul/disk/gxemul_diskreg.h
index 8db71f1593f9..f83794486b15 100644
--- a/sys/dev/gxemul/disk/gxemul_diskreg.h
+++ b/sys/dev/gxemul/disk/gxemul_diskreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/gxemul/ether/gxreg.h b/sys/dev/gxemul/ether/gxreg.h
index 557c902befef..a528250b2aa8 100644
--- a/sys/dev/gxemul/ether/gxreg.h
+++ b/sys/dev/gxemul/ether/gxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/gxemul/ether/if_gx.c b/sys/dev/gxemul/ether/if_gx.c
index 7e2493dba1a6..886fb590441b 100644
--- a/sys/dev/gxemul/ether/if_gx.c
+++ b/sys/dev/gxemul/ether/if_gx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 1ec6c42c1949..65dbfab955ab 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -1,8 +1,6 @@
/* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index e2a8cc3080a9..c3b343801b66 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -2,8 +2,6 @@
/* $OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index 9ad9973af71e..c5e8a8b73831 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -2,8 +2,6 @@
/* $OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index 463d65dd8f9e..5645c147452b 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* Copyright (c) 2001-2003 Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index a7ba6f24fdbc..79cb31ba5857 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Matthew R. Green
* Copyright (c) 2007 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 0ea789adac71..13e7062c3609 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hme/if_hmereg.h b/sys/dev/hme/if_hmereg.h
index 6fa0b1219d3a..585ca845bb50 100644
--- a/sys/dev/hme/if_hmereg.h
+++ b/sys/dev/hme/if_hmereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hme/if_hmevar.h b/sys/dev/hme/if_hmevar.h
index a84a8c150c1f..845f8398cab9 100644
--- a/sys/dev/hme/if_hmevar.h
+++ b/sys/dev/hme/if_hmevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/array.h b/sys/dev/hpt27xx/array.h
index f6839679a103..cd463e1574cb 100644
--- a/sys/dev/hpt27xx/array.h
+++ b/sys/dev/hpt27xx/array.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/him.h b/sys/dev/hpt27xx/him.h
index b51529ca7453..9dd2a47c083a 100644
--- a/sys/dev/hpt27xx/him.h
+++ b/sys/dev/hpt27xx/him.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/himfuncs.h b/sys/dev/hpt27xx/himfuncs.h
index 2c4396ed2e6e..24193c93a832 100644
--- a/sys/dev/hpt27xx/himfuncs.h
+++ b/sys/dev/hpt27xx/himfuncs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/hpt27xx_config.c b/sys/dev/hpt27xx/hpt27xx_config.c
index 79950a744727..09e88fc18e43 100644
--- a/sys/dev/hpt27xx/hpt27xx_config.c
+++ b/sys/dev/hpt27xx/hpt27xx_config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/hpt27xx_config.h b/sys/dev/hpt27xx/hpt27xx_config.h
index 4416dd181b15..990f39ab48d5 100644
--- a/sys/dev/hpt27xx/hpt27xx_config.h
+++ b/sys/dev/hpt27xx/hpt27xx_config.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/hpt27xx_os_bsd.c b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
index f429cc7142fa..12e0efa9ab2b 100644
--- a/sys/dev/hpt27xx/hpt27xx_os_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
@@ -1,8 +1,6 @@
/*-
* HighPoint RAID Driver for FreeBSD
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index aa7c14e68d88..3a04711f99a9 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/hptintf.h b/sys/dev/hpt27xx/hptintf.h
index ce768b846fba..45771d8324a9 100644
--- a/sys/dev/hpt27xx/hptintf.h
+++ b/sys/dev/hpt27xx/hptintf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/ldm.h b/sys/dev/hpt27xx/ldm.h
index 1ffdaaca71af..defa459bf825 100644
--- a/sys/dev/hpt27xx/ldm.h
+++ b/sys/dev/hpt27xx/ldm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/list.h b/sys/dev/hpt27xx/list.h
index c05dc7f63dd0..92cdc0f6b7be 100644
--- a/sys/dev/hpt27xx/list.h
+++ b/sys/dev/hpt27xx/list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h
index 292ab68c583f..db893e021213 100644
--- a/sys/dev/hpt27xx/os_bsd.h
+++ b/sys/dev/hpt27xx/os_bsd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/osm.h b/sys/dev/hpt27xx/osm.h
index 38f1daea026a..51b61b009409 100644
--- a/sys/dev/hpt27xx/osm.h
+++ b/sys/dev/hpt27xx/osm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hpt27xx/wj.h b/sys/dev/hpt27xx/wj.h
index bb47908ce0dc..7f2a9c9cc4a5 100644
--- a/sys/dev/hpt27xx/wj.h
+++ b/sys/dev/hpt27xx/wj.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 50d26231a91c..a20def6ef00b 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* HighPoint RR3xxx/4xxx RAID Driver for FreeBSD
* Copyright (C) 2007-2012 HighPoint Technologies, Inc. All Rights Reserved.
*
diff --git a/sys/dev/hptiop/hptiop.h b/sys/dev/hptiop/hptiop.h
index d18a027b9660..ba8c16b43ab6 100644
--- a/sys/dev/hptiop/hptiop.h
+++ b/sys/dev/hptiop/hptiop.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* HighPoint RR3xxx/4xxx RAID Driver for FreeBSD
* Copyright (C) 2007-2012 HighPoint Technologies, Inc. All Rights Reserved.
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/hptmv/access601.h b/sys/dev/hptmv/access601.h
index 0165343ae824..51f1ca33932b 100644
--- a/sys/dev/hptmv/access601.h
+++ b/sys/dev/hptmv/access601.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/array.h b/sys/dev/hptmv/array.h
index c512453ecb6a..2caf413ccb0f 100644
--- a/sys/dev/hptmv/array.h
+++ b/sys/dev/hptmv/array.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/atapi.h b/sys/dev/hptmv/atapi.h
index 622260f52f2d..712787f24b9c 100644
--- a/sys/dev/hptmv/atapi.h
+++ b/sys/dev/hptmv/atapi.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/command.h b/sys/dev/hptmv/command.h
index 9acac222fb64..de51356cdd8f 100644
--- a/sys/dev/hptmv/command.h
+++ b/sys/dev/hptmv/command.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index dc82f8acf2c6..167f82a46e87 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index a5373b37991e..18390a7e5941 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
index 927f5bd94c4c..bc57239c217b 100644
--- a/sys/dev/hptmv/gui_lib.c
+++ b/sys/dev/hptmv/gui_lib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index c78256923dbc..191795c048cb 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index c9ee38a4d41a..d9ded9fd0e1a 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index 7dc6616b66f5..671d64c86bcf 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index f86401ef4242..aaf67d9e2db4 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 8070db1a402d..31109738fa0e 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mvSata.h b/sys/dev/hptmv/mvSata.h
index 32427c30557d..982743ce0d1c 100644
--- a/sys/dev/hptmv/mvSata.h
+++ b/sys/dev/hptmv/mvSata.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 MARVELL SEMICONDUCTOR ISRAEL, LTD.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mvStorageDev.h b/sys/dev/hptmv/mvStorageDev.h
index 2d7baa3075c3..d9cdce6cc1ef 100644
--- a/sys/dev/hptmv/mvStorageDev.h
+++ b/sys/dev/hptmv/mvStorageDev.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 MARVELL SEMICONDUCTOR ISRAEL, LTD.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index f4922c8e4a0a..a9abc3e2c69f 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/raid5n.h b/sys/dev/hptmv/raid5n.h
index ee85b60e30d3..52dd95bed3c2 100644
--- a/sys/dev/hptmv/raid5n.h
+++ b/sys/dev/hptmv/raid5n.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/vdevice.h b/sys/dev/hptmv/vdevice.h
index acf3baf5423f..c7f96da8d480 100644
--- a/sys/dev/hptmv/vdevice.h
+++ b/sys/dev/hptmv/vdevice.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/array.h b/sys/dev/hptnr/array.h
index 780ab75e180d..e81126857704 100644
--- a/sys/dev/hptnr/array.h
+++ b/sys/dev/hptnr/array.h
@@ -1,7 +1,5 @@
/* $Id: array.h,v 1.46 2010/02/05 06:57:43 mah Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2004-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/him.h b/sys/dev/hptnr/him.h
index 21ec6d6b07f5..dac0a1268976 100644
--- a/sys/dev/hptnr/him.h
+++ b/sys/dev/hptnr/him.h
@@ -1,7 +1,5 @@
/* $Id: him.h,v 1.57 2011/02/21 06:03:21 zsf Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/himfuncs.h b/sys/dev/hptnr/himfuncs.h
index 38dfb5ce4763..a79790310a86 100644
--- a/sys/dev/hptnr/himfuncs.h
+++ b/sys/dev/hptnr/himfuncs.h
@@ -1,7 +1,5 @@
/* $Id: himfuncs.h,v 1.17 2010/05/10 10:10:02 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/hptintf.h b/sys/dev/hptnr/hptintf.h
index 208a75e1dfd3..aefb49c6fdff 100644
--- a/sys/dev/hptnr/hptintf.h
+++ b/sys/dev/hptnr/hptintf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/hptnr_config.c b/sys/dev/hptnr/hptnr_config.c
index c6d0d636b2bb..2164f17efc4b 100644
--- a/sys/dev/hptnr/hptnr_config.c
+++ b/sys/dev/hptnr/hptnr_config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/hptnr_config.h b/sys/dev/hptnr/hptnr_config.h
index 819bb599f3f6..2c91cd0ddc55 100644
--- a/sys/dev/hptnr/hptnr_config.h
+++ b/sys/dev/hptnr/hptnr_config.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/hptnr_os_bsd.c b/sys/dev/hptnr/hptnr_os_bsd.c
index ea04c9d532b2..36f0c3c19620 100644
--- a/sys/dev/hptnr/hptnr_os_bsd.c
+++ b/sys/dev/hptnr/hptnr_os_bsd.c
@@ -1,7 +1,5 @@
/* $Id: os_bsd.c,v 1.13 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
* All rights reserved.
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index 8afd3e22d2e8..4629053e8534 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -1,7 +1,5 @@
/* $Id: osm_bsd.c,v 1.36 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/ldm.h b/sys/dev/hptnr/ldm.h
index db3439220a54..a8f29911b7b4 100644
--- a/sys/dev/hptnr/ldm.h
+++ b/sys/dev/hptnr/ldm.h
@@ -1,7 +1,5 @@
/* $Id: ldm.h,v 1.78 2010/05/10 10:08:46 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/list.h b/sys/dev/hptnr/list.h
index 832093fe9325..bdac009a536b 100644
--- a/sys/dev/hptnr/list.h
+++ b/sys/dev/hptnr/list.h
@@ -1,7 +1,5 @@
/* $Id: list.h,v 1.6 2006/10/31 06:25:28 gmm Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h
index c1f7c8c6779c..5b41a7636128 100644
--- a/sys/dev/hptnr/os_bsd.h
+++ b/sys/dev/hptnr/os_bsd.h
@@ -1,7 +1,5 @@
/* $Id: os_bsd.h,v 1.20 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
* All rights reserved.
diff --git a/sys/dev/hptnr/osm.h b/sys/dev/hptnr/osm.h
index 9b443bc9c909..b5b90ee8b3ab 100644
--- a/sys/dev/hptnr/osm.h
+++ b/sys/dev/hptnr/osm.h
@@ -1,7 +1,5 @@
/* $Id: osm.h,v 1.10 2010/05/11 10:30:33 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptnr/wj.h b/sys/dev/hptnr/wj.h
index 0102a60c4e8f..d0cfacfaed2b 100644
--- a/sys/dev/hptnr/wj.h
+++ b/sys/dev/hptnr/wj.h
@@ -1,7 +1,5 @@
/* $Id: wj.h,v 1.1 2007/11/01 03:05:51 gmm Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/array.h b/sys/dev/hptrr/array.h
index 1e50554d25f6..c06e2a572e5b 100644
--- a/sys/dev/hptrr/array.h
+++ b/sys/dev/hptrr/array.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/him.h b/sys/dev/hptrr/him.h
index dc62f20f1a0b..b32d58cb2a51 100644
--- a/sys/dev/hptrr/him.h
+++ b/sys/dev/hptrr/him.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/himfuncs.h b/sys/dev/hptrr/himfuncs.h
index 32adb972243f..6926365ffaec 100644
--- a/sys/dev/hptrr/himfuncs.h
+++ b/sys/dev/hptrr/himfuncs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/hptintf.h b/sys/dev/hptrr/hptintf.h
index 1c08d272f964..b7f22ab19674 100644
--- a/sys/dev/hptrr/hptintf.h
+++ b/sys/dev/hptrr/hptintf.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/hptrr_config.c b/sys/dev/hptrr/hptrr_config.c
index e35bddb8def5..b3cda443939c 100644
--- a/sys/dev/hptrr/hptrr_config.c
+++ b/sys/dev/hptrr/hptrr_config.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/hptrr_config.h b/sys/dev/hptrr/hptrr_config.h
index c58023f93baf..cdb2ce23d548 100644
--- a/sys/dev/hptrr/hptrr_config.h
+++ b/sys/dev/hptrr/hptrr_config.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/hptrr_os_bsd.c b/sys/dev/hptrr/hptrr_os_bsd.c
index 32deb405fe42..6cd01e5017f4 100644
--- a/sys/dev/hptrr/hptrr_os_bsd.c
+++ b/sys/dev/hptrr/hptrr_os_bsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 3fc13f65a984..b87613b9931f 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/ldm.h b/sys/dev/hptrr/ldm.h
index 16480237df41..1ec3427146d8 100644
--- a/sys/dev/hptrr/ldm.h
+++ b/sys/dev/hptrr/ldm.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/list.h b/sys/dev/hptrr/list.h
index 8eab0e023593..9cfad53e2263 100644
--- a/sys/dev/hptrr/list.h
+++ b/sys/dev/hptrr/list.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h
index 232a137927cc..4f8abb55c834 100644
--- a/sys/dev/hptrr/os_bsd.h
+++ b/sys/dev/hptrr/os_bsd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptrr/osm.h b/sys/dev/hptrr/osm.h
index 4cfd3a123d7e..c33e0dee2948 100644
--- a/sys/dev/hptrr/osm.h
+++ b/sys/dev/hptrr/osm.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index 4b3cc98933a4..7221071de0f8 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h
index 0aa80c2d618b..b995dbe08c95 100644
--- a/sys/dev/hwpmc/hwpmc_amd.h
+++ b/sys/dev/hwpmc/hwpmc_amd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_arm.c b/sys/dev/hwpmc/hwpmc_arm.c
index e99fa34c2444..a2a25a98d2f3 100644
--- a/sys/dev/hwpmc/hwpmc_arm.c
+++ b/sys/dev/hwpmc/hwpmc_arm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index bec250b8e86d..459f9542d41b 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_core.h b/sys/dev/hwpmc/hwpmc_core.h
index d264318f8c25..6183e269c7e1 100644
--- a/sys/dev/hwpmc/hwpmc_core.h
+++ b/sys/dev/hwpmc/hwpmc_core.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c
index 94b7b77f72c7..d6fdd970d816 100644
--- a/sys/dev/hwpmc/hwpmc_intel.c
+++ b/sys/dev/hwpmc/hwpmc_intel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c
index bd15f8c2abee..fb00445b503b 100644
--- a/sys/dev/hwpmc/hwpmc_logging.c
+++ b/sys/dev/hwpmc/hwpmc_logging.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_mips.c b/sys/dev/hwpmc/hwpmc_mips.c
index 7a27777d7578..d9c26af558e7 100644
--- a/sys/dev/hwpmc/hwpmc_mips.c
+++ b/sys/dev/hwpmc/hwpmc_mips.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, George V. Neville-Neil <gnn@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_mips24k.c b/sys/dev/hwpmc/hwpmc_mips24k.c
index 7a87902a39ea..ac42559af760 100644
--- a/sys/dev/hwpmc/hwpmc_mips24k.c
+++ b/sys/dev/hwpmc/hwpmc_mips24k.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 George V. Neville-Neil <gnn@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index 3c9887bee58f..ab84de4f0c51 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_mpc7xxx.c b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
index 73afda55d680..2a2b6088f740 100644
--- a/sys/dev/hwpmc/hwpmc_mpc7xxx.c
+++ b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Justin Hibbits
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_octeon.c b/sys/dev/hwpmc/hwpmc_octeon.c
index 1b90833bbb35..751828222669 100644
--- a/sys/dev/hwpmc/hwpmc_octeon.c
+++ b/sys/dev/hwpmc/hwpmc_octeon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_pentium.c b/sys/dev/hwpmc/hwpmc_pentium.c
index 8da9d316718a..0084fa845f64 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.c
+++ b/sys/dev/hwpmc/hwpmc_pentium.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2005 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_pentium.h b/sys/dev/hwpmc/hwpmc_pentium.h
index c27c108a47a3..9bb8e781fbe7 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.h
+++ b/sys/dev/hwpmc/hwpmc_pentium.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c
index 6ced08ac2dc8..71b3ac5bbbdf 100644
--- a/sys/dev/hwpmc/hwpmc_piv.c
+++ b/sys/dev/hwpmc/hwpmc_piv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_piv.h b/sys/dev/hwpmc/hwpmc_piv.h
index 14e5ed4a6f4c..4faeadd11e3e 100644
--- a/sys/dev/hwpmc/hwpmc_piv.h
+++ b/sys/dev/hwpmc/hwpmc_piv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index 994068e84756..e395d5824ed5 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011,2013 Justin Hibbits
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.h b/sys/dev/hwpmc/hwpmc_powerpc.h
index b31e9f93294d..66eaa21d4a86 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.h
+++ b/sys/dev/hwpmc/hwpmc_powerpc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_ppc970.c b/sys/dev/hwpmc/hwpmc_ppc970.c
index ecf588f9bf8c..1a263f38c950 100644
--- a/sys/dev/hwpmc/hwpmc_ppc970.c
+++ b/sys/dev/hwpmc/hwpmc_ppc970.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c
index 416f51c31b6c..9d983fad046f 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.c
+++ b/sys/dev/hwpmc/hwpmc_ppro.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_ppro.h b/sys/dev/hwpmc/hwpmc_ppro.h
index 55238704809a..c42a2b4d315d 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.h
+++ b/sys/dev/hwpmc/hwpmc_ppro.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c
index e9464223edd1..fe143ad36c24 100644
--- a/sys/dev/hwpmc/hwpmc_soft.c
+++ b/sys/dev/hwpmc/hwpmc_soft.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Fabien Thomas
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_soft.h b/sys/dev/hwpmc/hwpmc_soft.h
index 68df3ee846ca..f82baff01667 100644
--- a/sys/dev/hwpmc/hwpmc_soft.h
+++ b/sys/dev/hwpmc/hwpmc_soft.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Fabien Thomas
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_sparc64.c b/sys/dev/hwpmc/hwpmc_sparc64.c
index 3ded908e2529..ce1caf69e108 100644
--- a/sys/dev/hwpmc/hwpmc_sparc64.c
+++ b/sys/dev/hwpmc/hwpmc_sparc64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_tsc.c b/sys/dev/hwpmc/hwpmc_tsc.c
index ef11e6991aed..5eb69076dcea 100644
--- a/sys/dev/hwpmc/hwpmc_tsc.c
+++ b/sys/dev/hwpmc/hwpmc_tsc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_tsc.h b/sys/dev/hwpmc/hwpmc_tsc.h
index 57156d053d9d..a8b011e6ee31 100644
--- a/sys/dev/hwpmc/hwpmc_tsc.h
+++ b/sys/dev/hwpmc/hwpmc_tsc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c
index 50f5e988c643..7050927cb90e 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.c
+++ b/sys/dev/hwpmc/hwpmc_uncore.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Fabien Thomas
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_uncore.h b/sys/dev/hwpmc/hwpmc_uncore.h
index 64bf650dd5bc..0e2ff86f0206 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.h
+++ b/sys/dev/hwpmc/hwpmc_uncore.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Fabien Thomas
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index b2453f0fe04c..f571e419bcdd 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_xscale.c b/sys/dev/hwpmc/hwpmc_xscale.c
index a779c7f898f9..4a03ea69fc3c 100644
--- a/sys/dev/hwpmc/hwpmc_xscale.c
+++ b/sys/dev/hwpmc/hwpmc_xscale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/hwpmc_xscale.h b/sys/dev/hwpmc/hwpmc_xscale.h
index 112a722c8c03..80e2d23a820f 100644
--- a/sys/dev/hwpmc/hwpmc_xscale.h
+++ b/sys/dev/hwpmc/hwpmc_xscale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 731df30f41d5..bf6c9ee4237d 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Joseph Koshy
* All rights reserved.
*
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 3761b2864eef..dcd91bd035a6 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
* Copyright (c) 2012 Citrix Inc.
diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index fbdbaa43a814..68f074046089 100644
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
* Copyright (c) 2012 Citrix Inc.
diff --git a/sys/dev/hyperv/storvsc/hv_vstorage.h b/sys/dev/hyperv/storvsc/hv_vstorage.h
index ebdda510b609..992cea2604d9 100644
--- a/sys/dev/hyperv/storvsc/hv_vstorage.h
+++ b/sys/dev/hyperv/storvsc/hv_vstorage.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012,2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
* Copyright (c) 2012 Citrix Inc.
diff --git a/sys/dev/hyperv/utilities/hv_kvp.h b/sys/dev/hyperv/utilities/hv_kvp.h
index 91e1ea404d4a..a94e67110f21 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.h
+++ b/sys/dev/hyperv/utilities/hv_kvp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014,2016 Microsoft Corp.
* All rights reserved.
*
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index fed0468382b8..90672c4ee7e6 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* cyclades cyclom-y serial driver
* Andrew Herbert <andrew@werple.apana.org.au>, 17 August 1993
*
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index 68f0f47f6adb..941f8caf4f59 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index cf5447d6025c..b8f903782395 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Sean Eric Fagan.
* All rights reserved.
*
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index b3eb19da4cc6..d41d3b2af0a6 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index 8a0f9dc4356e..d594730a0dd5 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, University of Vermont and State Agricultural College.
* Copyright (c) 1992, Garrett A. Wollman.
* All rights reserved.
diff --git a/sys/dev/ic/i8259.h b/sys/dev/ic/i8259.h
index facf663d8e1f..239384c555ae 100644
--- a/sys/dev/ic/i8259.h
+++ b/sys/dev/ic/i8259.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm
* All rights reserved.
*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index cafdf5b37fd4..62ad0cdc5b9b 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 525bb1874863..e4c714f21463 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/ic/quicc.h b/sys/dev/ic/quicc.h
index af05e03c2813..7db6c03ebf75 100644
--- a/sys/dev/ic/quicc.h
+++ b/sys/dev/ic/quicc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Juniper Networks
* All rights reserved.
*
diff --git a/sys/dev/ic/sab82532.h b/sys/dev/ic/sab82532.h
index 4cc723b6464c..e570c6a9ae5f 100644
--- a/sys/dev/ic/sab82532.h
+++ b/sys/dev/ic/sab82532.h
@@ -1,8 +1,6 @@
/* $OpenBSD: sab82532reg.h,v 1.2 2002/04/08 17:49:42 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/ic/via6522reg.h b/sys/dev/ic/via6522reg.h
index 66f902dccd45..6e309c7f48c6 100644
--- a/sys/dev/ic/via6522reg.h
+++ b/sys/dev/ic/via6522reg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright 2004 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ic/z8530.h b/sys/dev/ic/z8530.h
index 115f9a689bc5..2466d1c9198f 100644
--- a/sys/dev/ic/z8530.h
+++ b/sys/dev/ic/z8530.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index c2615121e6bc..9cb77254f637 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
*
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index 93cfa3702a81..4407b5ba96e5 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
*
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 10bba8146706..fd6fcd6c2a29 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 3d70a5e27fb2..8ec87be35762 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 63a18ecf0259..a16425830e4a 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index f871d6eb328e..7fb48d45063b 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 8ff7181bf185..122a47e030d0 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index c95e1cb19a8b..e35360c676d2 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 36d52986691d..7cbc0cef8753 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index b9d860f9d889..bf2f313023df 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index d88dc59c1968..a9a8d67aabde 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index 0182e15f6e2a..7259127aa34c 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/ad7417.c
index 11ed09855d52..ac84ffe78955 100644
--- a/sys/dev/iicbus/ad7417.c
+++ b/sys/dev/iicbus/ad7417.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/ad7418.c
index 457b3626c8ef..82a8018c8f46 100644
--- a/sys/dev/iicbus/ad7418.c
+++ b/sys/dev/iicbus/ad7418.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/iicbus/adt746x.c b/sys/dev/iicbus/adt746x.c
index bd4bb70103c6..179cd12ea47d 100644
--- a/sys/dev/iicbus/adt746x.c
+++ b/sys/dev/iicbus/adt746x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Andreas Tobler
* Copyright (c) 2014 Justin Hibbits
* All rights reserved.
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/ds1631.c
index 81fe62fd9ed4..22c8eccc7273 100644
--- a/sys/dev/iicbus/ds1631.c
+++ b/sys/dev/iicbus/ds1631.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/ds1672.c
index 6b204789bce9..ea5039d9f35f 100644
--- a/sys/dev/iicbus/ds1672.c
+++ b/sys/dev/iicbus/ds1672.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/ds1775.c
index f303125c779b..884ac4cc83b4 100644
--- a/sys/dev/iicbus/ds1775.c
+++ b/sys/dev/iicbus/ds1775.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index df67261048b9..d581e29b404f 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index ca50fbb11c33..323b0f7c29bb 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index b4a60c29ca9a..e09624110011 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 5ebf56a9f7f3..8ae19120a4fe 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 5e82ad04691c..ed1d7b846d31 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index de30c0168901..8cb7383df243 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 503305c77fd7..38c1ca8e6ea4 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/iicoc.c
index 26ff52f4cc6b..1186b514879c 100644
--- a/sys/dev/iicbus/iicoc.c
+++ b/sys/dev/iicbus/iicoc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/iicoc.h
index 3a677c0ff8d5..e0d6d27253df 100644
--- a/sys/dev/iicbus/iicoc.h
+++ b/sys/dev/iicbus/iicoc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 78ef8e93e665..a572100e5b78 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index c264183e553d..d85e10eb874e 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 8e79452cf2a8..88af163d2fe2 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/max6690.c
index af3aeee4be34..67bb042b39bd 100644
--- a/sys/dev/iicbus/max6690.c
+++ b/sys/dev/iicbus/max6690.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c
index 3b026f5b8d87..9b12c883119b 100644
--- a/sys/dev/iicbus/s35390a.c
+++ b/sys/dev/iicbus/s35390a.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2012 Yusuke Tanaka
* All rights reserved.
*
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 35ceef8d66a5..49b0f6021056 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-04 ICP vortex GmbH
* Copyright (c) 2002-04 Intel Corporation
* Copyright (c) 2003-04 Adaptec Inc.
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 481341467800..40debb518ed3 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-04 ICP vortex GmbH
* Copyright (c) 2002-04 Intel Corporation
* Copyright (c) 2003-04 Adaptec Inc.
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 0ec995a5b081..65088d07de89 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-03 ICP vortex GmbH
* Copyright (c) 2002-03 Intel Corporation
* Copyright (c) 2003 Adaptec Inc.
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index bd7f15b57c4a..5db66b1d9cb0 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-03 ICP vortex GmbH
* Copyright (c) 2002-03 Intel Corporation
* Copyright (c) 2003 Adaptec Inc.
diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c
index e9859792b200..eae69f484a4b 100644
--- a/sys/dev/io/iodev.c
+++ b/sys/dev/io/iodev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/dev/io/iodev.h b/sys/dev/io/iodev.h
index 5558a9bb5504..d040fcccf481 100644
--- a/sys/dev/io/iodev.h
+++ b/sys/dev/io/iodev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index e9e9f2fd5f85..314d4d696c08 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c
index c00d782dc974..42810028d544 100644
--- a/sys/dev/ipmi/ipmi_acpi.c
+++ b/sys/dev/ipmi/ipmi_acpi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c
index cdff305b07ec..fc66ab1840e5 100644
--- a/sys/dev/ipmi/ipmi_isa.c
+++ b/sys/dev/ipmi/ipmi_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_kcs.c b/sys/dev/ipmi/ipmi_kcs.c
index ba6b0916236c..864e9a0a0bcb 100644
--- a/sys/dev/ipmi/ipmi_kcs.c
+++ b/sys/dev/ipmi/ipmi_kcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_linux.c b/sys/dev/ipmi/ipmi_linux.c
index 136712e8cfb5..13d4bdad4b37 100644
--- a/sys/dev/ipmi/ipmi_linux.c
+++ b/sys/dev/ipmi/ipmi_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_pci.c b/sys/dev/ipmi/ipmi_pci.c
index d4598f9db873..e3225f19ffd8 100644
--- a/sys/dev/ipmi/ipmi_pci.c
+++ b/sys/dev/ipmi/ipmi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c
index df0a7f70e9cd..4ca17cae7f58 100644
--- a/sys/dev/ipmi/ipmi_smbios.c
+++ b/sys/dev/ipmi/ipmi_smbios.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_smbus.c b/sys/dev/ipmi/ipmi_smbus.c
index 212248f0217e..3798a628d26f 100644
--- a/sys/dev/ipmi/ipmi_smbus.c
+++ b/sys/dev/ipmi/ipmi_smbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_smic.c b/sys/dev/ipmi/ipmi_smic.c
index 4a515a379725..92cf14e9e615 100644
--- a/sys/dev/ipmi/ipmi_smic.c
+++ b/sys/dev/ipmi/ipmi_smic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmi_ssif.c b/sys/dev/ipmi/ipmi_ssif.c
index 197c317dcc09..e5d5d3aa8cdd 100644
--- a/sys/dev/ipmi/ipmi_ssif.c
+++ b/sys/dev/ipmi/ipmi_ssif.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ipmi/ipmivars.h b/sys/dev/ipmi/ipmivars.h
index bdac73b81e57..6682b56b6299 100644
--- a/sys/dev/ipmi/ipmivars.h
+++ b/sys/dev/ipmi/ipmivars.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 20b93a0a4646..2bda55deaf68 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index c57d5a459f5f..9ae4812b65f8 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index ef367bd83b70..151c0022a309 100644
--- a/sys/dev/ips/ips_commands.c
+++ b/sys/dev/ips/ips_commands.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 1d2732260792..12bdacd63115 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index 1d532ed31193..b841eeaeea2f 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index e495c639200b..ea076703237c 100644
--- a/sys/dev/ips/ips_ioctl.c
+++ b/sys/dev/ips/ips_ioctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_ioctl.h b/sys/dev/ips/ips_ioctl.h
index 34972eaa8ada..ea76ed501fac 100644
--- a/sys/dev/ips/ips_ioctl.h
+++ b/sys/dev/ips/ips_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 588e14d5e6b8..efffb32eda54 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/ips/ipsreg.h b/sys/dev/ips/ipsreg.h
index 762ff315c6e3..ed282574ab8f 100644
--- a/sys/dev/ips/ipsreg.h
+++ b/sys/dev/ips/ipsreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
*
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index bfc2c6309892..a4cb28b147ae 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
* Copyright (c) 2006 Sam Leffler, Errno Consulting
diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index a78910b8272c..b300e13492ca 100644
--- a/sys/dev/ipw/if_ipwreg.h
+++ b/sys/dev/ipw/if_ipwreg.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
*
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index a86f3566b403..774d57ce6809 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
*
diff --git a/sys/dev/isci/environment.h b/sys/dev/isci/environment.h
index 0fbbc2ae30ab..5c9374ca8717 100644
--- a/sys/dev/isci/environment.h
+++ b/sys/dev/isci/environment.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c
index 9dd138ad1fb0..913952360670 100644
--- a/sys/dev/isci/isci.c
+++ b/sys/dev/isci/isci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci.h b/sys/dev/isci/isci.h
index 4e8d7f974494..ce0426a158c3 100644
--- a/sys/dev/isci/isci.h
+++ b/sys/dev/isci/isci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_controller.c b/sys/dev/isci/isci_controller.c
index eb937b70f560..d4c51f2b1a97 100644
--- a/sys/dev/isci/isci_controller.c
+++ b/sys/dev/isci/isci_controller.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_domain.c b/sys/dev/isci/isci_domain.c
index 1c6597655361..a5df4715630a 100644
--- a/sys/dev/isci/isci_domain.c
+++ b/sys/dev/isci/isci_domain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_interrupt.c b/sys/dev/isci/isci_interrupt.c
index 22b35f441be0..b56fd3a50bee 100644
--- a/sys/dev/isci/isci_interrupt.c
+++ b/sys/dev/isci/isci_interrupt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_io_request.c b/sys/dev/isci/isci_io_request.c
index f5e933e9b1f9..468d12452d2a 100644
--- a/sys/dev/isci/isci_io_request.c
+++ b/sys/dev/isci/isci_io_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_logger.c b/sys/dev/isci/isci_logger.c
index e1b648a0df36..97df04371646 100644
--- a/sys/dev/isci/isci_logger.c
+++ b/sys/dev/isci/isci_logger.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_oem_parameters.c b/sys/dev/isci/isci_oem_parameters.c
index 4b830b8a98cb..83234a2cce8c 100644
--- a/sys/dev/isci/isci_oem_parameters.c
+++ b/sys/dev/isci/isci_oem_parameters.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_remote_device.c b/sys/dev/isci/isci_remote_device.c
index 8aa8fc7ebb08..0640d50f9c08 100644
--- a/sys/dev/isci/isci_remote_device.c
+++ b/sys/dev/isci/isci_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_sysctl.c b/sys/dev/isci/isci_sysctl.c
index af47f9a5766e..a7c56c63233b 100644
--- a/sys/dev/isci/isci_sysctl.c
+++ b/sys/dev/isci/isci_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_task_request.c b/sys/dev/isci/isci_task_request.c
index 2cec90fa4421..2ed0afe7999a 100644
--- a/sys/dev/isci/isci_task_request.c
+++ b/sys/dev/isci/isci_task_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/isci_timer.c b/sys/dev/isci/isci_timer.c
index 60dfb63d83eb..9059c5b5d766 100644
--- a/sys/dev/isci/isci_timer.c
+++ b/sys/dev/isci/isci_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/isci/scil/intel_ata.h b/sys/dev/isci/scil/intel_ata.h
index b2d43997763a..9e1cbb7cc1c4 100644
--- a/sys/dev/isci/scil/intel_ata.h
+++ b/sys/dev/isci/scil/intel_ata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/intel_pci.h b/sys/dev/isci/scil/intel_pci.h
index 6cf135607ed3..08f6d1d08b52 100644
--- a/sys/dev/isci/scil/intel_pci.h
+++ b/sys/dev/isci/scil/intel_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/intel_sas.h b/sys/dev/isci/scil/intel_sas.h
index 8f53e1c49bf1..e2bd8ee8badb 100644
--- a/sys/dev/isci/scil/intel_sas.h
+++ b/sys/dev/isci/scil/intel_sas.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/intel_sat.h b/sys/dev/isci/scil/intel_sat.h
index 18a0aaf78ada..c85482df5e04 100644
--- a/sys/dev/isci/scil/intel_sat.h
+++ b/sys/dev/isci/scil/intel_sat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/intel_sata.h b/sys/dev/isci/scil/intel_sata.h
index 3a63866c8d47..bde7100dbd04 100644
--- a/sys/dev/isci/scil/intel_sata.h
+++ b/sys/dev/isci/scil/intel_sata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/intel_scsi.h b/sys/dev/isci/scil/intel_scsi.h
index 36a4bd6b4c39..658876cbfef6 100644
--- a/sys/dev/isci/scil/intel_scsi.h
+++ b/sys/dev/isci/scil/intel_scsi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati.c b/sys/dev/isci/scil/sati.c
index c9fc971a027f..57df757ca716 100644
--- a/sys/dev/isci/scil/sati.c
+++ b/sys/dev/isci/scil/sati.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati.h b/sys/dev/isci/scil/sati.h
index 4002f4a6a7fb..9b3eafa3a3ac 100644
--- a/sys/dev/isci/scil/sati.h
+++ b/sys/dev/isci/scil/sati.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_abort_task_set.c b/sys/dev/isci/scil/sati_abort_task_set.c
index ac9e00add63d..9de790303265 100644
--- a/sys/dev/isci/scil/sati_abort_task_set.c
+++ b/sys/dev/isci/scil/sati_abort_task_set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_abort_task_set.h b/sys/dev/isci/scil/sati_abort_task_set.h
index a9f6c288594b..33a642542cd4 100644
--- a/sys/dev/isci/scil/sati_abort_task_set.h
+++ b/sys/dev/isci/scil/sati_abort_task_set.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_atapi.c b/sys/dev/isci/scil/sati_atapi.c
index b0832c60e9ee..f2158aeeab81 100644
--- a/sys/dev/isci/scil/sati_atapi.c
+++ b/sys/dev/isci/scil/sati_atapi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_atapi.h b/sys/dev/isci/scil/sati_atapi.h
index 6d9665ce5422..e22e68258552 100644
--- a/sys/dev/isci/scil/sati_atapi.h
+++ b/sys/dev/isci/scil/sati_atapi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_callbacks.h b/sys/dev/isci/scil/sati_callbacks.h
index 3826f131118b..2364e42b01af 100644
--- a/sys/dev/isci/scil/sati_callbacks.h
+++ b/sys/dev/isci/scil/sati_callbacks.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_design.h b/sys/dev/isci/scil/sati_design.h
index 5723bc052f44..372dce0f7d29 100644
--- a/sys/dev/isci/scil/sati_design.h
+++ b/sys/dev/isci/scil/sati_design.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_device.c b/sys/dev/isci/scil/sati_device.c
index e7a20491d57f..1fbcf6ccb8fe 100644
--- a/sys/dev/isci/scil/sati_device.c
+++ b/sys/dev/isci/scil/sati_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_device.h b/sys/dev/isci/scil/sati_device.h
index 1992460e373e..d955f83cda51 100644
--- a/sys/dev/isci/scil/sati_device.h
+++ b/sys/dev/isci/scil/sati_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_inquiry.c b/sys/dev/isci/scil/sati_inquiry.c
index 2ddf90f2aa27..cbf096ec5446 100644
--- a/sys/dev/isci/scil/sati_inquiry.c
+++ b/sys/dev/isci/scil/sati_inquiry.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_inquiry.h b/sys/dev/isci/scil/sati_inquiry.h
index c23d6f0449a8..e3fc86124ac6 100644
--- a/sys/dev/isci/scil/sati_inquiry.h
+++ b/sys/dev/isci/scil/sati_inquiry.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_log_sense.c b/sys/dev/isci/scil/sati_log_sense.c
index d8d592c1db23..04c489411d8f 100644
--- a/sys/dev/isci/scil/sati_log_sense.c
+++ b/sys/dev/isci/scil/sati_log_sense.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_log_sense.h b/sys/dev/isci/scil/sati_log_sense.h
index f6c7e4be8427..d35f949f9fc2 100644
--- a/sys/dev/isci/scil/sati_log_sense.h
+++ b/sys/dev/isci/scil/sati_log_sense.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_lun_reset.c b/sys/dev/isci/scil/sati_lun_reset.c
index a906ef953fb4..6696a16d2e86 100644
--- a/sys/dev/isci/scil/sati_lun_reset.c
+++ b/sys/dev/isci/scil/sati_lun_reset.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_lun_reset.h b/sys/dev/isci/scil/sati_lun_reset.h
index f8ffa5646d24..9e79e6f8ac35 100644
--- a/sys/dev/isci/scil/sati_lun_reset.h
+++ b/sys/dev/isci/scil/sati_lun_reset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_pages.c b/sys/dev/isci/scil/sati_mode_pages.c
index 55d12633cf21..0189c050d2c3 100644
--- a/sys/dev/isci/scil/sati_mode_pages.c
+++ b/sys/dev/isci/scil/sati_mode_pages.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_pages.h b/sys/dev/isci/scil/sati_mode_pages.h
index 258fd094e04d..d8cbe8c40cd5 100644
--- a/sys/dev/isci/scil/sati_mode_pages.h
+++ b/sys/dev/isci/scil/sati_mode_pages.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_select.c b/sys/dev/isci/scil/sati_mode_select.c
index 3e52bb60d588..dc83bfd53ec4 100644
--- a/sys/dev/isci/scil/sati_mode_select.c
+++ b/sys/dev/isci/scil/sati_mode_select.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_select.h b/sys/dev/isci/scil/sati_mode_select.h
index f1d77b2d7f62..ce0e5d4c6890 100644
--- a/sys/dev/isci/scil/sati_mode_select.h
+++ b/sys/dev/isci/scil/sati_mode_select.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense.c b/sys/dev/isci/scil/sati_mode_sense.c
index 1b2c29394799..e03cbdb125f8 100644
--- a/sys/dev/isci/scil/sati_mode_sense.c
+++ b/sys/dev/isci/scil/sati_mode_sense.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense.h b/sys/dev/isci/scil/sati_mode_sense.h
index 7d05dcf975dc..e87701e60e7d 100644
--- a/sys/dev/isci/scil/sati_mode_sense.h
+++ b/sys/dev/isci/scil/sati_mode_sense.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense_10.c b/sys/dev/isci/scil/sati_mode_sense_10.c
index d706e866945d..3e8a84f48e52 100644
--- a/sys/dev/isci/scil/sati_mode_sense_10.c
+++ b/sys/dev/isci/scil/sati_mode_sense_10.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense_10.h b/sys/dev/isci/scil/sati_mode_sense_10.h
index 76f08fb7a0a1..1840777a3d2c 100644
--- a/sys/dev/isci/scil/sati_mode_sense_10.h
+++ b/sys/dev/isci/scil/sati_mode_sense_10.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense_6.c b/sys/dev/isci/scil/sati_mode_sense_6.c
index e65b2f0f2a4f..3100c223b3e5 100644
--- a/sys/dev/isci/scil/sati_mode_sense_6.c
+++ b/sys/dev/isci/scil/sati_mode_sense_6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_mode_sense_6.h b/sys/dev/isci/scil/sati_mode_sense_6.h
index 68eeb51e69fd..64afebc81b24 100644
--- a/sys/dev/isci/scil/sati_mode_sense_6.h
+++ b/sys/dev/isci/scil/sati_mode_sense_6.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_move.c b/sys/dev/isci/scil/sati_move.c
index cf905d426112..9b1e8dc2db3b 100644
--- a/sys/dev/isci/scil/sati_move.c
+++ b/sys/dev/isci/scil/sati_move.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_move.h b/sys/dev/isci/scil/sati_move.h
index 2f61e12ef7b9..b0985a247c75 100644
--- a/sys/dev/isci/scil/sati_move.h
+++ b/sys/dev/isci/scil/sati_move.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_passthrough.c b/sys/dev/isci/scil/sati_passthrough.c
index 12fa17e07f62..88ff0bc12df3 100644
--- a/sys/dev/isci/scil/sati_passthrough.c
+++ b/sys/dev/isci/scil/sati_passthrough.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_passthrough.h b/sys/dev/isci/scil/sati_passthrough.h
index 040d6aa1d636..110664ba983a 100644
--- a/sys/dev/isci/scil/sati_passthrough.h
+++ b/sys/dev/isci/scil/sati_passthrough.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read.c b/sys/dev/isci/scil/sati_read.c
index e9c6064482d9..ce32d259bf5d 100644
--- a/sys/dev/isci/scil/sati_read.c
+++ b/sys/dev/isci/scil/sati_read.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read.h b/sys/dev/isci/scil/sati_read.h
index 55511157fd1c..016700cd5430 100644
--- a/sys/dev/isci/scil/sati_read.h
+++ b/sys/dev/isci/scil/sati_read.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read_buffer.c b/sys/dev/isci/scil/sati_read_buffer.c
index cce5988a00cf..329e7637f0ee 100644
--- a/sys/dev/isci/scil/sati_read_buffer.c
+++ b/sys/dev/isci/scil/sati_read_buffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read_buffer.h b/sys/dev/isci/scil/sati_read_buffer.h
index 83e34d07d690..8bcb17be4f60 100644
--- a/sys/dev/isci/scil/sati_read_buffer.h
+++ b/sys/dev/isci/scil/sati_read_buffer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read_capacity.c b/sys/dev/isci/scil/sati_read_capacity.c
index 964ed0973811..7607e3aae7c7 100644
--- a/sys/dev/isci/scil/sati_read_capacity.c
+++ b/sys/dev/isci/scil/sati_read_capacity.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_read_capacity.h b/sys/dev/isci/scil/sati_read_capacity.h
index d1f29391c3e5..41660de1a345 100644
--- a/sys/dev/isci/scil/sati_read_capacity.h
+++ b/sys/dev/isci/scil/sati_read_capacity.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_reassign_blocks.c b/sys/dev/isci/scil/sati_reassign_blocks.c
index e0bf7637ec80..ebe16b7dfeb2 100644
--- a/sys/dev/isci/scil/sati_reassign_blocks.c
+++ b/sys/dev/isci/scil/sati_reassign_blocks.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_reassign_blocks.h b/sys/dev/isci/scil/sati_reassign_blocks.h
index 0388f664a4b2..7531fd82e0fa 100644
--- a/sys/dev/isci/scil/sati_reassign_blocks.h
+++ b/sys/dev/isci/scil/sati_reassign_blocks.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_report_luns.c b/sys/dev/isci/scil/sati_report_luns.c
index d85d8700bf6e..6aaad4da43f3 100644
--- a/sys/dev/isci/scil/sati_report_luns.c
+++ b/sys/dev/isci/scil/sati_report_luns.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_report_luns.h b/sys/dev/isci/scil/sati_report_luns.h
index 7ed08c91b709..4aef3a43cb96 100644
--- a/sys/dev/isci/scil/sati_report_luns.h
+++ b/sys/dev/isci/scil/sati_report_luns.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_request_sense.c b/sys/dev/isci/scil/sati_request_sense.c
index f12f0ffcb7e5..a247fa335ed1 100644
--- a/sys/dev/isci/scil/sati_request_sense.c
+++ b/sys/dev/isci/scil/sati_request_sense.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_request_sense.h b/sys/dev/isci/scil/sati_request_sense.h
index f7c08a05a436..6348bd923e32 100644
--- a/sys/dev/isci/scil/sati_request_sense.h
+++ b/sys/dev/isci/scil/sati_request_sense.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_start_stop_unit.c b/sys/dev/isci/scil/sati_start_stop_unit.c
index 729474ea2a34..04139e21b321 100644
--- a/sys/dev/isci/scil/sati_start_stop_unit.c
+++ b/sys/dev/isci/scil/sati_start_stop_unit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_start_stop_unit.h b/sys/dev/isci/scil/sati_start_stop_unit.h
index 8ecacc06a2c6..8235c4b77d81 100644
--- a/sys/dev/isci/scil/sati_start_stop_unit.h
+++ b/sys/dev/isci/scil/sati_start_stop_unit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_synchronize_cache.c b/sys/dev/isci/scil/sati_synchronize_cache.c
index 73773cf49ee5..3c974719b472 100644
--- a/sys/dev/isci/scil/sati_synchronize_cache.c
+++ b/sys/dev/isci/scil/sati_synchronize_cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_synchronize_cache.h b/sys/dev/isci/scil/sati_synchronize_cache.h
index 0162eddba2e4..58d6026dcfb6 100644
--- a/sys/dev/isci/scil/sati_synchronize_cache.h
+++ b/sys/dev/isci/scil/sati_synchronize_cache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_test_unit_ready.c b/sys/dev/isci/scil/sati_test_unit_ready.c
index 10bd07c3657e..e5e781bff261 100644
--- a/sys/dev/isci/scil/sati_test_unit_ready.c
+++ b/sys/dev/isci/scil/sati_test_unit_ready.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_test_unit_ready.h b/sys/dev/isci/scil/sati_test_unit_ready.h
index f26f8e1e1b46..50360c72a93c 100644
--- a/sys/dev/isci/scil/sati_test_unit_ready.h
+++ b/sys/dev/isci/scil/sati_test_unit_ready.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_translator_sequence.h b/sys/dev/isci/scil/sati_translator_sequence.h
index 1f03c31aa7ab..dba53260bc7e 100644
--- a/sys/dev/isci/scil/sati_translator_sequence.h
+++ b/sys/dev/isci/scil/sati_translator_sequence.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_types.h b/sys/dev/isci/scil/sati_types.h
index 8d59ceda39d6..4851aeb78500 100644
--- a/sys/dev/isci/scil/sati_types.h
+++ b/sys/dev/isci/scil/sati_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_unmap.c b/sys/dev/isci/scil/sati_unmap.c
index bf9cfe3ccdb1..4cd6e9c41952 100644
--- a/sys/dev/isci/scil/sati_unmap.c
+++ b/sys/dev/isci/scil/sati_unmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_unmap.h b/sys/dev/isci/scil/sati_unmap.h
index e89d1e0c1e37..1b5ffb23c3ca 100644
--- a/sys/dev/isci/scil/sati_unmap.h
+++ b/sys/dev/isci/scil/sati_unmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c
index b74e00fea4b7..e037c5cfae1f 100644
--- a/sys/dev/isci/scil/sati_util.c
+++ b/sys/dev/isci/scil/sati_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_util.h b/sys/dev/isci/scil/sati_util.h
index a97262031d21..5b4ac4721a32 100644
--- a/sys/dev/isci/scil/sati_util.h
+++ b/sys/dev/isci/scil/sati_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_verify.c b/sys/dev/isci/scil/sati_verify.c
index aab2a10bd613..350499d5c5a6 100644
--- a/sys/dev/isci/scil/sati_verify.c
+++ b/sys/dev/isci/scil/sati_verify.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_verify.h b/sys/dev/isci/scil/sati_verify.h
index 768047f3d906..7c762f63a2d9 100644
--- a/sys/dev/isci/scil/sati_verify.h
+++ b/sys/dev/isci/scil/sati_verify.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write.c b/sys/dev/isci/scil/sati_write.c
index 915fbde25ab8..931a1a597e91 100644
--- a/sys/dev/isci/scil/sati_write.c
+++ b/sys/dev/isci/scil/sati_write.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write.h b/sys/dev/isci/scil/sati_write.h
index 6faf9c072838..9d7be32e257b 100644
--- a/sys/dev/isci/scil/sati_write.h
+++ b/sys/dev/isci/scil/sati_write.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_and_verify.c b/sys/dev/isci/scil/sati_write_and_verify.c
index 30f2d5eb6476..bca6ca4eab3e 100644
--- a/sys/dev/isci/scil/sati_write_and_verify.c
+++ b/sys/dev/isci/scil/sati_write_and_verify.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_and_verify.h b/sys/dev/isci/scil/sati_write_and_verify.h
index 8cc287f4cd1e..bbe88067c66e 100644
--- a/sys/dev/isci/scil/sati_write_and_verify.h
+++ b/sys/dev/isci/scil/sati_write_and_verify.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_buffer.c b/sys/dev/isci/scil/sati_write_buffer.c
index 1ce0cd8c85b7..dfa4e2925030 100644
--- a/sys/dev/isci/scil/sati_write_buffer.c
+++ b/sys/dev/isci/scil/sati_write_buffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_buffer.h b/sys/dev/isci/scil/sati_write_buffer.h
index e5fa4609bb5b..c027e1c6858c 100644
--- a/sys/dev/isci/scil/sati_write_buffer.h
+++ b/sys/dev/isci/scil/sati_write_buffer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_long.c b/sys/dev/isci/scil/sati_write_long.c
index 8d9e4247c5f1..7847cc137449 100644
--- a/sys/dev/isci/scil/sati_write_long.c
+++ b/sys/dev/isci/scil/sati_write_long.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sati_write_long.h b/sys/dev/isci/scil/sati_write_long.h
index a3f9f1d6fd5e..1084f8580ed0 100644
--- a/sys/dev/isci/scil/sati_write_long.h
+++ b/sys/dev/isci/scil/sati_write_long.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_abstract_list.c b/sys/dev/isci/scil/sci_abstract_list.c
index 9163d34b4e67..641eb4aebe09 100644
--- a/sys/dev/isci/scil/sci_abstract_list.c
+++ b/sys/dev/isci/scil/sci_abstract_list.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_abstract_list.h b/sys/dev/isci/scil/sci_abstract_list.h
index 010bbc6041f4..7ae53eae29a9 100644
--- a/sys/dev/isci/scil/sci_abstract_list.h
+++ b/sys/dev/isci/scil/sci_abstract_list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_controller.c b/sys/dev/isci/scil/sci_base_controller.c
index 7be706a50c78..52533042917e 100644
--- a/sys/dev/isci/scil/sci_base_controller.c
+++ b/sys/dev/isci/scil/sci_base_controller.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_controller.h b/sys/dev/isci/scil/sci_base_controller.h
index 1a5d8fd12a84..cdf38a13ae8d 100644
--- a/sys/dev/isci/scil/sci_base_controller.h
+++ b/sys/dev/isci/scil/sci_base_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_domain.c b/sys/dev/isci/scil/sci_base_domain.c
index 21db480151e2..87b112c6c2ad 100644
--- a/sys/dev/isci/scil/sci_base_domain.c
+++ b/sys/dev/isci/scil/sci_base_domain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_domain.h b/sys/dev/isci/scil/sci_base_domain.h
index 84d52c412700..537c8ff68cde 100644
--- a/sys/dev/isci/scil/sci_base_domain.h
+++ b/sys/dev/isci/scil/sci_base_domain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_iterator.c b/sys/dev/isci/scil/sci_base_iterator.c
index ad80860797c0..6855f40a0407 100644
--- a/sys/dev/isci/scil/sci_base_iterator.c
+++ b/sys/dev/isci/scil/sci_base_iterator.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_iterator.h b/sys/dev/isci/scil/sci_base_iterator.h
index 52e4658ba4f9..36a23f26cd43 100644
--- a/sys/dev/isci/scil/sci_base_iterator.h
+++ b/sys/dev/isci/scil/sci_base_iterator.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_library.c b/sys/dev/isci/scil/sci_base_library.c
index c4653b4bcba0..a3b85e69c664 100644
--- a/sys/dev/isci/scil/sci_base_library.c
+++ b/sys/dev/isci/scil/sci_base_library.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_library.h b/sys/dev/isci/scil/sci_base_library.h
index d4f9d268b198..63d2cb4fb7ba 100644
--- a/sys/dev/isci/scil/sci_base_library.h
+++ b/sys/dev/isci/scil/sci_base_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_logger.c b/sys/dev/isci/scil/sci_base_logger.c
index 7a32a13e06a0..7f0e425b58ed 100644
--- a/sys/dev/isci/scil/sci_base_logger.c
+++ b/sys/dev/isci/scil/sci_base_logger.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_logger.h b/sys/dev/isci/scil/sci_base_logger.h
index 40d0fb07049c..e3c5a4060e2d 100644
--- a/sys/dev/isci/scil/sci_base_logger.h
+++ b/sys/dev/isci/scil/sci_base_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_memory_descriptor_list.c b/sys/dev/isci/scil/sci_base_memory_descriptor_list.c
index d25cfe43b3d9..d470b8f33bd9 100644
--- a/sys/dev/isci/scil/sci_base_memory_descriptor_list.c
+++ b/sys/dev/isci/scil/sci_base_memory_descriptor_list.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_memory_descriptor_list.h b/sys/dev/isci/scil/sci_base_memory_descriptor_list.h
index 3a4a067e0b57..b4bb43aa0b58 100644
--- a/sys/dev/isci/scil/sci_base_memory_descriptor_list.h
+++ b/sys/dev/isci/scil/sci_base_memory_descriptor_list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c b/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c
index 417e5c996973..0c691f097494 100644
--- a/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c
+++ b/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_object.c b/sys/dev/isci/scil/sci_base_object.c
index c2140c9901fe..94af19f3e5a1 100644
--- a/sys/dev/isci/scil/sci_base_object.c
+++ b/sys/dev/isci/scil/sci_base_object.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_object.h b/sys/dev/isci/scil/sci_base_object.h
index 311c25401f57..58f04306812e 100644
--- a/sys/dev/isci/scil/sci_base_object.h
+++ b/sys/dev/isci/scil/sci_base_object.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_observer.c b/sys/dev/isci/scil/sci_base_observer.c
index 7b26726236b3..60403a5e3f64 100644
--- a/sys/dev/isci/scil/sci_base_observer.c
+++ b/sys/dev/isci/scil/sci_base_observer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_observer.h b/sys/dev/isci/scil/sci_base_observer.h
index 308209f860e0..991d66a63083 100644
--- a/sys/dev/isci/scil/sci_base_observer.h
+++ b/sys/dev/isci/scil/sci_base_observer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_phy.c b/sys/dev/isci/scil/sci_base_phy.c
index 25434cd03680..8cffc13aba09 100644
--- a/sys/dev/isci/scil/sci_base_phy.c
+++ b/sys/dev/isci/scil/sci_base_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_phy.h b/sys/dev/isci/scil/sci_base_phy.h
index 40f010b30a92..914a11007385 100644
--- a/sys/dev/isci/scil/sci_base_phy.h
+++ b/sys/dev/isci/scil/sci_base_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_port.c b/sys/dev/isci/scil/sci_base_port.c
index 3b6c4cc66c3d..d482aa9abbe9 100644
--- a/sys/dev/isci/scil/sci_base_port.c
+++ b/sys/dev/isci/scil/sci_base_port.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_port.h b/sys/dev/isci/scil/sci_base_port.h
index 7d2c229e1847..733677dca103 100644
--- a/sys/dev/isci/scil/sci_base_port.h
+++ b/sys/dev/isci/scil/sci_base_port.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_remote_device.c b/sys/dev/isci/scil/sci_base_remote_device.c
index 40220128146b..e227166d7500 100644
--- a/sys/dev/isci/scil/sci_base_remote_device.c
+++ b/sys/dev/isci/scil/sci_base_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_remote_device.h b/sys/dev/isci/scil/sci_base_remote_device.h
index 47209ae2f575..9c220f244702 100644
--- a/sys/dev/isci/scil/sci_base_remote_device.h
+++ b/sys/dev/isci/scil/sci_base_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_request.c b/sys/dev/isci/scil/sci_base_request.c
index d9a619207419..ecb75c4ee878 100644
--- a/sys/dev/isci/scil/sci_base_request.c
+++ b/sys/dev/isci/scil/sci_base_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_request.h b/sys/dev/isci/scil/sci_base_request.h
index 5638932bd085..231c0bf11a5e 100644
--- a/sys/dev/isci/scil/sci_base_request.h
+++ b/sys/dev/isci/scil/sci_base_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state.h b/sys/dev/isci/scil/sci_base_state.h
index 8b93c929ff2e..68cce84b5f1b 100644
--- a/sys/dev/isci/scil/sci_base_state.h
+++ b/sys/dev/isci/scil/sci_base_state.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine.c b/sys/dev/isci/scil/sci_base_state_machine.c
index 2f1720acc9ac..0e95c64bbf08 100644
--- a/sys/dev/isci/scil/sci_base_state_machine.c
+++ b/sys/dev/isci/scil/sci_base_state_machine.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine.h b/sys/dev/isci/scil/sci_base_state_machine.h
index a0d5e02711e1..9a5f7491c2ba 100644
--- a/sys/dev/isci/scil/sci_base_state_machine.h
+++ b/sys/dev/isci/scil/sci_base_state_machine.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine_logger.c b/sys/dev/isci/scil/sci_base_state_machine_logger.c
index 02cac1fd9835..0adec264d9bc 100644
--- a/sys/dev/isci/scil/sci_base_state_machine_logger.c
+++ b/sys/dev/isci/scil/sci_base_state_machine_logger.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine_logger.h b/sys/dev/isci/scil/sci_base_state_machine_logger.h
index 5acf10648a57..42f2121146ea 100644
--- a/sys/dev/isci/scil/sci_base_state_machine_logger.h
+++ b/sys/dev/isci/scil/sci_base_state_machine_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine_observer.c b/sys/dev/isci/scil/sci_base_state_machine_observer.c
index c4e2376ee7d3..5a0ef54ca780 100644
--- a/sys/dev/isci/scil/sci_base_state_machine_observer.c
+++ b/sys/dev/isci/scil/sci_base_state_machine_observer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_state_machine_observer.h b/sys/dev/isci/scil/sci_base_state_machine_observer.h
index 27b4b3a4bdb5..adbeabd9d374 100644
--- a/sys/dev/isci/scil/sci_base_state_machine_observer.h
+++ b/sys/dev/isci/scil/sci_base_state_machine_observer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_subject.c b/sys/dev/isci/scil/sci_base_subject.c
index 0ba41aaaa484..894136dc5110 100644
--- a/sys/dev/isci/scil/sci_base_subject.c
+++ b/sys/dev/isci/scil/sci_base_subject.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_base_subject.h b/sys/dev/isci/scil/sci_base_subject.h
index 92b19b974a6c..0499d1b55169 100644
--- a/sys/dev/isci/scil/sci_base_subject.h
+++ b/sys/dev/isci/scil/sci_base_subject.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_controller.h b/sys/dev/isci/scil/sci_controller.h
index 4396f4c9692a..ca004f0873c8 100644
--- a/sys/dev/isci/scil/sci_controller.h
+++ b/sys/dev/isci/scil/sci_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_controller_constants.h b/sys/dev/isci/scil/sci_controller_constants.h
index 04a47856de51..c4e97f6878be 100644
--- a/sys/dev/isci/scil/sci_controller_constants.h
+++ b/sys/dev/isci/scil/sci_controller_constants.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_fast_list.h b/sys/dev/isci/scil/sci_fast_list.h
index 361abb337d2b..0325fadf0ff8 100644
--- a/sys/dev/isci/scil/sci_fast_list.h
+++ b/sys/dev/isci/scil/sci_fast_list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_iterator.h b/sys/dev/isci/scil/sci_iterator.h
index 0ed3d2d1c938..fd5cab2ff74a 100644
--- a/sys/dev/isci/scil/sci_iterator.h
+++ b/sys/dev/isci/scil/sci_iterator.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_library.h b/sys/dev/isci/scil/sci_library.h
index 3fa542d769e6..6dea219f85cb 100644
--- a/sys/dev/isci/scil/sci_library.h
+++ b/sys/dev/isci/scil/sci_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_logger.h b/sys/dev/isci/scil/sci_logger.h
index f30adca4fdeb..e98081223fac 100644
--- a/sys/dev/isci/scil/sci_logger.h
+++ b/sys/dev/isci/scil/sci_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_memory_descriptor_list.h b/sys/dev/isci/scil/sci_memory_descriptor_list.h
index 6b78fbc6055d..3912ceb379ff 100644
--- a/sys/dev/isci/scil/sci_memory_descriptor_list.h
+++ b/sys/dev/isci/scil/sci_memory_descriptor_list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h b/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h
index 3f7bd24f88c4..42f4db1efa60 100644
--- a/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h
+++ b/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_object.h b/sys/dev/isci/scil/sci_object.h
index cb1bda14a88e..e88e44b37cb6 100644
--- a/sys/dev/isci/scil/sci_object.h
+++ b/sys/dev/isci/scil/sci_object.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_overview.h b/sys/dev/isci/scil/sci_overview.h
index 3cde341efb1f..fadea725735a 100644
--- a/sys/dev/isci/scil/sci_overview.h
+++ b/sys/dev/isci/scil/sci_overview.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_pool.h b/sys/dev/isci/scil/sci_pool.h
index da642ad76075..2a4d45e9b62c 100644
--- a/sys/dev/isci/scil/sci_pool.h
+++ b/sys/dev/isci/scil/sci_pool.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_simple_list.h b/sys/dev/isci/scil/sci_simple_list.h
index 2ebb7298db49..9c0848a52fcc 100644
--- a/sys/dev/isci/scil/sci_simple_list.h
+++ b/sys/dev/isci/scil/sci_simple_list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_status.h b/sys/dev/isci/scil/sci_status.h
index 27c0d87dae1b..1b40860c8385 100644
--- a/sys/dev/isci/scil/sci_status.h
+++ b/sys/dev/isci/scil/sci_status.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_types.h b/sys/dev/isci/scil/sci_types.h
index 48e58d178191..b48ee7bfbdd0 100644
--- a/sys/dev/isci/scil/sci_types.h
+++ b/sys/dev/isci/scil/sci_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_util.c b/sys/dev/isci/scil/sci_util.c
index 53038eb0d6ca..693bc8bb478d 100644
--- a/sys/dev/isci/scil/sci_util.c
+++ b/sys/dev/isci/scil/sci_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/sci_util.h b/sys/dev/isci/scil/sci_util.h
index 9e2b0343aeb8..f7c14ac04bdf 100644
--- a/sys/dev/isci/scil/sci_util.h
+++ b/sys/dev/isci/scil/sci_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_config_parameters.h b/sys/dev/isci/scil/scic_config_parameters.h
index aafd12fc28a6..969cd30350fe 100644
--- a/sys/dev/isci/scil/scic_config_parameters.h
+++ b/sys/dev/isci/scil/scic_config_parameters.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_controller.h b/sys/dev/isci/scil/scic_controller.h
index f87f14b658e6..31c94af6d1f8 100644
--- a/sys/dev/isci/scil/scic_controller.h
+++ b/sys/dev/isci/scil/scic_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_io_request.h b/sys/dev/isci/scil/scic_io_request.h
index d3cc800e667a..21c70c0f243c 100644
--- a/sys/dev/isci/scil/scic_io_request.h
+++ b/sys/dev/isci/scil/scic_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_library.h b/sys/dev/isci/scil/scic_library.h
index 25f6a339f77b..269ffd7724e3 100644
--- a/sys/dev/isci/scil/scic_library.h
+++ b/sys/dev/isci/scil/scic_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_logger.h b/sys/dev/isci/scil/scic_logger.h
index b64c60d4c083..0a9e50b1f6fd 100644
--- a/sys/dev/isci/scil/scic_logger.h
+++ b/sys/dev/isci/scil/scic_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_overview.h b/sys/dev/isci/scil/scic_overview.h
index eb47fe1aca02..87216c805d39 100644
--- a/sys/dev/isci/scil/scic_overview.h
+++ b/sys/dev/isci/scil/scic_overview.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_phy.h b/sys/dev/isci/scil/scic_phy.h
index 6007c14f7242..75b11d47cedc 100644
--- a/sys/dev/isci/scil/scic_phy.h
+++ b/sys/dev/isci/scil/scic_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_port.h b/sys/dev/isci/scil/scic_port.h
index b6588b77a912..4c4ee051fb83 100644
--- a/sys/dev/isci/scil/scic_port.h
+++ b/sys/dev/isci/scil/scic_port.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_remote_device.h b/sys/dev/isci/scil/scic_remote_device.h
index ab8e77154875..9abd04dbf748 100644
--- a/sys/dev/isci/scil/scic_remote_device.h
+++ b/sys/dev/isci/scil/scic_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_controller.c b/sys/dev/isci/scil/scic_sds_controller.c
index 2532d87a37db..767f89c04e3c 100644
--- a/sys/dev/isci/scil/scic_sds_controller.c
+++ b/sys/dev/isci/scil/scic_sds_controller.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_controller.h b/sys/dev/isci/scil/scic_sds_controller.h
index 54c7ffe34104..fe3468f157d9 100644
--- a/sys/dev/isci/scil/scic_sds_controller.h
+++ b/sys/dev/isci/scil/scic_sds_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_controller_registers.h b/sys/dev/isci/scil/scic_sds_controller_registers.h
index ecb5cbff9d68..81a1f3f8f01c 100644
--- a/sys/dev/isci/scil/scic_sds_controller_registers.h
+++ b/sys/dev/isci/scil/scic_sds_controller_registers.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_library.c b/sys/dev/isci/scil/scic_sds_library.c
index 3f7dace4b4d2..5337516e81a1 100644
--- a/sys/dev/isci/scil/scic_sds_library.c
+++ b/sys/dev/isci/scil/scic_sds_library.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_library.h b/sys/dev/isci/scil/scic_sds_library.h
index 25515107b790..d6a7c83a9d5d 100644
--- a/sys/dev/isci/scil/scic_sds_library.h
+++ b/sys/dev/isci/scil/scic_sds_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_logger.h b/sys/dev/isci/scil/scic_sds_logger.h
index 710590af6510..56e50dce1891 100644
--- a/sys/dev/isci/scil/scic_sds_logger.h
+++ b/sys/dev/isci/scil/scic_sds_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_pci.c b/sys/dev/isci/scil/scic_sds_pci.c
index 3c5b285180d3..d5d620055e52 100644
--- a/sys/dev/isci/scil/scic_sds_pci.c
+++ b/sys/dev/isci/scil/scic_sds_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_pci.h b/sys/dev/isci/scil/scic_sds_pci.h
index 4b33c8015da3..8ddcd7d4b245 100644
--- a/sys/dev/isci/scil/scic_sds_pci.h
+++ b/sys/dev/isci/scil/scic_sds_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_phy.c b/sys/dev/isci/scil/scic_sds_phy.c
index a812be2cab24..a7755c3e5df4 100644
--- a/sys/dev/isci/scil/scic_sds_phy.c
+++ b/sys/dev/isci/scil/scic_sds_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_phy.h b/sys/dev/isci/scil/scic_sds_phy.h
index eda6998e8be7..501a7244dc1b 100644
--- a/sys/dev/isci/scil/scic_sds_phy.h
+++ b/sys/dev/isci/scil/scic_sds_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_phy_registers.h b/sys/dev/isci/scil/scic_sds_phy_registers.h
index 46524fdfd7ee..24ed608d291c 100644
--- a/sys/dev/isci/scil/scic_sds_phy_registers.h
+++ b/sys/dev/isci/scil/scic_sds_phy_registers.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_port.c b/sys/dev/isci/scil/scic_sds_port.c
index 938d82d48e46..42993a349465 100644
--- a/sys/dev/isci/scil/scic_sds_port.c
+++ b/sys/dev/isci/scil/scic_sds_port.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_port.h b/sys/dev/isci/scil/scic_sds_port.h
index 677f2026a650..321f6674ec63 100644
--- a/sys/dev/isci/scil/scic_sds_port.h
+++ b/sys/dev/isci/scil/scic_sds_port.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_port_configuration_agent.c b/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
index d23e0623b00a..95e442ff1ebf 100644
--- a/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
+++ b/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_port_configuration_agent.h b/sys/dev/isci/scil/scic_sds_port_configuration_agent.h
index 89adeeccce98..37f533777da7 100644
--- a/sys/dev/isci/scil/scic_sds_port_configuration_agent.h
+++ b/sys/dev/isci/scil/scic_sds_port_configuration_agent.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_port_registers.h b/sys/dev/isci/scil/scic_sds_port_registers.h
index 3a201dc3933d..3e567969b3c9 100644
--- a/sys/dev/isci/scil/scic_sds_port_registers.h
+++ b/sys/dev/isci/scil/scic_sds_port_registers.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_device.c b/sys/dev/isci/scil/scic_sds_remote_device.c
index 763930781905..efc2f18c0a4b 100644
--- a/sys/dev/isci/scil/scic_sds_remote_device.c
+++ b/sys/dev/isci/scil/scic_sds_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_device.h b/sys/dev/isci/scil/scic_sds_remote_device.h
index 2170e934cff0..432227d7faae 100644
--- a/sys/dev/isci/scil/scic_sds_remote_device.h
+++ b/sys/dev/isci/scil/scic_sds_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.c b/sys/dev/isci/scil/scic_sds_remote_node_context.c
index 8d3698a9a09a..bbcedeef7734 100644
--- a/sys/dev/isci/scil/scic_sds_remote_node_context.c
+++ b/sys/dev/isci/scil/scic_sds_remote_node_context.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.h b/sys/dev/isci/scil/scic_sds_remote_node_context.h
index 3eb9011a5b79..4b4481db1ebf 100644
--- a/sys/dev/isci/scil/scic_sds_remote_node_context.h
+++ b/sys/dev/isci/scil/scic_sds_remote_node_context.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_node_table.c b/sys/dev/isci/scil/scic_sds_remote_node_table.c
index 51329f2565c3..2c287bd90497 100644
--- a/sys/dev/isci/scil/scic_sds_remote_node_table.c
+++ b/sys/dev/isci/scil/scic_sds_remote_node_table.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_remote_node_table.h b/sys/dev/isci/scil/scic_sds_remote_node_table.h
index 482f320411be..8912c1751bc6 100644
--- a/sys/dev/isci/scil/scic_sds_remote_node_table.h
+++ b/sys/dev/isci/scil/scic_sds_remote_node_table.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_request.c b/sys/dev/isci/scil/scic_sds_request.c
index ea3c93551b65..3e85785042e0 100644
--- a/sys/dev/isci/scil/scic_sds_request.c
+++ b/sys/dev/isci/scil/scic_sds_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_request.h b/sys/dev/isci/scil/scic_sds_request.h
index a1783176dd84..1940721eb2b9 100644
--- a/sys/dev/isci/scil/scic_sds_request.h
+++ b/sys/dev/isci/scil/scic_sds_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_sgpio.c b/sys/dev/isci/scil/scic_sds_sgpio.c
index e85445de021c..25441c29833d 100644
--- a/sys/dev/isci/scil/scic_sds_sgpio.c
+++ b/sys/dev/isci/scil/scic_sds_sgpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_smp_remote_device.c b/sys/dev/isci/scil/scic_sds_smp_remote_device.c
index d6b7642ac1ad..579e05c1d02a 100644
--- a/sys/dev/isci/scil/scic_sds_smp_remote_device.c
+++ b/sys/dev/isci/scil/scic_sds_smp_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_smp_request.c b/sys/dev/isci/scil/scic_sds_smp_request.c
index d0b4029b2466..ea92782fbfd8 100644
--- a/sys/dev/isci/scil/scic_sds_smp_request.c
+++ b/sys/dev/isci/scil/scic_sds_smp_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_smp_request.h b/sys/dev/isci/scil/scic_sds_smp_request.h
index 6f1421eead84..ad9a33ade913 100644
--- a/sys/dev/isci/scil/scic_sds_smp_request.h
+++ b/sys/dev/isci/scil/scic_sds_smp_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_ssp_request.c b/sys/dev/isci/scil/scic_sds_ssp_request.c
index 6f580e48e30f..c7a67acf0a04 100644
--- a/sys/dev/isci/scil/scic_sds_ssp_request.c
+++ b/sys/dev/isci/scil/scic_sds_ssp_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_packet_request.c b/sys/dev/isci/scil/scic_sds_stp_packet_request.c
index 327dcdfff4b8..42a7497b7ad0 100644
--- a/sys/dev/isci/scil/scic_sds_stp_packet_request.c
+++ b/sys/dev/isci/scil/scic_sds_stp_packet_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_packet_request.h b/sys/dev/isci/scil/scic_sds_stp_packet_request.h
index 227fa2f21a6c..2c51f96e8bb7 100644
--- a/sys/dev/isci/scil/scic_sds_stp_packet_request.h
+++ b/sys/dev/isci/scil/scic_sds_stp_packet_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_pio_request.h b/sys/dev/isci/scil/scic_sds_stp_pio_request.h
index ca36b56c5337..3a0eb40f8f10 100644
--- a/sys/dev/isci/scil/scic_sds_stp_pio_request.h
+++ b/sys/dev/isci/scil/scic_sds_stp_pio_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_remote_device.c b/sys/dev/isci/scil/scic_sds_stp_remote_device.c
index 70f6ff187da2..8eb511f93136 100644
--- a/sys/dev/isci/scil/scic_sds_stp_remote_device.c
+++ b/sys/dev/isci/scil/scic_sds_stp_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_request.c b/sys/dev/isci/scil/scic_sds_stp_request.c
index f35e8cca7256..5a2612cf588d 100644
--- a/sys/dev/isci/scil/scic_sds_stp_request.c
+++ b/sys/dev/isci/scil/scic_sds_stp_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_stp_request.h b/sys/dev/isci/scil/scic_sds_stp_request.h
index fedde046e444..5d57acfcf1b7 100644
--- a/sys/dev/isci/scil/scic_sds_stp_request.h
+++ b/sys/dev/isci/scil/scic_sds_stp_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c b/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c
index d9e214a49123..f3fd91ad8dc3 100644
--- a/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c
+++ b/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h b/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h
index 28620f23f7dd..a05572df0f9a 100644
--- a/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h
+++ b/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_sgpio.h b/sys/dev/isci/scil/scic_sgpio.h
index eb5ad3bb1a97..4fc5197ed422 100644
--- a/sys/dev/isci/scil/scic_sgpio.h
+++ b/sys/dev/isci/scil/scic_sgpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_task_request.h b/sys/dev/isci/scil/scic_task_request.h
index 104db8e27436..0b93972e8a68 100644
--- a/sys/dev/isci/scil/scic_task_request.h
+++ b/sys/dev/isci/scil/scic_task_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scic_user_callback.h b/sys/dev/isci/scil/scic_user_callback.h
index 292237062ae3..3f75c7816a67 100644
--- a/sys/dev/isci/scil/scic_user_callback.h
+++ b/sys/dev/isci/scil/scic_user_callback.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_config_parameters.h b/sys/dev/isci/scil/scif_config_parameters.h
index 8f68df7d2e4d..d5d15bf906cf 100644
--- a/sys/dev/isci/scil/scif_config_parameters.h
+++ b/sys/dev/isci/scil/scif_config_parameters.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_controller.h b/sys/dev/isci/scil/scif_controller.h
index e7142a28e485..61a513fc4585 100644
--- a/sys/dev/isci/scil/scif_controller.h
+++ b/sys/dev/isci/scil/scif_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_domain.h b/sys/dev/isci/scil/scif_domain.h
index 22d3dbfd3d94..73ca775ef546 100644
--- a/sys/dev/isci/scil/scif_domain.h
+++ b/sys/dev/isci/scil/scif_domain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_io_request.h b/sys/dev/isci/scil/scif_io_request.h
index 9734d5e07cb6..69d86eed7070 100644
--- a/sys/dev/isci/scil/scif_io_request.h
+++ b/sys/dev/isci/scil/scif_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_library.h b/sys/dev/isci/scil/scif_library.h
index a1d8a8faf03c..28de43d7b443 100644
--- a/sys/dev/isci/scil/scif_library.h
+++ b/sys/dev/isci/scil/scif_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_logger.h b/sys/dev/isci/scil/scif_logger.h
index d5c124135437..f9d760cbf410 100644
--- a/sys/dev/isci/scil/scif_logger.h
+++ b/sys/dev/isci/scil/scif_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_overview.h b/sys/dev/isci/scil/scif_overview.h
index d19e05914d94..b7132bbf5054 100644
--- a/sys/dev/isci/scil/scif_overview.h
+++ b/sys/dev/isci/scil/scif_overview.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_remote_device.h b/sys/dev/isci/scil/scif_remote_device.h
index 08dbbe8ae499..f67d40d8967f 100644
--- a/sys/dev/isci/scil/scif_remote_device.h
+++ b/sys/dev/isci/scil/scif_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_constants.h b/sys/dev/isci/scil/scif_sas_constants.h
index c9670ebbac65..88404efb37c5 100644
--- a/sys/dev/isci/scil/scif_sas_constants.h
+++ b/sys/dev/isci/scil/scif_sas_constants.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_controller.c b/sys/dev/isci/scil/scif_sas_controller.c
index cd738fa5cd7f..c385dfa92362 100644
--- a/sys/dev/isci/scil/scif_sas_controller.c
+++ b/sys/dev/isci/scil/scif_sas_controller.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_controller.h b/sys/dev/isci/scil/scif_sas_controller.h
index fc7583e84367..1efd00d10b89 100644
--- a/sys/dev/isci/scil/scif_sas_controller.h
+++ b/sys/dev/isci/scil/scif_sas_controller.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_controller_state_handlers.c b/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
index d0704a1e8f44..397cfbca1576 100644
--- a/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_controller_states.c b/sys/dev/isci/scil/scif_sas_controller_states.c
index e5a88a917ee1..7f280fc65905 100644
--- a/sys/dev/isci/scil/scif_sas_controller_states.c
+++ b/sys/dev/isci/scil/scif_sas_controller_states.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_design.h b/sys/dev/isci/scil/scif_sas_design.h
index 1f2e8a851287..e847b284ff85 100644
--- a/sys/dev/isci/scil/scif_sas_design.h
+++ b/sys/dev/isci/scil/scif_sas_design.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_domain.c b/sys/dev/isci/scil/scif_sas_domain.c
index a6a3d70132e4..c5a54fad6cd6 100644
--- a/sys/dev/isci/scil/scif_sas_domain.c
+++ b/sys/dev/isci/scil/scif_sas_domain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_domain.h b/sys/dev/isci/scil/scif_sas_domain.h
index 654f3772f261..9fbd338e7a8c 100644
--- a/sys/dev/isci/scil/scif_sas_domain.h
+++ b/sys/dev/isci/scil/scif_sas_domain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_domain_state_handlers.c b/sys/dev/isci/scil/scif_sas_domain_state_handlers.c
index 89188b334431..42b75fc9211b 100644
--- a/sys/dev/isci/scil/scif_sas_domain_state_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_domain_state_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_domain_states.c b/sys/dev/isci/scil/scif_sas_domain_states.c
index 84f8e53189d3..803c26adc3f7 100644
--- a/sys/dev/isci/scil/scif_sas_domain_states.c
+++ b/sys/dev/isci/scil/scif_sas_domain_states.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c b/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c
index 1999a9e84912..a9aada72468a 100644
--- a/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c
+++ b/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h b/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h
index c630af19c9c1..451285038e5b 100644
--- a/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h
+++ b/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_internal_io_request.c b/sys/dev/isci/scil/scif_sas_internal_io_request.c
index 7086b817d64b..9d98190fbf18 100644
--- a/sys/dev/isci/scil/scif_sas_internal_io_request.c
+++ b/sys/dev/isci/scil/scif_sas_internal_io_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_internal_io_request.h b/sys/dev/isci/scil/scif_sas_internal_io_request.h
index 18967e412044..411e46fd0132 100644
--- a/sys/dev/isci/scil/scif_sas_internal_io_request.h
+++ b/sys/dev/isci/scil/scif_sas_internal_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_io_request.c b/sys/dev/isci/scil/scif_sas_io_request.c
index e0461ae2f366..4983c37ac1d2 100644
--- a/sys/dev/isci/scil/scif_sas_io_request.c
+++ b/sys/dev/isci/scil/scif_sas_io_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_io_request.h b/sys/dev/isci/scil/scif_sas_io_request.h
index 7dd9ea6b8c18..f09f9febbcbd 100644
--- a/sys/dev/isci/scil/scif_sas_io_request.h
+++ b/sys/dev/isci/scil/scif_sas_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c b/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c
index 0111e7a023ab..303ea852aeb7 100644
--- a/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_io_request_states.c b/sys/dev/isci/scil/scif_sas_io_request_states.c
index 13d9f5636c7a..0ae3ca29ecf4 100644
--- a/sys/dev/isci/scil/scif_sas_io_request_states.c
+++ b/sys/dev/isci/scil/scif_sas_io_request_states.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_library.c b/sys/dev/isci/scil/scif_sas_library.c
index 015f8f00eaa0..5521d6f56b53 100644
--- a/sys/dev/isci/scil/scif_sas_library.c
+++ b/sys/dev/isci/scil/scif_sas_library.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_library.h b/sys/dev/isci/scil/scif_sas_library.h
index 66947b00215b..63c1ca2012f3 100644
--- a/sys/dev/isci/scil/scif_sas_library.h
+++ b/sys/dev/isci/scil/scif_sas_library.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_logger.h b/sys/dev/isci/scil/scif_sas_logger.h
index e9712ffa7d1f..d2bdabcb04e2 100644
--- a/sys/dev/isci/scil/scif_sas_logger.h
+++ b/sys/dev/isci/scil/scif_sas_logger.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device.c b/sys/dev/isci/scil/scif_sas_remote_device.c
index 991c6a0b482f..5fcebd6497b1 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device.h b/sys/dev/isci/scil/scif_sas_remote_device.h
index be066f83381a..91ad2edd28e3 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device.h
+++ b/sys/dev/isci/scil/scif_sas_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c b/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c
index 514624dba0d6..447143424ae0 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c b/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
index 24a10a23ee61..9f6bb4a9df57 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c b/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
index 8027469ef856..ec0612598f20 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c b/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c
index 37dd878fac92..4639fd360d51 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c b/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c
index 64a06629c553..dc6aa4ededd8 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_remote_device_states.c b/sys/dev/isci/scil/scif_sas_remote_device_states.c
index 98ea9db1c5d6..fda6db1cc68b 100644
--- a/sys/dev/isci/scil/scif_sas_remote_device_states.c
+++ b/sys/dev/isci/scil/scif_sas_remote_device_states.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_request.c b/sys/dev/isci/scil/scif_sas_request.c
index 2fff5cd9df44..9c7d62ef5ac9 100644
--- a/sys/dev/isci/scil/scif_sas_request.c
+++ b/sys/dev/isci/scil/scif_sas_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_request.h b/sys/dev/isci/scil/scif_sas_request.h
index b0a5a8b288fc..0dc41e3696b7 100644
--- a/sys/dev/isci/scil/scif_sas_request.h
+++ b/sys/dev/isci/scil/scif_sas_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_sati_binding.h b/sys/dev/isci/scil/scif_sas_sati_binding.h
index c4d9ea9de6f9..329efd7794f9 100644
--- a/sys/dev/isci/scil/scif_sas_sati_binding.h
+++ b/sys/dev/isci/scil/scif_sas_sati_binding.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c b/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
index 123abed1d412..998e147c2a71 100644
--- a/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
+++ b/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_io_request.c b/sys/dev/isci/scil/scif_sas_smp_io_request.c
index 3452993a9fbf..818eb5f9e9a2 100644
--- a/sys/dev/isci/scil/scif_sas_smp_io_request.c
+++ b/sys/dev/isci/scil/scif_sas_smp_io_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_io_request.h b/sys/dev/isci/scil/scif_sas_smp_io_request.h
index a821b1720209..6497cb848dde 100644
--- a/sys/dev/isci/scil/scif_sas_smp_io_request.h
+++ b/sys/dev/isci/scil/scif_sas_smp_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_phy.c b/sys/dev/isci/scil/scif_sas_smp_phy.c
index 60ac048370b8..ad3a0419a62f 100644
--- a/sys/dev/isci/scil/scif_sas_smp_phy.c
+++ b/sys/dev/isci/scil/scif_sas_smp_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_phy.h b/sys/dev/isci/scil/scif_sas_smp_phy.h
index 9e462bece2c9..703d0bed21ed 100644
--- a/sys/dev/isci/scil/scif_sas_smp_phy.h
+++ b/sys/dev/isci/scil/scif_sas_smp_phy.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
index a1353ffa6a09..c27a0e8bd478 100644
--- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c
+++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.h b/sys/dev/isci/scil/scif_sas_smp_remote_device.h
index 6979b1b47e9c..a28683d7beb5 100644
--- a/sys/dev/isci/scil/scif_sas_smp_remote_device.h
+++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_io_request.c b/sys/dev/isci/scil/scif_sas_stp_io_request.c
index 671389267a7f..cca50c64f969 100644
--- a/sys/dev/isci/scil/scif_sas_stp_io_request.c
+++ b/sys/dev/isci/scil/scif_sas_stp_io_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_io_request.h b/sys/dev/isci/scil/scif_sas_stp_io_request.h
index b24c9479162d..0c9ba4bc60b1 100644
--- a/sys/dev/isci/scil/scif_sas_stp_io_request.h
+++ b/sys/dev/isci/scil/scif_sas_stp_io_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_remote_device.c b/sys/dev/isci/scil/scif_sas_stp_remote_device.c
index 280cc8e8a31d..2ead30495346 100644
--- a/sys/dev/isci/scil/scif_sas_stp_remote_device.c
+++ b/sys/dev/isci/scil/scif_sas_stp_remote_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_remote_device.h b/sys/dev/isci/scil/scif_sas_stp_remote_device.h
index 323fe2937665..94e1b3679e9e 100644
--- a/sys/dev/isci/scil/scif_sas_stp_remote_device.h
+++ b/sys/dev/isci/scil/scif_sas_stp_remote_device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_task_request.c b/sys/dev/isci/scil/scif_sas_stp_task_request.c
index 495f923834cb..e7680d66e912 100644
--- a/sys/dev/isci/scil/scif_sas_stp_task_request.c
+++ b/sys/dev/isci/scil/scif_sas_stp_task_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_stp_task_request.h b/sys/dev/isci/scil/scif_sas_stp_task_request.h
index 18a22d99f125..cbba60040687 100644
--- a/sys/dev/isci/scil/scif_sas_stp_task_request.h
+++ b/sys/dev/isci/scil/scif_sas_stp_task_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_task_request.c b/sys/dev/isci/scil/scif_sas_task_request.c
index 38f45668fcba..0dddf36b5a91 100644
--- a/sys/dev/isci/scil/scif_sas_task_request.c
+++ b/sys/dev/isci/scil/scif_sas_task_request.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_task_request.h b/sys/dev/isci/scil/scif_sas_task_request.h
index f4f1d525adcf..3fd85e0f74a4 100644
--- a/sys/dev/isci/scil/scif_sas_task_request.h
+++ b/sys/dev/isci/scil/scif_sas_task_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c b/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c
index 76daad7b9a9a..0e032e825a4e 100644
--- a/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c
+++ b/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_task_request_states.c b/sys/dev/isci/scil/scif_sas_task_request_states.c
index 65e8b4dd7e51..684fda557f76 100644
--- a/sys/dev/isci/scil/scif_sas_task_request_states.c
+++ b/sys/dev/isci/scil/scif_sas_task_request_states.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_sas_timer.c b/sys/dev/isci/scil/scif_sas_timer.c
index 1da91e90c70a..6457f6013bbe 100644
--- a/sys/dev/isci/scil/scif_sas_timer.c
+++ b/sys/dev/isci/scil/scif_sas_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_task_request.h b/sys/dev/isci/scil/scif_task_request.h
index f64bf86234cf..c0ad0876c496 100644
--- a/sys/dev/isci/scil/scif_task_request.h
+++ b/sys/dev/isci/scil/scif_task_request.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scif_user_callback.h b/sys/dev/isci/scil/scif_user_callback.h
index 39c6718b6f3e..70ef235a13be 100644
--- a/sys/dev/isci/scil/scif_user_callback.h
+++ b/sys/dev/isci/scil/scif_user_callback.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_bios_definitions.h b/sys/dev/isci/scil/scu_bios_definitions.h
index a33f7edc82dc..67d2ffd5911d 100644
--- a/sys/dev/isci/scil/scu_bios_definitions.h
+++ b/sys/dev/isci/scil/scu_bios_definitions.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_completion_codes.h b/sys/dev/isci/scil/scu_completion_codes.h
index e86a2c54a996..2ea2b9df74ac 100644
--- a/sys/dev/isci/scil/scu_completion_codes.h
+++ b/sys/dev/isci/scil/scu_completion_codes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_constants.h b/sys/dev/isci/scil/scu_constants.h
index c211a6c6bcf8..98641d1c652f 100644
--- a/sys/dev/isci/scil/scu_constants.h
+++ b/sys/dev/isci/scil/scu_constants.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_event_codes.h b/sys/dev/isci/scil/scu_event_codes.h
index 47ac82684ec5..9aefede58502 100644
--- a/sys/dev/isci/scil/scu_event_codes.h
+++ b/sys/dev/isci/scil/scu_event_codes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_registers.h b/sys/dev/isci/scil/scu_registers.h
index eca54fa7e452..a72c629afd79 100644
--- a/sys/dev/isci/scil/scu_registers.h
+++ b/sys/dev/isci/scil/scu_registers.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_remote_node_context.h b/sys/dev/isci/scil/scu_remote_node_context.h
index b5c301e3f6df..78786ff8e715 100644
--- a/sys/dev/isci/scil/scu_remote_node_context.h
+++ b/sys/dev/isci/scil/scu_remote_node_context.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_task_context.h b/sys/dev/isci/scil/scu_task_context.h
index dc78899dd9a5..39a639672f3e 100644
--- a/sys/dev/isci/scil/scu_task_context.h
+++ b/sys/dev/isci/scil/scu_task_context.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_unsolicited_frame.h b/sys/dev/isci/scil/scu_unsolicited_frame.h
index e8b0f88e098f..a99a7b2232a6 100644
--- a/sys/dev/isci/scil/scu_unsolicited_frame.h
+++ b/sys/dev/isci/scil/scu_unsolicited_frame.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/scil/scu_viit_data.h b/sys/dev/isci/scil/scu_viit_data.h
index f264c2e6a7b7..9c9d14d30466 100644
--- a/sys/dev/isci/scil/scu_viit_data.h
+++ b/sys/dev/isci/scil/scu_viit_data.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
- *
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
diff --git a/sys/dev/isci/types.h b/sys/dev/isci/types.h
index 51f3aff93408..59c48343a94e 100644
--- a/sys/dev/isci/types.h
+++ b/sys/dev/isci/types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c
index d3888ef8d09c..2823074f2104 100644
--- a/sys/dev/iscsi/icl.c
+++ b/sys/dev/iscsi/icl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi/icl.h b/sys/dev/iscsi/icl.h
index 144e8a478cb7..292fa6006657 100644
--- a/sys/dev/iscsi/icl.h
+++ b/sys/dev/iscsi/icl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 42bb8fd03cb2..15ee7fc71796 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi/iscsi.h b/sys/dev/iscsi/iscsi.h
index ebafd518858f..3225649cc464 100644
--- a/sys/dev/iscsi/iscsi.h
+++ b/sys/dev/iscsi/iscsi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h
index aa05a966325a..a494cd558ed1 100644
--- a/sys/dev/iscsi/iscsi_ioctl.h
+++ b/sys/dev/iscsi/iscsi_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi/iscsi_proto.h b/sys/dev/iscsi/iscsi_proto.h
index 9ec24f46425a..ee19fbc92a21 100644
--- a/sys/dev/iscsi/iscsi_proto.h
+++ b/sys/dev/iscsi/iscsi_proto.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c
index f967901152e3..2324a409b643 100644
--- a/sys/dev/iscsi_initiator/isc_cam.c
+++ b/sys/dev/iscsi_initiator/isc_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/isc_sm.c b/sys/dev/iscsi_initiator/isc_sm.c
index 588c674c06f2..097cdcca2153 100644
--- a/sys/dev/iscsi_initiator/isc_sm.c
+++ b/sys/dev/iscsi_initiator/isc_sm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c
index 92f111627fdc..1e25f7268360 100644
--- a/sys/dev/iscsi_initiator/isc_soc.c
+++ b/sys/dev/iscsi_initiator/isc_soc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/isc_subr.c b/sys/dev/iscsi_initiator/isc_subr.c
index f3dfcb715e2f..d553cd1c3326 100644
--- a/sys/dev/iscsi_initiator/isc_subr.c
+++ b/sys/dev/iscsi_initiator/isc_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c
index 3ce4abc0de30..ac3d1cc15547 100644
--- a/sys/dev/iscsi_initiator/iscsi.c
+++ b/sys/dev/iscsi_initiator/iscsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/iscsi.h b/sys/dev/iscsi_initiator/iscsi.h
index 6791fbfd87c0..5f9d36b1b2b7 100644
--- a/sys/dev/iscsi_initiator/iscsi.h
+++ b/sys/dev/iscsi_initiator/iscsi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/iscsi_subr.c b/sys/dev/iscsi_initiator/iscsi_subr.c
index 4d1869f5de6d..cf746cda65f7 100644
--- a/sys/dev/iscsi_initiator/iscsi_subr.c
+++ b/sys/dev/iscsi_initiator/iscsi_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/iscsi_initiator/iscsivar.h b/sys/dev/iscsi_initiator/iscsivar.h
index 2b70d815a382..681ad7053e0b 100644
--- a/sys/dev/iscsi_initiator/iscsivar.h
+++ b/sys/dev/iscsi_initiator/iscsivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 3f7850829b91..c39e4ef77ea7 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2017 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 6bd2a71b5f0f..ad6ddbed4669 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
*
* Copyright (c) 1997-2008 by Matthew Jacob
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index f54ea086dde5..8fda052067bb 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2006 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index 204603e783e1..72e2f179e3f2 100644
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2017 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/isp_library.h b/sys/dev/isp/isp_library.h
index 6e8d8153af51..1b45ad22ee5d 100644
--- a/sys/dev/isp/isp_library.h
+++ b/sys/dev/isp/isp_library.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2017 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 35e3e220b276..f8579357b2e3 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2006 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/isp/isp_stds.h b/sys/dev/isp/isp_stds.h
index c095901da4bd..a83f08f17ff3 100644
--- a/sys/dev/isp/isp_stds.h
+++ b/sys/dev/isp/isp_stds.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 046010cc713b..f7a7efa3399c 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index 633204ba4b4a..14945642cd63 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 0d72b94f207c..46d74ebe2eb6 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_1000.h b/sys/dev/ispfw/asm_1000.h
index 69193fac602d..fb064094d30b 100644
--- a/sys/dev/ispfw/asm_1000.h
+++ b/sys/dev/ispfw/asm_1000.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index 920919be2222..4df4e71113f4 100644
--- a/sys/dev/ispfw/asm_1040.h
+++ b/sys/dev/ispfw/asm_1040.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index 27b50a0b4f12..b29cc3c024d5 100644
--- a/sys/dev/ispfw/asm_1080.h
+++ b/sys/dev/ispfw/asm_1080.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index ca66ec7f8be6..18688bf8cf7e 100644
--- a/sys/dev/ispfw/asm_12160.h
+++ b/sys/dev/ispfw/asm_12160.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2100.h b/sys/dev/ispfw/asm_2100.h
index 34088424ef28..399707d57543 100644
--- a/sys/dev/ispfw/asm_2100.h
+++ b/sys/dev/ispfw/asm_2100.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index 953240a13733..f82513964c43 100644
--- a/sys/dev/ispfw/asm_2200.h
+++ b/sys/dev/ispfw/asm_2200.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2300.h b/sys/dev/ispfw/asm_2300.h
index b814ea78cc58..75808c398cb7 100644
--- a/sys/dev/ispfw/asm_2300.h
+++ b/sys/dev/ispfw/asm_2300.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2001, 2002, 2003, 2004, 2005 by Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2322.h b/sys/dev/ispfw/asm_2322.h
index c94450d162db..0e3504de25e5 100644
--- a/sys/dev/ispfw/asm_2322.h
+++ b/sys/dev/ispfw/asm_2322.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2004-2005 by Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2400.h b/sys/dev/ispfw/asm_2400.h
index 6ce19f030d54..4527e303bef6 100644
--- a/sys/dev/ispfw/asm_2400.h
+++ b/sys/dev/ispfw/asm_2400.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2005-2014 by Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2500.h b/sys/dev/ispfw/asm_2500.h
index 4cdea8fbea19..92993f22f2cc 100644
--- a/sys/dev/ispfw/asm_2500.h
+++ b/sys/dev/ispfw/asm_2500.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2005-2014 by Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index 3c963663939d..5f69d7c41d2e 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* ISP Firmware Modules for FreeBSD
*
* Copyright (c) 2000, 2001, 2006 by Matthew Jacob
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index 90e9dd1a04dc..4b3454f32b85 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
* Copyright (c) 2005-2006 Sam Leffler, Errno Consulting
diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h
index 32cec30e66fe..0e837ffa9aad 100644
--- a/sys/dev/iwi/if_iwireg.h
+++ b/sys/dev/iwi/if_iwireg.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
*
diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h
index 8cc68ab59459..88138cf0ed67 100644
--- a/sys/dev/iwi/if_iwivar.h
+++ b/sys/dev/iwi/if_iwivar.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
*
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 4aaa8dcaabc9..430c13c72d10 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index a2555803c240..e42dc1deca75 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/if_ixgb_osdep.h b/sys/dev/ixgb/if_ixgb_osdep.h
index 9bae97b3fc78..e8ce885525bb 100644
--- a/sys/dev/ixgb/if_ixgb_osdep.h
+++ b/sys/dev/ixgb/if_ixgb_osdep.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/ixgb_ee.c b/sys/dev/ixgb/ixgb_ee.c
index 5e5169d0783c..3dcd630c791f 100644
--- a/sys/dev/ixgb/ixgb_ee.c
+++ b/sys/dev/ixgb/ixgb_ee.c
@@ -1,5 +1,4 @@
/*******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/ixgb_ee.h b/sys/dev/ixgb/ixgb_ee.h
index 8a07de7cceb6..6a1163aab61b 100644
--- a/sys/dev/ixgb/ixgb_ee.h
+++ b/sys/dev/ixgb/ixgb_ee.h
@@ -1,5 +1,4 @@
/*******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/ixgb_hw.c b/sys/dev/ixgb/ixgb_hw.c
index 3832546d2e00..2985994cae55 100644
--- a/sys/dev/ixgb/ixgb_hw.c
+++ b/sys/dev/ixgb/ixgb_hw.c
@@ -1,5 +1,4 @@
/*******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/ixgb_hw.h b/sys/dev/ixgb/ixgb_hw.h
index 159807e5bf23..2194544e04ee 100644
--- a/sys/dev/ixgb/ixgb_hw.h
+++ b/sys/dev/ixgb/ixgb_hw.h
@@ -1,5 +1,4 @@
/*******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgb/ixgb_ids.h b/sys/dev/ixgb/ixgb_ids.h
index d7db0ac68370..d268eeb6c0dc 100644
--- a/sys/dev/ixgb/ixgb_ids.h
+++ b/sys/dev/ixgb/ixgb_ids.h
@@ -1,5 +1,4 @@
/*******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 969b3a551122..bcd053679309 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_82598.c b/sys/dev/ixgbe/ixgbe_82598.c
index 8e0563679b0f..2c6254969630 100644
--- a/sys/dev/ixgbe/ixgbe_82598.c
+++ b/sys/dev/ixgbe/ixgbe_82598.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_82598.h b/sys/dev/ixgbe/ixgbe_82598.h
index dc69c026423c..725d8ec3a115 100644
--- a/sys/dev/ixgbe/ixgbe_82598.h
+++ b/sys/dev/ixgbe/ixgbe_82598.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c
index 53b57035fbf3..736872460b88 100644
--- a/sys/dev/ixgbe/ixgbe_82599.c
+++ b/sys/dev/ixgbe/ixgbe_82599.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_82599.h b/sys/dev/ixgbe/ixgbe_82599.h
index ee9a33667e62..90c45db5c13e 100644
--- a/sys/dev/ixgbe/ixgbe_82599.h
+++ b/sys/dev/ixgbe/ixgbe_82599.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c
index fb91936e68e1..1dabc8beab5b 100644
--- a/sys/dev/ixgbe/ixgbe_api.c
+++ b/sys/dev/ixgbe/ixgbe_api.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_api.h b/sys/dev/ixgbe/ixgbe_api.h
index c59b3a2dea9c..926273405b05 100644
--- a/sys/dev/ixgbe/ixgbe_api.h
+++ b/sys/dev/ixgbe/ixgbe_api.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c
index 6c20c0758b56..8e21d5ec66d8 100644
--- a/sys/dev/ixgbe/ixgbe_common.c
+++ b/sys/dev/ixgbe/ixgbe_common.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_common.h b/sys/dev/ixgbe/ixgbe_common.h
index 90c2de3ead3c..f508410ed180 100644
--- a/sys/dev/ixgbe/ixgbe_common.h
+++ b/sys/dev/ixgbe/ixgbe_common.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb.c b/sys/dev/ixgbe/ixgbe_dcb.c
index 7c82359424f9..8aef8501958b 100644
--- a/sys/dev/ixgbe/ixgbe_dcb.c
+++ b/sys/dev/ixgbe/ixgbe_dcb.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb.h b/sys/dev/ixgbe/ixgbe_dcb.h
index 92baad807c30..86010d4417a5 100644
--- a/sys/dev/ixgbe/ixgbe_dcb.h
+++ b/sys/dev/ixgbe/ixgbe_dcb.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82598.c b/sys/dev/ixgbe/ixgbe_dcb_82598.c
index 6b3ab15fe100..f0642e4abf07 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82598.c
+++ b/sys/dev/ixgbe/ixgbe_dcb_82598.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82598.h b/sys/dev/ixgbe/ixgbe_dcb_82598.h
index d16471bc395a..ea8d825e516e 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82598.h
+++ b/sys/dev/ixgbe/ixgbe_dcb_82598.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82599.c b/sys/dev/ixgbe/ixgbe_dcb_82599.c
index 9ce2110e7bec..4c328aeab8eb 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82599.c
+++ b/sys/dev/ixgbe/ixgbe_dcb_82599.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82599.h b/sys/dev/ixgbe/ixgbe_dcb_82599.h
index faa2ac00f9d3..a8dfa0980c74 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82599.h
+++ b/sys/dev/ixgbe/ixgbe_dcb_82599.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_mbx.c b/sys/dev/ixgbe/ixgbe_mbx.c
index f9cbd0e4ba3d..071ccba9d5be 100644
--- a/sys/dev/ixgbe/ixgbe_mbx.c
+++ b/sys/dev/ixgbe/ixgbe_mbx.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_mbx.h b/sys/dev/ixgbe/ixgbe_mbx.h
index 3065d22567f3..9ea1685f3c49 100644
--- a/sys/dev/ixgbe/ixgbe_mbx.h
+++ b/sys/dev/ixgbe/ixgbe_mbx.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h
index 9d643f318408..ea813c3576c2 100644
--- a/sys/dev/ixgbe/ixgbe_osdep.h
+++ b/sys/dev/ixgbe/ixgbe_osdep.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c
index 2b758a751cd0..ee4e96cd9f35 100644
--- a/sys/dev/ixgbe/ixgbe_phy.c
+++ b/sys/dev/ixgbe/ixgbe_phy.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_phy.h b/sys/dev/ixgbe/ixgbe_phy.h
index ea0cd4fca196..36624359b46d 100644
--- a/sys/dev/ixgbe/ixgbe_phy.h
+++ b/sys/dev/ixgbe/ixgbe_phy.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h
index c9eac6ed989d..a448f2b4ed6c 100644
--- a/sys/dev/ixgbe/ixgbe_type.h
+++ b/sys/dev/ixgbe/ixgbe_type.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_vf.c b/sys/dev/ixgbe/ixgbe_vf.c
index ac2d847f91d5..8e103dcbb965 100644
--- a/sys/dev/ixgbe/ixgbe_vf.c
+++ b/sys/dev/ixgbe/ixgbe_vf.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_vf.h b/sys/dev/ixgbe/ixgbe_vf.h
index 320e977a9803..bae94f9b6a1d 100644
--- a/sys/dev/ixgbe/ixgbe_vf.h
+++ b/sys/dev/ixgbe/ixgbe_vf.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_x540.c b/sys/dev/ixgbe/ixgbe_x540.c
index 0298640d7c6f..2513f37b22f3 100644
--- a/sys/dev/ixgbe/ixgbe_x540.c
+++ b/sys/dev/ixgbe/ixgbe_x540.c
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe_x540.h b/sys/dev/ixgbe/ixgbe_x540.h
index 6f630602567b..7c3514032ab1 100644
--- a/sys/dev/ixgbe/ixgbe_x540.h
+++ b/sys/dev/ixgbe/ixgbe_x540.h
@@ -1,5 +1,4 @@
/******************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2001-2017, Intel Corporation
All rights reserved.
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
index 86c14b94155e..647447032b83 100644
--- a/sys/dev/jme/if_jme.c
+++ b/sys/dev/jme/if_jme.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/jme/if_jmereg.h b/sys/dev/jme/if_jmereg.h
index 14265334a63b..d778b7f340d4 100644
--- a/sys/dev/jme/if_jmereg.h
+++ b/sys/dev/jme/if_jmereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/jme/if_jmevar.h b/sys/dev/jme/if_jmevar.h
index 2e34364a962e..cffab5a90319 100644
--- a/sys/dev/jme/if_jmevar.h
+++ b/sys/dev/jme/if_jmevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index dfcc59276e94..3df9d9be479a 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Jean-Marc Zucconi
* All rights reserved.
*
diff --git a/sys/dev/joy/joy_isa.c b/sys/dev/joy/joy_isa.c
index 483279e69147..efb1e29280dc 100644
--- a/sys/dev/joy/joy_isa.c
+++ b/sys/dev/joy/joy_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Jean-Marc Zucconi
* All rights reserved.
*
diff --git a/sys/dev/joy/joyvar.h b/sys/dev/joy/joyvar.h
index b20cfab6dfe9..966fe78abb60 100644
--- a/sys/dev/joy/joyvar.h
+++ b/sys/dev/joy/joyvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Jean-Marc Zucconi
* All rights reserved.
*
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 9c449de578ab..24dc9bbe48ea 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 5caafdda6571..ff4a694bc03f 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index c1c6defc2d91..5ff744c0c716 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1992-1998 Sen Schmidt
* All rights reserved.
*
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index 7fee5d96fa46..9a80760a8730 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/sys/dev/ksyms/ksyms.c b/sys/dev/ksyms/ksyms.c
index e95fb6fe0aa3..342243f1a9dd 100644
--- a/sys/dev/ksyms/ksyms.c
+++ b/sys/dev/ksyms/ksyms.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009, Stacey Son <sson@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/le/am7990.c b/sys/dev/le/am7990.c
index 66dce0e6ac1d..32c2e1e65e80 100644
--- a/sys/dev/le/am7990.c
+++ b/sys/dev/le/am7990.c
@@ -1,8 +1,6 @@
/* $NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/am79900.c b/sys/dev/le/am79900.c
index d1297fd588f2..9a62c626b0b0 100644
--- a/sys/dev/le/am79900.c
+++ b/sys/dev/le/am79900.c
@@ -1,8 +1,6 @@
/* $NetBSD: am79900.c,v 1.17 2005/12/24 20:27:29 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
- *
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/am79900reg.h b/sys/dev/le/am79900reg.h
index a2de33b3a89a..620a1ddc273d 100644
--- a/sys/dev/le/am79900reg.h
+++ b/sys/dev/le/am79900reg.h
@@ -1,8 +1,6 @@
/* $NetBSD: am79900reg.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/am79900var.h b/sys/dev/le/am79900var.h
index d14fb9090a5f..79ab3309e13a 100644
--- a/sys/dev/le/am79900var.h
+++ b/sys/dev/le/am79900var.h
@@ -1,8 +1,6 @@
/* $NetBSD: am79900var.h,v 1.4 2005/12/11 12:21:25 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/am7990reg.h b/sys/dev/le/am7990reg.h
index b53132231dbb..1cc4dcb7d1f9 100644
--- a/sys/dev/le/am7990reg.h
+++ b/sys/dev/le/am7990reg.h
@@ -30,8 +30,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/le/am7990var.h b/sys/dev/le/am7990var.h
index 59a7d5455a38..24cbfe05aff2 100644
--- a/sys/dev/le/am7990var.h
+++ b/sys/dev/le/am7990var.h
@@ -1,8 +1,6 @@
/* $NetBSD: am7990var.h,v 1.23 2005/12/11 12:21:25 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c
index ba0fc098d1f9..70a91aa27ff7 100644
--- a/sys/dev/le/if_le_isa.c
+++ b/sys/dev/le/if_le_isa.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_le_isa.c,v 1.41 2005/12/24 20:27:41 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/if_le_lebuffer.c b/sys/dev/le/if_le_lebuffer.c
index 630a47a921fb..f2147ea894b2 100644
--- a/sys/dev/le/if_le_lebuffer.c
+++ b/sys/dev/le/if_le_lebuffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2006 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/le/if_le_ledma.c b/sys/dev/le/if_le_ledma.c
index 482c2341038c..e86f947be5be 100644
--- a/sys/dev/le/if_le_ledma.c
+++ b/sys/dev/le/if_le_ledma.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_le_ledma.c,v 1.26 2005/12/11 12:23:44 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c
index 4dd5b2310ca9..6c4f1fa6e724 100644
--- a/sys/dev/le/if_le_pci.c
+++ b/sys/dev/le/if_le_pci.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index d72b50413d5b..2eee7af1b8ba 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -1,8 +1,6 @@
/* $NetBSD: lance.c,v 1.34 2005/12/24 20:27:30 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/lancereg.h b/sys/dev/le/lancereg.h
index 7b08d84f5e9b..7c1a5a876608 100644
--- a/sys/dev/le/lancereg.h
+++ b/sys/dev/le/lancereg.h
@@ -1,8 +1,6 @@
/* $NetBSD: lancereg.h,v 1.12 2005/12/11 12:21:27 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/lancevar.h b/sys/dev/le/lancevar.h
index 87804f845631..a0d39396fe41 100644
--- a/sys/dev/le/lancevar.h
+++ b/sys/dev/le/lancevar.h
@@ -1,8 +1,6 @@
/* $NetBSD: lancevar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/le/lebuffer_sbus.c b/sys/dev/le/lebuffer_sbus.c
index 9c5620dad918..1dc948809f5f 100644
--- a/sys/dev/le/lebuffer_sbus.c
+++ b/sys/dev/le/lebuffer_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index f25b8091f0e8..262aab35522b 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <william.paul@windriver.com>. All rights reserved.
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index e5e8893fb733..bb794c2fad6e 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 11388d695436..b9076e85fd7e 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* $FreeBSD$
*
* Copyright (c) 2002-2004 David Boggs. <boggs@boggs.palo-alto.ca.us>
diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h
index 93b400496833..357fd8834845 100644
--- a/sys/dev/lmc/if_lmc.h
+++ b/sys/dev/lmc/if_lmc.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* $FreeBSD$
*
* Copyright (c) 2002-2004 David Boggs. (boggs@boggs.palo-alto.ca.us)
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index 9b4190aa7c08..e1959e223cfc 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/malo/if_malo.h b/sys/dev/malo/if_malo.h
index e6246faf26cd..681e7501aa67 100644
--- a/sys/dev/malo/if_malo.h
+++ b/sys/dev/malo/if_malo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/malo/if_malo_pci.c b/sys/dev/malo/if_malo_pci.c
index 895bc179af10..01b519e84988 100644
--- a/sys/dev/malo/if_malo_pci.c
+++ b/sys/dev/malo/if_malo_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/malo/if_malohal.c b/sys/dev/malo/if_malohal.c
index ed74a7324b2c..8a779433dda0 100644
--- a/sys/dev/malo/if_malohal.c
+++ b/sys/dev/malo/if_malohal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/malo/if_malohal.h b/sys/dev/malo/if_malohal.h
index b608eaba2abd..fb962cc8dd54 100644
--- a/sys/dev/malo/if_malohal.h
+++ b/sys/dev/malo/if_malohal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/malo/if_maloioctl.h b/sys/dev/malo/if_maloioctl.h
index 88507cffede2..0647b156b69e 100644
--- a/sys/dev/malo/if_maloioctl.h
+++ b/sys/dev/malo/if_maloioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/mc146818/mc146818.c b/sys/dev/mc146818/mc146818.c
index 518c8cde8a2e..fae24487cdb9 100644
--- a/sys/dev/mc146818/mc146818.c
+++ b/sys/dev/mc146818/mc146818.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mc146818/mc146818var.h b/sys/dev/mc146818/mc146818var.h
index 7cca69991b20..722b4fe1e77c 100644
--- a/sys/dev/mc146818/mc146818var.h
+++ b/sys/dev/mc146818/mc146818var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 386d07110ca9..2656760cb0b8 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -11,8 +11,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* The following functions are based in the vn(4) driver: mdstart_swap(),
* mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() and mddestroy(),
* and as such under the following copyright:
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 2436c173418b..c3d1af1ac3a2 100644
--- a/sys/dev/mem/memdev.c
+++ b/sys/dev/mem/memdev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c
index ff28deb3abd1..f4ea103b39f9 100644
--- a/sys/dev/mem/memutil.c
+++ b/sys/dev/mem/memutil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 5897a41ddd34..2bfcc83fdb2a 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c
index 9c87a41a8dc8..c1c25752a1ad 100644
--- a/sys/dev/mfi/mfi_cam.c
+++ b/sys/dev/mfi/mfi_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2007 Scott Long
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_debug.c b/sys/dev/mfi/mfi_debug.c
index 919a728759ec..be42ec00c15e 100644
--- a/sys/dev/mfi/mfi_debug.c
+++ b/sys/dev/mfi/mfi_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c
index 086da9f8599c..5dea332926fb 100644
--- a/sys/dev/mfi/mfi_disk.c
+++ b/sys/dev/mfi/mfi_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_ioctl.h b/sys/dev/mfi/mfi_ioctl.h
index ff0bfa30b702..da62ad9d82a9 100644
--- a/sys/dev/mfi/mfi_ioctl.h
+++ b/sys/dev/mfi/mfi_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c
index 1452b80c280f..c0082f792c6a 100644
--- a/sys/dev/mfi/mfi_linux.c
+++ b/sys/dev/mfi/mfi_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index d63c5ae6435f..80d655cf1b02 100644
--- a/sys/dev/mfi/mfi_pci.c
+++ b/sys/dev/mfi/mfi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c
index 0418abf356d0..ba75e35e4379 100644
--- a/sys/dev/mfi/mfi_syspd.c
+++ b/sys/dev/mfi/mfi_syspd.c
@@ -1,6 +1,4 @@
/*-
- * 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:
diff --git a/sys/dev/mfi/mfi_tbolt.c b/sys/dev/mfi/mfi_tbolt.c
index d7397d2a2ccc..3f83eb95962b 100644
--- a/sys/dev/mfi/mfi_tbolt.c
+++ b/sys/dev/mfi/mfi_tbolt.c
@@ -1,6 +1,4 @@
-/*-
- * 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:
diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h
index 21510bdd0b9a..163c75f40ca7 100644
--- a/sys/dev/mfi/mfireg.h
+++ b/sys/dev/mfi/mfireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h
index d11c7c76dad6..c11da8c727aa 100644
--- a/sys/dev/mfi/mfivar.h
+++ b/sys/dev/mfi/mfivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index 447ec370b235..e0801d803bd4 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* Copyright (C) 2009-2015 Semihalf
* Copyright (C) 2015 Stormshield
diff --git a/sys/dev/mge/if_mgevar.h b/sys/dev/mge/if_mgevar.h
index 864677283970..e161055afbaa 100644
--- a/sys/dev/mge/if_mgevar.h
+++ b/sys/dev/mge/if_mgevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 52caa37d3b61..6eb58ce2b721 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index 74cd6a79e840..dc34010e0d34 100644
--- a/sys/dev/mii/acphyreg.h
+++ b/sys/dev/mii/acphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Semen Ustimenko (semenu@FreeBSD.org)
* All rights reserved.
*
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index bd6b75e2b2b0..ae3827db9a22 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index 30bac3028b05..6cdbc95647b5 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index fa729b6a75ca..819b15621433 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mii/atphyreg.h b/sys/dev/mii/atphyreg.h
index 01e70ea22156..6181f2d107dc 100644
--- a/sys/dev/mii/atphyreg.h
+++ b/sys/dev/mii/atphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon
* All rights reserved.
*
diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 34192f11f842..f6fbc2a9f431 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 5fe34a616434..a4e880e0489f 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h
index 798eeecdcbc7..6aa141deb4f9 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 6d77b11a1e7a..eea3588f7038 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index 5cceb392a02b..b3535d59fbc2 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index b91b19f8c89a..2d2816cddf0a 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index ce91db480ada..dd73f87783dc 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index f7d5af271b91..d97c7d598626 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Principal Author: Parag Patel
* Copyright (c) 2001
* All rights reserved.
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index 04c396e5767b..e5d5cf961a27 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -31,8 +31,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Derived by information released by Intel under the following license:
*
* Copyright (c) 1999 - 2001, Intel Corporation
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 69190fefa94b..52dc8fcdb064 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,8 +1,6 @@
/* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 68396f9de3d6..53afc9a6fcf4 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,8 +1,6 @@
/* $NetBSD: icsphy.c,v 1.41 2006/11/16 21:24:07 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/icsphyreg.h b/sys/dev/mii/icsphyreg.h
index 80ebbded9241..d92d0b51ec69 100644
--- a/sys/dev/mii/icsphyreg.h
+++ b/sys/dev/mii/icsphyreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: icsphyreg.h,v 1.2 2003/07/01 22:46:08 msaitoh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index ad0c4805a552..284af49b1e04 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mii/ip1000phyreg.h b/sys/dev/mii/ip1000phyreg.h
index 771e025e3040..27add4fe516c 100644
--- a/sys/dev/mii/ip1000phyreg.h
+++ b/sys/dev/mii/ip1000phyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006, Pyun YongHyeon
* All rights reserved.
*
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index ff6842562e0c..13a38bc5796f 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mii/jmphyreg.h b/sys/dev/mii/jmphyreg.h
index b7f42b411ccb..ec668ad1cc9d 100644
--- a/sys/dev/mii/jmphyreg.h
+++ b/sys/dev/mii/jmphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Pyun YongHyeon
* All rights reserved.
*
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 699c1d6f83b6..a796b1113bc3 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -2,8 +2,6 @@
/* NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h
index acf15ae0731b..f563b0927211 100644
--- a/sys/dev/mii/lxtphyreg.h
+++ b/sys/dev/mii/lxtphyreg.h
@@ -3,8 +3,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 1d9ed20790f0..e20c102e8e53 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -1,8 +1,6 @@
/* $NetBSD: mii.c,v 1.12 1999/08/03 19:41:49 drochner Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 11b2d11721a7..fa1ec84eaa77 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -1,8 +1,6 @@
/* $NetBSD: mii.h,v 1.18 2014/06/16 14:43:22 msaitoh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Modification to match BSD/OS 3.0 MII interface by Jason R. Thorpe,
diff --git a/sys/dev/mii/mii_bitbang.c b/sys/dev/mii/mii_bitbang.c
index 8fcf1972934a..6a5f5dc7758b 100644
--- a/sys/dev/mii/mii_bitbang.c
+++ b/sys/dev/mii/mii_bitbang.c
@@ -1,8 +1,6 @@
/* $NetBSD: mii_bitbang.c,v 1.12 2008/05/04 17:06:09 xtraeme Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/mii_bitbang.h b/sys/dev/mii/mii_bitbang.h
index 14e2c90fa496..2bc7427625b1 100644
--- a/sys/dev/mii/mii_bitbang.h
+++ b/sys/dev/mii/mii_bitbang.h
@@ -1,8 +1,6 @@
/* $NetBSD: mii_bitbang.h,v 1.6 2009/05/12 14:31:27 cegger Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index f56676d4e091..423315924211 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,8 +1,6 @@
/* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 9def25c4fe31..ef81bdb2e4a1 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,8 +1,6 @@
/* $NetBSD: miivar.h,v 1.8 1999/04/23 04:24:32 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 486a2fa0241d..89b4f2cc0b48 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 1e5f7a8557d1..e87747a5443b 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 02dff78b97c8..44899191715e 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 76ef81320a5c..748e02a41991 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,8 +1,6 @@
/* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index cc9ad4459849..71fcfb687c01 100644
--- a/sys/dev/mii/nsphyreg.h
+++ b/sys/dev/mii/nsphyreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: nsphyreg.h,v 1.1 1998/08/10 23:58:39 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 5bb5ea81e3be..00c0550a8caa 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,8 +1,6 @@
/* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/nsphyterreg.h b/sys/dev/mii/nsphyterreg.h
index b7e3556f7f61..3bf5208ab95a 100644
--- a/sys/dev/mii/nsphyterreg.h
+++ b/sys/dev/mii/nsphyterreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: nsphyterreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index c03c57844985..6e5c51b255cf 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@osd.bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 02c37c299c1d..e1d137ca0989 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -2,8 +2,6 @@
/* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index eaa566b6c409..91ebe0b52b30 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -3,8 +3,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index c03cf550eec6..c411eaecfa8b 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mii/rdcphyreg.h b/sys/dev/mii/rdcphyreg.h
index 1fa77308222b..44b14a467bc8 100644
--- a/sys/dev/mii/rdcphyreg.h
+++ b/sys/dev/mii/rdcphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 24f068e71c41..bb60fa92fe17 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index edd606a0d82c..7c24a1f7cbb5 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 6433faf23142..782fc3c807b5 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index e21797a4c9a6..d3e3c938df7e 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
* Copyright (c) 2006 Bernd Walter. All rights reserved.
diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c
index 57b5eef0d968..484c736909bc 100644
--- a/sys/dev/mii/smcphy.c
+++ b/sys/dev/mii/smcphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/smscphy.c b/sys/dev/mii/smscphy.c
index 25464b781441..43b7087dc3fb 100644
--- a/sys/dev/mii/smscphy.c
+++ b/sys/dev/mii/smscphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 7812a518f4bb..0dfb934767f2 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 6d7a2ca932ab..4429c9481ec7 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 438db72f78b7..9f6f8cea408c 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,8 +1,6 @@
/* $NetBSD: tlphy.c,v 1.18 1999/05/14 11:40:28 drochner Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 2443652e9724..717d7c102f8f 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: tlphyreg.h,v 1.1 1998/08/10 23:59:58 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c
index 960a86baeeed..47344cbaf039 100644
--- a/sys/dev/mii/truephy.c
+++ b/sys/dev/mii/truephy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/mii/truephyreg.h b/sys/dev/mii/truephyreg.h
index d2ba617ae220..d7e3551b9bdb 100644
--- a/sys/dev/mii/truephyreg.h
+++ b/sys/dev/mii/truephyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 22b8035f3091..45addcbc7570 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,8 +1,6 @@
/* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index b83b8e8a29f9..5f2f6341ba6a 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -1,8 +1,6 @@
/* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index c0c67e4d19e5..8c35aa5cf749 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 30877233ff34..92b9f78b4617 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c
index 04867b14c0f2..d1fcfb4ebf18 100644
--- a/sys/dev/mk48txx/mk48txx.c
+++ b/sys/dev/mk48txx/mk48txx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mk48txx/mk48txxreg.h b/sys/dev/mk48txx/mk48txxreg.h
index 7ff432c4b3b7..ef55b87229b9 100644
--- a/sys/dev/mk48txx/mk48txxreg.h
+++ b/sys/dev/mk48txx/mk48txxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mk48txx/mk48txxvar.h b/sys/dev/mk48txx/mk48txxvar.h
index f51f4e715415..9706d8dbc942 100644
--- a/sys/dev/mk48txx/mk48txxvar.h
+++ b/sys/dev/mk48txx/mk48txxvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index ffdb769f8318..970053c1ec71 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 1fb0a27c9da7..2464dd526748 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Jonathan Lemon
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index a61701d54e58..28f6463f202b 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index 20107e72ae23..f091befad2d0 100644
--- a/sys/dev/mlx/mlxio.h
+++ b/sys/dev/mlx/mlxio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index a26dc21d9506..af6c85467bd0 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index cb752557e7bc..c087b90965c8 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index e99c6cd4d404..b5096c11accd 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 92e208a28a01..433a1cb1036e 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/mly/mlyio.h b/sys/dev/mly/mlyio.h
index 00a798ca670a..504b5040b532 100644
--- a/sys/dev/mly/mlyio.h
+++ b/sys/dev/mly/mlyio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index b30a213b3619..9e5715b61b4d 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index c205bdf3d33e..6bec8ebe6a45 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h
index 7ab044b16f55..6e6bf2ee4bab 100644
--- a/sys/dev/mmc/bridge.h
+++ b/sys/dev/mmc/bridge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index 121912469d4e..27f4936512ba 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h
index a6285eb7e9d3..c8cf0020e2bf 100644
--- a/sys/dev/mmc/mmcbrvar.h
+++ b/sys/dev/mmc/mmcbrvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h
index 5794a43b0311..f927c6428cd0 100644
--- a/sys/dev/mmc/mmcreg.h
+++ b/sys/dev/mmc/mmcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
*
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index ffb1a0188542..274f4d77f248 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h
index 1604c3060a2a..d0f4e3308702 100644
--- a/sys/dev/mmc/mmcvar.h
+++ b/sys/dev/mmc/mmcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
diff --git a/sys/dev/mps/mpi/mpi2.h b/sys/dev/mps/mpi/mpi2.h
index d4de9d4346a0..1d387218f5fb 100644
--- a/sys/dev/mps/mpi/mpi2.h
+++ b/sys/dev/mps/mpi/mpi2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_cnfg.h b/sys/dev/mps/mpi/mpi2_cnfg.h
index caa23bc5ced3..871d2b8026e8 100644
--- a/sys/dev/mps/mpi/mpi2_cnfg.h
+++ b/sys/dev/mps/mpi/mpi2_cnfg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_hbd.h b/sys/dev/mps/mpi/mpi2_hbd.h
index 54bb0208b0d7..1b42ff3fb85d 100644
--- a/sys/dev/mps/mpi/mpi2_hbd.h
+++ b/sys/dev/mps/mpi/mpi2_hbd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_init.h b/sys/dev/mps/mpi/mpi2_init.h
index d467104b6b6f..a75873ceee0a 100644
--- a/sys/dev/mps/mpi/mpi2_init.h
+++ b/sys/dev/mps/mpi/mpi2_init.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_ioc.h b/sys/dev/mps/mpi/mpi2_ioc.h
index c82a7d239598..0cef643c0c1a 100644
--- a/sys/dev/mps/mpi/mpi2_ioc.h
+++ b/sys/dev/mps/mpi/mpi2_ioc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_ra.h b/sys/dev/mps/mpi/mpi2_ra.h
index ca7741fdf4b0..4ba141bb1319 100644
--- a/sys/dev/mps/mpi/mpi2_ra.h
+++ b/sys/dev/mps/mpi/mpi2_ra.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_raid.h b/sys/dev/mps/mpi/mpi2_raid.h
index 2aa9f126303d..4154077dfa31 100644
--- a/sys/dev/mps/mpi/mpi2_raid.h
+++ b/sys/dev/mps/mpi/mpi2_raid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_sas.h b/sys/dev/mps/mpi/mpi2_sas.h
index 427f924cf3cb..25143702f966 100644
--- a/sys/dev/mps/mpi/mpi2_sas.h
+++ b/sys/dev/mps/mpi/mpi2_sas.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_targ.h b/sys/dev/mps/mpi/mpi2_targ.h
index 0bb80bb56572..7e3038178e26 100644
--- a/sys/dev/mps/mpi/mpi2_targ.h
+++ b/sys/dev/mps/mpi/mpi2_targ.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_tool.h b/sys/dev/mps/mpi/mpi2_tool.h
index d0c093b34049..b9f0f53014b6 100644
--- a/sys/dev/mps/mpi/mpi2_tool.h
+++ b/sys/dev/mps/mpi/mpi2_tool.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mpi/mpi2_type.h b/sys/dev/mps/mpi/mpi2_type.h
index d60a2c8e21fd..6b9371602514 100644
--- a/sys/dev/mps/mpi/mpi2_type.h
+++ b/sys/dev/mps/mpi/mpi2_type.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c
index ed09550958c3..18b15e874275 100644
--- a/sys/dev/mps/mps.c
+++ b/sys/dev/mps/mps.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_config.c b/sys/dev/mps/mps_config.c
index 076276ab3cf1..cfaf0a472f6a 100644
--- a/sys/dev/mps/mps_config.c
+++ b/sys/dev/mps/mps_config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps_ioctl.h b/sys/dev/mps/mps_ioctl.h
index 7e39d83458ea..cb0d9c579b8f 100644
--- a/sys/dev/mps/mps_ioctl.h
+++ b/sys/dev/mps/mps_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/mps/mps_mapping.c b/sys/dev/mps/mps_mapping.c
index 1bf08cf6019f..c53fd86a1d78 100644
--- a/sys/dev/mps/mps_mapping.c
+++ b/sys/dev/mps/mps_mapping.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps_mapping.h b/sys/dev/mps/mps_mapping.h
index 2f7318dbdab5..9803b806e596 100644
--- a/sys/dev/mps/mps_mapping.h
+++ b/sys/dev/mps/mps_mapping.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c
index 1aef70ca0619..bfa71cc6c95a 100644
--- a/sys/dev/mps/mps_pci.c
+++ b/sys/dev/mps/mps_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
*
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index 61ef783ce671..65c19f5c8783 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h
index 9481ed75f4a9..d03258d9a7c9 100644
--- a/sys/dev/mps/mps_sas.h
+++ b/sys/dev/mps/mps_sas.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c
index 164b53b152f6..3d62a9a4bff5 100644
--- a/sys/dev/mps/mps_sas_lsi.c
+++ b/sys/dev/mps/mps_sas_lsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
* All rights reserved.
diff --git a/sys/dev/mps/mps_table.c b/sys/dev/mps/mps_table.c
index 72d1b53a18c0..3abcc6010faa 100644
--- a/sys/dev/mps/mps_table.c
+++ b/sys/dev/mps/mps_table.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
*
diff --git a/sys/dev/mps/mps_table.h b/sys/dev/mps/mps_table.h
index 35ec351d4d50..77e060a89415 100644
--- a/sys/dev/mps/mps_table.h
+++ b/sys/dev/mps/mps_table.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
*
diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c
index 26cf5cd158a7..c245efa969e9 100644
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/mps/mpsvar.h b/sys/dev/mps/mpsvar.h
index d0ed010ed045..61806d286f90 100644
--- a/sys/dev/mps/mpsvar.h
+++ b/sys/dev/mps/mpsvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index 945882db5b5b..154636a0acef 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index a68a1e1b6d59..cb70d88a0aec 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index ed186f6988c5..8696a396e842 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index 621bd7faa123..7bb8f7a1d2ee 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index ec81e3254620..1576b1254055 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index 69062da52de7..18ef7d7d0765 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_log_fc.h b/sys/dev/mpt/mpilib/mpi_log_fc.h
index 8646c572004f..0383f662252d 100644
--- a/sys/dev/mpt/mpilib/mpi_log_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_log_fc.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_log_sas.h b/sys/dev/mpt/mpilib/mpi_log_sas.h
index dc5c25d40bf1..caebcb18fe60 100644
--- a/sys/dev/mpt/mpilib/mpi_log_sas.h
+++ b/sys/dev/mpt/mpilib/mpi_log_sas.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index 58ddc9c8b826..c676c08be793 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_sas.h b/sys/dev/mpt/mpilib/mpi_sas.h
index daf6346c8fdb..a6637099a1a0 100644
--- a/sys/dev/mpt/mpilib/mpi_sas.h
+++ b/sys/dev/mpt/mpilib/mpi_sas.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index f801fbccfdc9..72fdebf03ff5 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_tool.h b/sys/dev/mpt/mpilib/mpi_tool.h
index 5e389c956815..0a98d541e53f 100644
--- a/sys/dev/mpt/mpilib/mpi_tool.h
+++ b/sys/dev/mpt/mpilib/mpi_tool.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index 49392a2d814c..354eec342eb2 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
* All rights reserved.
*
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 1de5cb7797c7..6d7b12626b84 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -2,8 +2,6 @@
* Generic routines for LSI Fusion adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 013bff24310b..1db615103242 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -3,8 +3,6 @@
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 4fbca1d9fe25..d4c4d9c93722 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -2,8 +2,6 @@
* FreeBSD/CAM specific routines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpt_cam.h b/sys/dev/mpt/mpt_cam.h
index 080a3c1fe9d9..8a18934d6483 100644
--- a/sys/dev/mpt/mpt_cam.h
+++ b/sys/dev/mpt/mpt_cam.h
@@ -2,8 +2,6 @@
/*-
* LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley, Adam Prewett
*
* Partially derived from Matty Jacobs ISP driver.
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index d17db1a14afd..329482bd2909 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -2,8 +2,6 @@
* Debug routines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 2adaa95df32a..7caf6d4f568b 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -2,8 +2,6 @@
* PCI specific probe and attach routines for LSI Fusion Adapters
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2000, 2001 by Greg Ansley
* Partially derived from Matt Jacob's ISP driver.
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c
index 03a681470fef..ac65e2f39d9d 100644
--- a/sys/dev/mpt/mpt_raid.c
+++ b/sys/dev/mpt/mpt_raid.c
@@ -1,8 +1,6 @@
/*-
* Routines for handling the integrated RAID features LSI MPT Fusion adapters.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005, WHEEL Sp. z o.o.
* Copyright (c) 2005 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/dev/mpt/mpt_raid.h b/sys/dev/mpt/mpt_raid.h
index 8bb96b516156..2047707b155c 100644
--- a/sys/dev/mpt/mpt_raid.h
+++ b/sys/dev/mpt/mpt_raid.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Definitions for the integrated RAID features LSI MPT Fusion adapters.
*
* Copyright (c) 2005, WHEEL Sp. z o.o.
diff --git a/sys/dev/mpt/mpt_reg.h b/sys/dev/mpt/mpt_reg.h
index b66d67bcb1e1..746c9b5ea267 100644
--- a/sys/dev/mpt/mpt_reg.h
+++ b/sys/dev/mpt/mpt_reg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
*
diff --git a/sys/dev/mpt/mpt_user.c b/sys/dev/mpt/mpt_user.c
index c33b9cab3c6f..fa42af87a5b3 100644
--- a/sys/dev/mpt/mpt_user.c
+++ b/sys/dev/mpt/mpt_user.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 2f4bf06171c7..0cf668680238 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
index ca4c3a8fe511..354ad636a82f 100644
--- a/sys/dev/mse/mse_isa.c
+++ b/sys/dev/mse/mse_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/mse/msevar.h b/sys/dev/mse/msevar.h
index 8438e10dfaba..74a393f0ef0a 100644
--- a/sys/dev/mse/msevar.h
+++ b/sys/dev/mse/msevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 8d4a041b5a5d..458d7fdeb43c 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -46,8 +46,6 @@
*****************************************************************************/
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h
index 7bd0b53a49af..8f2ea634b50d 100644
--- a/sys/dev/msk/if_mskreg.h
+++ b/sys/dev/msk/if_mskreg.h
@@ -46,8 +46,6 @@
******************************************************************************/
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 9f51683f7eb8..9b48d445acbc 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mvs/mvs.h b/sys/dev/mvs/mvs.h
index a25faed18901..51f1d51fc820 100644
--- a/sys/dev/mvs/mvs.h
+++ b/sys/dev/mvs/mvs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c
index cd6afce40f5c..493cd3210745 100644
--- a/sys/dev/mvs/mvs_pci.c
+++ b/sys/dev/mvs/mvs_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 6243c2ce1951..31cdefdfd87d 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index 33065f3b3197..1453a19244bb 100644
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2008 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/if_mwl_pci.c b/sys/dev/mwl/if_mwl_pci.c
index 6dd521a6ed9a..d9da128af70e 100644
--- a/sys/dev/mwl/if_mwl_pci.c
+++ b/sys/dev/mwl/if_mwl_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/if_mwlioctl.h b/sys/dev/mwl/if_mwlioctl.h
index 02aabbf10a37..e0760194c42a 100644
--- a/sys/dev/mwl/if_mwlioctl.h
+++ b/sys/dev/mwl/if_mwlioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/if_mwlvar.h b/sys/dev/mwl/if_mwlvar.h
index 5b5ce11d6247..e5feda994ba9 100644
--- a/sys/dev/mwl/if_mwlvar.h
+++ b/sys/dev/mwl/if_mwlvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/mwldiag.h b/sys/dev/mwl/mwldiag.h
index deb1704a6a1c..65c8eb5941dd 100644
--- a/sys/dev/mwl/mwldiag.h
+++ b/sys/dev/mwl/mwldiag.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/mwlhal.c b/sys/dev/mwl/mwlhal.c
index d66941919288..41f1b8f2dad8 100644
--- a/sys/dev/mwl/mwlhal.c
+++ b/sys/dev/mwl/mwlhal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/mwlhal.h b/sys/dev/mwl/mwlhal.h
index d745deafb9ae..087effa5a722 100644
--- a/sys/dev/mwl/mwlhal.h
+++ b/sys/dev/mwl/mwlhal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mwl/mwlreg.h b/sys/dev/mwl/mwlreg.h
index 9b64dda9f83a..a8186b174e28 100644
--- a/sys/dev/mwl/mwlreg.h
+++ b/sys/dev/mwl/mwlreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
* All rights reserved.
diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h
index cf8891b8e3a5..b836212266f8 100644
--- a/sys/dev/mxge/eth_z8e.h
+++ b/sys/dev/mxge/eth_z8e.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h
index 4f0defc89d64..3da83416c600 100644
--- a/sys/dev/mxge/ethp_z8e.h
+++ b/sys/dev/mxge/ethp_z8e.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index 70a8ce2d6ce1..f7d09e618918 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -1,5 +1,4 @@
/******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2013, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h
index dd9ec3ff2612..a284cdf58625 100644
--- a/sys/dev/mxge/if_mxge_var.h
+++ b/sys/dev/mxge/if_mxge_var.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2013, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h
index ecb6427a3dd3..65fe27cf4cd0 100644
--- a/sys/dev/mxge/mcp_gen_header.h
+++ b/sys/dev/mxge/mcp_gen_header.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2007, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h
index 6970288f3b15..365357e0b5b9 100644
--- a/sys/dev/mxge/mxge_mcp.h
+++ b/sys/dev/mxge/mxge_mcp.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2009, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/rss_eth_z8e.h b/sys/dev/mxge/rss_eth_z8e.h
index 964293196267..acc0fbf44ccf 100644
--- a/sys/dev/mxge/rss_eth_z8e.h
+++ b/sys/dev/mxge/rss_eth_z8e.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/rss_ethp_z8e.h b/sys/dev/mxge/rss_ethp_z8e.h
index 60d7d210f9fe..3cec65fa23db 100644
--- a/sys/dev/mxge/rss_ethp_z8e.h
+++ b/sys/dev/mxge/rss_ethp_z8e.h
@@ -1,5 +1,4 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 4c879260b0d2..14dda5090f20 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Written by: yen_cw@myson.com.tw
* Copyright (c) 2002 Myson Technology Inc.
* All rights reserved.
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index 27c7f1cdd445..f7870319fe31 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Myson Technology Inc.
* All rights reserved.
*
diff --git a/sys/dev/nand/nand.c b/sys/dev/nand/nand.c
index 6997ef7f8a0d..ae641217ad78 100644
--- a/sys/dev/nand/nand.c
+++ b/sys/dev/nand/nand.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand.h b/sys/dev/nand/nand.h
index 06902601b8d0..0e9ea41bc60b 100644
--- a/sys/dev/nand/nand.h
+++ b/sys/dev/nand/nand.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_bbt.c b/sys/dev/nand/nand_bbt.c
index d99ed67523a2..d3f163af3b17 100644
--- a/sys/dev/nand/nand_bbt.c
+++ b/sys/dev/nand/nand_bbt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_cdev.c b/sys/dev/nand/nand_cdev.c
index 53c62dbc2913..054095538356 100644
--- a/sys/dev/nand/nand_cdev.c
+++ b/sys/dev/nand/nand_cdev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_dev.h b/sys/dev/nand/nand_dev.h
index bd00c4d4b3b4..bc7d6c49c063 100644
--- a/sys/dev/nand/nand_dev.h
+++ b/sys/dev/nand/nand_dev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_ecc_pos.h b/sys/dev/nand/nand_ecc_pos.h
index 835f45e6c083..f40415cc4f30 100644
--- a/sys/dev/nand/nand_ecc_pos.h
+++ b/sys/dev/nand/nand_ecc_pos.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_generic.c b/sys/dev/nand/nand_generic.c
index 85099c994b38..59a6bf2001c1 100644
--- a/sys/dev/nand/nand_generic.c
+++ b/sys/dev/nand/nand_generic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_geom.c b/sys/dev/nand/nand_geom.c
index b814ffc4e0a9..cd3f5211630b 100644
--- a/sys/dev/nand/nand_geom.c
+++ b/sys/dev/nand/nand_geom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nand_id.c b/sys/dev/nand/nand_id.c
index 7259c951bfc9..bf0b44a158db 100644
--- a/sys/dev/nand/nand_id.c
+++ b/sys/dev/nand/nand_id.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandbus.c b/sys/dev/nand/nandbus.c
index 003c1797af64..893b62841b6a 100644
--- a/sys/dev/nand/nandbus.c
+++ b/sys/dev/nand/nandbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandbus.h b/sys/dev/nand/nandbus.h
index 6dd4cbf26daa..417fbf5e14b5 100644
--- a/sys/dev/nand/nandbus.h
+++ b/sys/dev/nand/nandbus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim.c b/sys/dev/nand/nandsim.c
index 4639a15700a2..a1ac13ab763d 100644
--- a/sys/dev/nand/nandsim.c
+++ b/sys/dev/nand/nandsim.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim.h b/sys/dev/nand/nandsim.h
index d4b225113bfd..fbbb6d4bc7a4 100644
--- a/sys/dev/nand/nandsim.h
+++ b/sys/dev/nand/nandsim.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_chip.c b/sys/dev/nand/nandsim_chip.c
index 20c2d668d64d..5b568abf58b2 100644
--- a/sys/dev/nand/nandsim_chip.c
+++ b/sys/dev/nand/nandsim_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_chip.h b/sys/dev/nand/nandsim_chip.h
index 86ced5ea2bf2..a6fb2346ded7 100644
--- a/sys/dev/nand/nandsim_chip.h
+++ b/sys/dev/nand/nandsim_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_ctrl.c b/sys/dev/nand/nandsim_ctrl.c
index bc203902fe7e..5f7b01979203 100644
--- a/sys/dev/nand/nandsim_ctrl.c
+++ b/sys/dev/nand/nandsim_ctrl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_log.c b/sys/dev/nand/nandsim_log.c
index 0bd316ace4e2..c51118f0dda8 100644
--- a/sys/dev/nand/nandsim_log.c
+++ b/sys/dev/nand/nandsim_log.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_log.h b/sys/dev/nand/nandsim_log.h
index 5e5a055a4053..8cf108200df6 100644
--- a/sys/dev/nand/nandsim_log.h
+++ b/sys/dev/nand/nandsim_log.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_swap.c b/sys/dev/nand/nandsim_swap.c
index 78e14e9557bd..7844196bc17d 100644
--- a/sys/dev/nand/nandsim_swap.c
+++ b/sys/dev/nand/nandsim_swap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nandsim_swap.h b/sys/dev/nand/nandsim_swap.h
index c9eb0be63a9c..4fbae2a6827a 100644
--- a/sys/dev/nand/nandsim_swap.h
+++ b/sys/dev/nand/nandsim_swap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/nand/nfc_at91.c b/sys/dev/nand/nfc_at91.c
index d7998422f674..74b0901dd07e 100644
--- a/sys/dev/nand/nfc_at91.c
+++ b/sys/dev/nand/nfc_at91.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2013 Ian Lepore.
* All rights reserved.
*
diff --git a/sys/dev/nand/nfc_at91.h b/sys/dev/nand/nfc_at91.h
index f12b764468c9..ae06e69cb72f 100644
--- a/sys/dev/nand/nfc_at91.h
+++ b/sys/dev/nand/nfc_at91.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2014 Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/nand/nfc_fsl.c b/sys/dev/nand/nfc_fsl.c
index 992cfeb784fe..8c3ca06951a7 100644
--- a/sys/dev/nand/nfc_fsl.c
+++ b/sys/dev/nand/nfc_fsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012 Juniper Networks, Inc.
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
diff --git a/sys/dev/nand/nfc_fsl.h b/sys/dev/nand/nfc_fsl.h
index 5410da558171..e334c2602e18 100644
--- a/sys/dev/nand/nfc_fsl.h
+++ b/sys/dev/nand/nfc_fsl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012 Juniper Networks, Inc.
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
diff --git a/sys/dev/nand/nfc_mv.c b/sys/dev/nand/nfc_mv.c
index 0d78d34d9912..7f68e824cf90 100644
--- a/sys/dev/nand/nfc_mv.c
+++ b/sys/dev/nand/nfc_mv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index 5a9b0d8d33b8..836268281e48 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -6,8 +6,6 @@
#define NCV_IO_CONTROL_FLAGS (0)
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 6fa56a8f3e9a..55f0ef98d49e 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -2,8 +2,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/ncv/ncr53c500hw.h b/sys/dev/ncv/ncr53c500hw.h
index 26e40b467f8a..7b9c8445eb10 100644
--- a/sys/dev/ncv/ncr53c500hw.h
+++ b/sys/dev/ncv/ncr53c500hw.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500hwtab.h b/sys/dev/ncv/ncr53c500hwtab.h
index 9e70f17cb8bc..47406b1947e4 100644
--- a/sys/dev/ncv/ncr53c500hwtab.h
+++ b/sys/dev/ncv/ncr53c500hwtab.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500reg.h b/sys/dev/ncv/ncr53c500reg.h
index 927d45c89c94..2a9906e44cdf 100644
--- a/sys/dev/ncv/ncr53c500reg.h
+++ b/sys/dev/ncv/ncr53c500reg.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index 3b966e1d80e8..d92702fac1e7 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/netmap/if_em_netmap.h b/sys/dev/netmap/if_em_netmap.h
index 26f85fdf321d..1fe7563348c6 100644
--- a/sys/dev/netmap/if_em_netmap.h
+++ b/sys/dev/netmap/if_em_netmap.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/if_igb_netmap.h b/sys/dev/netmap/if_igb_netmap.h
index cd80f2663bc7..33b7b3b66547 100644
--- a/sys/dev/netmap/if_igb_netmap.h
+++ b/sys/dev/netmap/if_igb_netmap.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Universita` di Pisa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/if_lem_netmap.h b/sys/dev/netmap/if_lem_netmap.h
index b3ef1b2bd706..0ec9b1346609 100644
--- a/sys/dev/netmap/if_lem_netmap.h
+++ b/sys/dev/netmap/if_lem_netmap.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index 2cb3454c5f31..ac08aedd7962 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/ixgbe_netmap.h b/sys/dev/netmap/ixgbe_netmap.h
index 5f1198905a96..0f34e7218503 100644
--- a/sys/dev/netmap/ixgbe_netmap.h
+++ b/sys/dev/netmap/ixgbe_netmap.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 36631f04828e..aff757bdadfe 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
index 6399439080a7..d9b1a464bfd0 100644
--- a/sys/dev/netmap/netmap_freebsd.c
+++ b/sys/dev/netmap/netmap_freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c
index 56eb86c3b32c..c5060f1aaf53 100644
--- a/sys/dev/netmap/netmap_generic.c
+++ b/sys/dev/netmap/netmap_generic.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 9d57539ccf70..f2e699874f8b 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
* Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
*
diff --git a/sys/dev/netmap/netmap_mbq.c b/sys/dev/netmap/netmap_mbq.c
index bae116054a8e..503f5a13aa95 100644
--- a/sys/dev/netmap/netmap_mbq.c
+++ b/sys/dev/netmap/netmap_mbq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013-2014 Vincenzo Maffione. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_mbq.h b/sys/dev/netmap/netmap_mbq.h
index 3a06a22f0fcc..455ca8a2c3ac 100644
--- a/sys/dev/netmap/netmap_mbq.h
+++ b/sys/dev/netmap/netmap_mbq.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013-2014 Vincenzo Maffione. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index d5a815f4670a..023604d49535 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2012-2014 Matteo Landi, Luigi Rizzo, Giuseppe Lettieri. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_mem2.h b/sys/dev/netmap/netmap_mem2.h
index 550c73790238..ef0ff96d8e7f 100644
--- a/sys/dev/netmap/netmap_mem2.h
+++ b/sys/dev/netmap/netmap_mem2.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2012-2014 Matteo Landi, Luigi Rizzo, Giuseppe Lettieri. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_offloadings.c b/sys/dev/netmap/netmap_offloadings.c
index ab3b3e285c74..dadc1dcbc14c 100644
--- a/sys/dev/netmap/netmap_offloadings.c
+++ b/sys/dev/netmap/netmap_offloadings.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2014 Vincenzo Maffione. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_pipe.c b/sys/dev/netmap/netmap_pipe.c
index af091cea2f68..67e840248c88 100644
--- a/sys/dev/netmap/netmap_pipe.c
+++ b/sys/dev/netmap/netmap_pipe.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2014 Giuseppe Lettieri. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/netmap/netmap_vale.c b/sys/dev/netmap/netmap_vale.c
index a89284293530..ddd7334a8378 100644
--- a/sys/dev/netmap/netmap_vale.c
+++ b/sys/dev/netmap/netmap_vale.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 8d9e1861bea5..2bd49e1e2799 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index ed638438ef71..9df0d92c8142 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index c06b7294b831..dbe24cb5191b 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index 537296e76118..c86bcdb3e1a8 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -9,8 +9,6 @@
NSP_USE_MEMIO | NSP_WAIT_FOR_SELECT)
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
*
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index b81ca30f815e..a784cadccfcc 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -2,8 +2,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/nsp/nspreg.h b/sys/dev/nsp/nspreg.h
index 68bd09842cfd..81512c91a609 100644
--- a/sys/dev/nsp/nspreg.h
+++ b/sys/dev/nsp/nspreg.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h
index 9bff1b578f9b..ed8a981d158e 100644
--- a/sys/dev/nsp/nspvar.h
+++ b/sys/dev/nsp/nspvar.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index c9b1b21102b3..c8966df8ac4b 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen
* Copyright (c) 2001-2004 Mark R. V. Murray
* Copyright (c) 2014 Eitan Adler
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index 9d06a6af36d0..cebd36d15af5 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c
index b13cad757759..7294d0dfba25 100644
--- a/sys/dev/nvme/nvme.c
+++ b/sys/dev/nvme/nvme.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index 93f112f0e5cb..aff4fbc66a61 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 9f32bc9033a4..5059e8c7f3fe 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c
index f7d0da7d0917..7f125b2f66d4 100644
--- a/sys/dev/nvme/nvme_ctrlr_cmd.c
+++ b/sys/dev/nvme/nvme_ctrlr_cmd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
index 2fe1c8b90896..fd8f53ffe5c3 100644
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_ns_cmd.c b/sys/dev/nvme/nvme_ns_cmd.c
index c9a37c385f9a..1bf3b7f3f418 100644
--- a/sys/dev/nvme/nvme_ns_cmd.c
+++ b/sys/dev/nvme/nvme_ns_cmd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 9064ae10a902..ce267be35283 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index 8b96f6d5e264..a3eb90c9bd2c 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c
index 09bcb270b43a..f0b628d3eafa 100644
--- a/sys/dev/nvme/nvme_sysctl.c
+++ b/sys/dev/nvme/nvme_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index 20eaa2694954..24f65cce9b98 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sys/dev/nvme/nvme_util.c b/sys/dev/nvme/nvme_util.c
index e673cf75362e..6d7084167a75 100644
--- a/sys/dev/nvme/nvme_util.c
+++ b/sys/dev/nvme/nvme_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2013 Intel Corporation
* Copyright (C) 1997 Justin T. Gibbs
* All rights reserved.
diff --git a/sys/dev/nvram/nvram.c b/sys/dev/nvram/nvram.c
index 683603825d01..164287ef097a 100644
--- a/sys/dev/nvram/nvram.c
+++ b/sys/dev/nvram/nvram.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Peter Wemm
* All rights reserved.
*
diff --git a/sys/dev/nvram2env/nvram2env.c b/sys/dev/nvram2env/nvram2env.c
index 2087e8c36dee..a9423484fae8 100644
--- a/sys/dev/nvram2env/nvram2env.c
+++ b/sys/dev/nvram2env/nvram2env.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/dev/nxge/if_nxge.c b/sys/dev/nxge/if_nxge.c
index ae232c849daf..af95e8bc2f87 100644
--- a/sys/dev/nxge/if_nxge.c
+++ b/sys/dev/nxge/if_nxge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/if_nxge.h b/sys/dev/nxge/if_nxge.h
index aa7d4c533806..1cc128691c52 100644
--- a/sys/dev/nxge/if_nxge.h
+++ b/sys/dev/nxge/if_nxge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/version.h b/sys/dev/nxge/include/version.h
index 28c85c2b4a14..47d4fc1bfdec 100644
--- a/sys/dev/nxge/include/version.h
+++ b/sys/dev/nxge/include/version.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xge-debug.h b/sys/dev/nxge/include/xge-debug.h
index c76b299e6d3e..74b9756040c2 100644
--- a/sys/dev/nxge/include/xge-debug.h
+++ b/sys/dev/nxge/include/xge-debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xge-defs.h b/sys/dev/nxge/include/xge-defs.h
index c69e13b4441a..17bc907b8a34 100644
--- a/sys/dev/nxge/include/xge-defs.h
+++ b/sys/dev/nxge/include/xge-defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xge-list.h b/sys/dev/nxge/include/xge-list.h
index a7a9247d8c3f..544a62304386 100644
--- a/sys/dev/nxge/include/xge-list.h
+++ b/sys/dev/nxge/include/xge-list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xge-os-pal.h b/sys/dev/nxge/include/xge-os-pal.h
index 3d33595fccda..166cadb7f2a5 100644
--- a/sys/dev/nxge/include/xge-os-pal.h
+++ b/sys/dev/nxge/include/xge-os-pal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xge-queue.h b/sys/dev/nxge/include/xge-queue.h
index a25ce6a90afb..c38ffb8ca349 100644
--- a/sys/dev/nxge/include/xge-queue.h
+++ b/sys/dev/nxge/include/xge-queue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-channel.h b/sys/dev/nxge/include/xgehal-channel.h
index a5b9fab7f147..2f637b2688de 100644
--- a/sys/dev/nxge/include/xgehal-channel.h
+++ b/sys/dev/nxge/include/xgehal-channel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-config.h b/sys/dev/nxge/include/xgehal-config.h
index 4d5e3970d049..2a63296e56bf 100644
--- a/sys/dev/nxge/include/xgehal-config.h
+++ b/sys/dev/nxge/include/xgehal-config.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-device.h b/sys/dev/nxge/include/xgehal-device.h
index 88b757226f9d..31d99b4e94dd 100644
--- a/sys/dev/nxge/include/xgehal-device.h
+++ b/sys/dev/nxge/include/xgehal-device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-driver.h b/sys/dev/nxge/include/xgehal-driver.h
index d375570f1076..507031b00740 100644
--- a/sys/dev/nxge/include/xgehal-driver.h
+++ b/sys/dev/nxge/include/xgehal-driver.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-event.h b/sys/dev/nxge/include/xgehal-event.h
index ac7bf35dd088..1613aaeb5933 100644
--- a/sys/dev/nxge/include/xgehal-event.h
+++ b/sys/dev/nxge/include/xgehal-event.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-fifo.h b/sys/dev/nxge/include/xgehal-fifo.h
index 3dc23a048786..5f082d6b8232 100644
--- a/sys/dev/nxge/include/xgehal-fifo.h
+++ b/sys/dev/nxge/include/xgehal-fifo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-mgmt.h b/sys/dev/nxge/include/xgehal-mgmt.h
index 842a12cc7a37..93e60a29186e 100644
--- a/sys/dev/nxge/include/xgehal-mgmt.h
+++ b/sys/dev/nxge/include/xgehal-mgmt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-mgmtaux.h b/sys/dev/nxge/include/xgehal-mgmtaux.h
index ae495fee67b6..93a9865f9c2d 100644
--- a/sys/dev/nxge/include/xgehal-mgmtaux.h
+++ b/sys/dev/nxge/include/xgehal-mgmtaux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-mm.h b/sys/dev/nxge/include/xgehal-mm.h
index 80111eef6176..7b43de404e51 100644
--- a/sys/dev/nxge/include/xgehal-mm.h
+++ b/sys/dev/nxge/include/xgehal-mm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-regs.h b/sys/dev/nxge/include/xgehal-regs.h
index bfd3852a8ce7..a20e083c9233 100644
--- a/sys/dev/nxge/include/xgehal-regs.h
+++ b/sys/dev/nxge/include/xgehal-regs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-ring.h b/sys/dev/nxge/include/xgehal-ring.h
index 811fdccbc685..0e5b7e66e291 100644
--- a/sys/dev/nxge/include/xgehal-ring.h
+++ b/sys/dev/nxge/include/xgehal-ring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-stats.h b/sys/dev/nxge/include/xgehal-stats.h
index c3847d4161f9..ec093e7f7223 100644
--- a/sys/dev/nxge/include/xgehal-stats.h
+++ b/sys/dev/nxge/include/xgehal-stats.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal-types.h b/sys/dev/nxge/include/xgehal-types.h
index a73bfa1633d2..58dd09187372 100644
--- a/sys/dev/nxge/include/xgehal-types.h
+++ b/sys/dev/nxge/include/xgehal-types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/include/xgehal.h b/sys/dev/nxge/include/xgehal.h
index 2e77d67b7a5b..c8645120edec 100644
--- a/sys/dev/nxge/include/xgehal.h
+++ b/sys/dev/nxge/include/xgehal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xge-osdep.h b/sys/dev/nxge/xge-osdep.h
index 7ff3e93404a4..2f7098385131 100644
--- a/sys/dev/nxge/xge-osdep.h
+++ b/sys/dev/nxge/xge-osdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xge-queue.c b/sys/dev/nxge/xgehal/xge-queue.c
index dd84884f2f1e..a1a792e0b8a0 100644
--- a/sys/dev/nxge/xgehal/xge-queue.c
+++ b/sys/dev/nxge/xgehal/xge-queue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-channel-fp.c b/sys/dev/nxge/xgehal/xgehal-channel-fp.c
index b03c63b512d6..98c98103adec 100644
--- a/sys/dev/nxge/xgehal/xgehal-channel-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-channel-fp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-channel.c b/sys/dev/nxge/xgehal/xgehal-channel.c
index 981e4c96fc47..c1ca17bea733 100644
--- a/sys/dev/nxge/xgehal/xgehal-channel.c
+++ b/sys/dev/nxge/xgehal/xgehal-channel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-config.c b/sys/dev/nxge/xgehal/xgehal-config.c
index 86beb46eda57..a937d5370e8c 100644
--- a/sys/dev/nxge/xgehal/xgehal-config.c
+++ b/sys/dev/nxge/xgehal/xgehal-config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-device-fp.c b/sys/dev/nxge/xgehal/xgehal-device-fp.c
index aa6057ac7336..2788e512883c 100644
--- a/sys/dev/nxge/xgehal/xgehal-device-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-device-fp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-device.c b/sys/dev/nxge/xgehal/xgehal-device.c
index 6f1f5ffeac7c..b211c04811cd 100644
--- a/sys/dev/nxge/xgehal/xgehal-device.c
+++ b/sys/dev/nxge/xgehal/xgehal-device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-driver.c b/sys/dev/nxge/xgehal/xgehal-driver.c
index 4168f4a33a1f..430931c32f24 100644
--- a/sys/dev/nxge/xgehal/xgehal-driver.c
+++ b/sys/dev/nxge/xgehal/xgehal-driver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-fifo-fp.c b/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
index c699630a5efb..6c28c5588507 100644
--- a/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-fifo.c b/sys/dev/nxge/xgehal/xgehal-fifo.c
index c410b33bfb37..78c0923dee0f 100644
--- a/sys/dev/nxge/xgehal/xgehal-fifo.c
+++ b/sys/dev/nxge/xgehal/xgehal-fifo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-mgmt.c b/sys/dev/nxge/xgehal/xgehal-mgmt.c
index 9c530f12ead3..7f8346bd0035 100644
--- a/sys/dev/nxge/xgehal/xgehal-mgmt.c
+++ b/sys/dev/nxge/xgehal/xgehal-mgmt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-mgmtaux.c b/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
index 4c4edbf87e40..00550d830f4b 100644
--- a/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
+++ b/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-mm.c b/sys/dev/nxge/xgehal/xgehal-mm.c
index 2acae64c0ae5..a787dad67d8a 100644
--- a/sys/dev/nxge/xgehal/xgehal-mm.c
+++ b/sys/dev/nxge/xgehal/xgehal-mm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-ring-fp.c b/sys/dev/nxge/xgehal/xgehal-ring-fp.c
index 2f049a8365d2..349d685a04bb 100644
--- a/sys/dev/nxge/xgehal/xgehal-ring-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-ring-fp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-ring.c b/sys/dev/nxge/xgehal/xgehal-ring.c
index 0e8699ccdd3b..061b77384213 100644
--- a/sys/dev/nxge/xgehal/xgehal-ring.c
+++ b/sys/dev/nxge/xgehal/xgehal-ring.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgehal/xgehal-stats.c b/sys/dev/nxge/xgehal/xgehal-stats.c
index 2bc74f82b11f..c5f59b6a855d 100644
--- a/sys/dev/nxge/xgehal/xgehal-stats.c
+++ b/sys/dev/nxge/xgehal/xgehal-stats.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/nxge/xgell-version.h b/sys/dev/nxge/xgell-version.h
index bbfeb484c6d9..df724827ee50 100644
--- a/sys/dev/nxge/xgell-version.h
+++ b/sys/dev/nxge/xgell-version.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2007 Neterion, Inc.
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_hw.c b/sys/dev/oce/oce_hw.c
index dc87d942f813..aad5795a97e5 100644
--- a/sys/dev/oce/oce_hw.c
+++ b/sys/dev/oce/oce_hw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_hw.h b/sys/dev/oce/oce_hw.h
index 9d80fba029b0..1ad3f7889e0b 100644
--- a/sys/dev/oce/oce_hw.h
+++ b/sys/dev/oce/oce_hw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 5b59b82ad592..370461291234 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h
index 12a5b22b89b3..99707e496783 100644
--- a/sys/dev/oce/oce_if.h
+++ b/sys/dev/oce/oce_if.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index df57503853ff..cb2ae81a013d 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_queue.c b/sys/dev/oce/oce_queue.c
index 0e148465fee5..308c16d54846 100644
--- a/sys/dev/oce/oce_queue.c
+++ b/sys/dev/oce/oce_queue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c
index f376aedbe896..61adf93ac69d 100644
--- a/sys/dev/oce/oce_sysctl.c
+++ b/sys/dev/oce/oce_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/oce/oce_util.c b/sys/dev/oce/oce_util.c
index fefea2e16eb7..9ae92ff05f16 100644
--- a/sys/dev/oce/oce_util.c
+++ b/sys/dev/oce/oce_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2013 Emulex
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 7cbc5c05358c..f7c72958d55f 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001, 2003 by Thomas Moestl <tmm@FreeBSD.org>
* Copyright (c) 2004 by Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c
index d5c6d558f2fd..fa7258341dcb 100644
--- a/sys/dev/ofw/ofw_bus_subr.c
+++ b/sys/dev/ofw/ofw_bus_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 - 2003 by Thomas Moestl <tmm@FreeBSD.org>.
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index 823b4d34722b..6532a1661991 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 8f3061bde89d..63d378b9f0e3 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Benno Rice.
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 5975abcf7aae..dbf706c6ed7d 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice <benno@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c
index d7c6d096c3d9..98a936bf918b 100644
--- a/sys/dev/ofw/ofw_fdt.c
+++ b/sys/dev/ofw/ofw_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
index fe4e8b1a1584..eb60c5baee0b 100644
--- a/sys/dev/ofw/ofw_pci.h
+++ b/sys/dev/ofw/ofw_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c
index 8db92b12902a..2cf0e63c6b22 100644
--- a/sys/dev/ofw/ofw_standard.c
+++ b/sys/dev/ofw/ofw_standard.c
@@ -1,8 +1,6 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/dev/ofw/ofwvar.h b/sys/dev/ofw/ofwvar.h
index 08ab78ad28c5..ddaa3db097dd 100644
--- a/sys/dev/ofw/ofwvar.h
+++ b/sys/dev/ofw/ofwvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Grehan
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index dc781d42ad8c..46006d50423f 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -1,8 +1,6 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index e17011640b55..4e9fb29c9014 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -1,8 +1,6 @@
/* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index adb8f092a0e4..5803ec1d6c4a 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index 5322fbaf8691..676cfb8007d0 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -1,8 +1,6 @@
/* $NetBSD: openfirmio.h,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index d79be6ea0517..8ba6d3acef3f 100644
--- a/sys/dev/ofw/openpromio.c
+++ b/sys/dev/ofw/openpromio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/dev/ofw/openpromio.h b/sys/dev/ofw/openpromio.h
index 9b52d377f0eb..5233d29eb870 100644
--- a/sys/dev/ofw/openpromio.h
+++ b/sys/dev/ofw/openpromio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index b128e6450c70..ebb0e33c8661 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2004
* Diomidis D. Spinellis, Athens, Greece
* All rights reserved.
diff --git a/sys/dev/pbio/pbioio.h b/sys/dev/pbio/pbioio.h
index 9d970f8bbc67..9a08bfab0254 100644
--- a/sys/dev/pbio/pbioio.h
+++ b/sys/dev/pbio/pbioio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2004
* Diomidis D. Spinellis, Athens, Greece
* All rights reserved.
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 71926d7dca26..4c80feae63ec 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -1,8 +1,6 @@
/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index a221d9377ba4..4bd5e772d1b4 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index 915f555924ad..d6b9c3899f86 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 29f1d4ee97b6..cb077185a246 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -6,8 +6,6 @@ __FBSDID("$FreeBSD$");
#define PCCARDDEBUG
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c
index 844422b54d57..807ed7984187 100644
--- a/sys/dev/pccard/pccard_device.c
+++ b/sys/dev/pccard/pccard_device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index 7d567dd6d52b..e0f6647771bc 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 57978f76037e..3bc27e352105 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h
index 89890c00bed2..9478c8f03e3e 100644
--- a/sys/dev/pccard/pccardvarp.h
+++ b/sys/dev/pccard/pccardvarp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index ab378868a8b5..f120219a82ff 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 M. Warner Losh.
* Copyright (c) 2000-2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index dadc720ba261..4571c627d193 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index d31d351ef159..7bf653a48b91 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002-2004 M. Warner Losh.
* Copyright (c) 2000-2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index cc1aa3ffe7c8..b73036f376bd 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2004 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index 3fb7e6a53074..ae73fe1c7149 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 3e1f56a4e823..196f154fe077 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2004 Warner Losh.
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 1d57b36e000e..d577aa43699f 100644
--- a/sys/dev/pcf/envctrl.c
+++ b/sys/dev/pcf/envctrl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Joerg Wunsch
*
* derived from sys/i386/isa/pcf.c which is:
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 0dcd1c40195f..cf2b65dc88cf 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu, Marc Bouget
* Copyright (c) 2004 Joerg Wunsch
* All rights reserved.
diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c
index 3fa0be6b26cc..b3a27377c948 100644
--- a/sys/dev/pcf/pcf_ebus.c
+++ b/sys/dev/pcf/pcf_ebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marius Strobl, Joerg Wunsch
*
* derived from sys/i386/isa/pcf.c which is:
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index d2ba419ca658..ca63583879a5 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Joerg Wunsch
*
* derived from sys/i386/isa/pcf.c which is:
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index c2f0becd42fe..33721c9a4331 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu, Marc Bouget
* Copyright (c) 2004 Joerg Wunsch
* All rights reserved.
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index e4c64be3b30d..3a40a7ab418e 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/sys/dev/pci/fixup_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c
index 60b335d56947..28d85b0d286d 100644
--- a/sys/dev/pci/hostb_pci.c
+++ b/sys/dev/pci/hostb_pci.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 5a24b87367ec..1ae9d34545c1 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 6a10406a0b8a..950920da0c82 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 7381d7597488..b4a59e70ff9e 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index cefd937115d6..553b9cb8a28a 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index c3c29c86a110..317a059b0191 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index fd62e9193ea2..f2811176c59f 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 229515d0c381..dba76d130aa5 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
index a7dc9a66dd4e..9014cff714f2 100644
--- a/sys/dev/pci/pcib_private.h
+++ b/sys/dev/pci/pcib_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 7552c023bd3a..9f1e4c772e76 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 3299c3d13785..8318d9f58404 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 51342a173a45..a5461bd5a0de 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c
index 5a35cac26493..a81bd0178b7d 100644
--- a/sys/dev/pcn/if_pcn.c
+++ b/sys/dev/pcn/if_pcn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@osd.bsdi.com>. All rights reserved.
diff --git a/sys/dev/pcn/if_pcnreg.h b/sys/dev/pcn/if_pcnreg.h
index 95cf0ec8f847..a10edfd76aa4 100644
--- a/sys/dev/pcn/if_pcnreg.h
+++ b/sys/dev/pcn/if_pcnreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 12f7cf7a9928..1701454d9620 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index e37a3c50a0ad..00add2cbc2ff 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -1,8 +1,6 @@
/* $NetBSD: pdq.c,v 1.33 2001/11/13 13:14:43 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995,1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index a1c0cde9f0e3..a556b36afffb 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -1,8 +1,6 @@
/* $NetBSD: pdqvar.h,v 1.27 2000/05/03 19:17:54 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index f4543056d98e..f8df3a7b2b76 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -1,8 +1,6 @@
/* $NetBSD: pdq_ifsubr.c,v 1.38 2001/12/21 23:21:47 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index aa067975c26c..a4dea690b154 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: pdqreg.h,v 1.14 2001/06/13 10:46:03 wiz Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 8f45fdcccf57..db532732f27a 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -1,8 +1,6 @@
/* $NetBSD: pdqvar.h,v 1.27 2000/05/03 19:17:54 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved.
*
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c
index 2402933326a5..53650e9a0246 100644
--- a/sys/dev/powermac_nvram/powermac_nvram.c
+++ b/sys/dev/powermac_nvram/powermac_nvram.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/powermac_nvram/powermac_nvramvar.h b/sys/dev/powermac_nvram/powermac_nvramvar.h
index 1073e50242e7..c326e3c5b5d6 100644
--- a/sys/dev/powermac_nvram/powermac_nvramvar.h
+++ b/sys/dev/powermac_nvram/powermac_nvramvar.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2006 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 8b573254cb12..7a9d9b0e4579 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index eb1b2e12f28a..6d460b758905 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 5ad1c2c6667a..0c85620675bf 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu, Marc Bouget
* All rights reserved.
*
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 9fc3b1b48104..ce08ccc605c2 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990 William F. Jolitz, TeleMuse
* All rights reserved.
*
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 97628f334ac4..c5a0f24a8446 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 7997e2883b6b..65612a21de4c 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Sascha Schumann. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index cd46b36c5473..5e869774c785 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 1ad05158fef9..5c4010f88bf5 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index 20782385acc0..b87b5975769f 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 7eb6df407384..8aba5ec3504d 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index a01519412951..1ee55e56d4bf 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 23a16ff7444d..b5b74b46243a 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index c026bf4574d0..8ac578e01380 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index ad019524a781..2794eddc1dea 100644
--- a/sys/dev/ppbus/ppbio.h
+++ b/sys/dev/ppbus/ppbio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index bf6a4268fdb8..2ee8fa670216 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu, Michael Smith
* All rights reserved.
*
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 4fb16e921179..9e9d86a6f8ba 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 723417f47bda..c8585c86e69b 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index a1bed05cf473..57129d78e28e 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Nicolas Souchu
* Copyright (c) 2000 Alcove - Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index 574afba38f6d..a264c66e9259 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 48e9309deec2..c89eb2fa094a 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
index 582638183f13..b0a30b44331b 100644
--- a/sys/dev/ppc/ppc_acpi.c
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 96bfc9bd18af..a40fc8e8ef36 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
* Copyright (c) 2006 Marcel Moolenaar
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index b3a2826c6f0c..64f31823139c 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 5acdd1f05b83..361d9b70af7e 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index ddd036ff6eb8..a7295033d731 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alcove - Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index 08d7a6af4f33..792111e8e23d 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index 15fbf36b6328..65f9267c29d8 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001,2002,2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index 0cb18957a3dc..65320845bd26 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001,2002,2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 0a09e1de79f3..4cc579636ec5 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001,2002,2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 2c16064981ab..084d32ce0158 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001,2002,2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/pty/pty.c b/sys/dev/pty/pty.c
index 656e05e18fba..ad34e1188d5d 100644
--- a/sys/dev/pty/pty.c
+++ b/sys/dev/pty/pty.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index f45493145be9..3d3c3fabfbad 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h
index 68678d3771e1..912958b3becb 100644
--- a/sys/dev/puc/puc_bfe.h
+++ b/sys/dev/puc/puc_bfe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_bus.h b/sys/dev/puc/puc_bus.h
index 71af1cfd4ce3..59da93da9b6e 100644
--- a/sys/dev/puc/puc_bus.h
+++ b/sys/dev/puc/puc_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_cfg.c b/sys/dev/puc/puc_cfg.c
index e7f7f775dc7e..99d98163b4ed 100644
--- a/sys/dev/puc/puc_cfg.c
+++ b/sys/dev/puc/puc_cfg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
index 490358053db7..3599d4c9429c 100644
--- a/sys/dev/puc/puc_cfg.h
+++ b/sys/dev/puc/puc_cfg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index 6aa115ed583f..232741e589d5 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Poul-Henning Kamp. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index d6b126f0f92b..618a3ae03691 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -1,8 +1,6 @@
/* $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 2002 JF Hay. All rights reserved.
* Copyright (c) 2000 M. Warner Losh. All rights reserved.
*
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 5a949becd98c..d8ca2584ab66 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_dbg.c b/sys/dev/qlxgb/qla_dbg.c
index b0e359f33ce5..bdbe8687f956 100644
--- a/sys/dev/qlxgb/qla_dbg.c
+++ b/sys/dev/qlxgb/qla_dbg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_dbg.h b/sys/dev/qlxgb/qla_dbg.h
index 8fd4ede8baea..893b13f7fdae 100644
--- a/sys/dev/qlxgb/qla_dbg.h
+++ b/sys/dev/qlxgb/qla_dbg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_def.h b/sys/dev/qlxgb/qla_def.h
index bf7e9c163976..77b678c7bc83 100644
--- a/sys/dev/qlxgb/qla_def.h
+++ b/sys/dev/qlxgb/qla_def.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_glbl.h b/sys/dev/qlxgb/qla_glbl.h
index e9179685dc64..9f045839313c 100644
--- a/sys/dev/qlxgb/qla_glbl.h
+++ b/sys/dev/qlxgb/qla_glbl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_hw.c b/sys/dev/qlxgb/qla_hw.c
index 94a007d227c3..cebe05aed81a 100644
--- a/sys/dev/qlxgb/qla_hw.c
+++ b/sys/dev/qlxgb/qla_hw.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2012 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_hw.h b/sys/dev/qlxgb/qla_hw.h
index e60b239b75f9..57012dddbc72 100644
--- a/sys/dev/qlxgb/qla_hw.h
+++ b/sys/dev/qlxgb/qla_hw.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_inline.h b/sys/dev/qlxgb/qla_inline.h
index 807bae765a38..1f8bf6f51ee8 100644
--- a/sys/dev/qlxgb/qla_inline.h
+++ b/sys/dev/qlxgb/qla_inline.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_ioctl.c b/sys/dev/qlxgb/qla_ioctl.c
index 615ef662c19a..5afb1a477e16 100644
--- a/sys/dev/qlxgb/qla_ioctl.c
+++ b/sys/dev/qlxgb/qla_ioctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_ioctl.h b/sys/dev/qlxgb/qla_ioctl.h
index 860a1290f017..4f100518d0e8 100644
--- a/sys/dev/qlxgb/qla_ioctl.h
+++ b/sys/dev/qlxgb/qla_ioctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_isr.c b/sys/dev/qlxgb/qla_isr.c
index 3633303b6e9e..d9670fb3f8f0 100644
--- a/sys/dev/qlxgb/qla_isr.c
+++ b/sys/dev/qlxgb/qla_isr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_misc.c b/sys/dev/qlxgb/qla_misc.c
index 9b265252f837..afed7a1a4985 100644
--- a/sys/dev/qlxgb/qla_misc.c
+++ b/sys/dev/qlxgb/qla_misc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c
index f690b4fc833a..8e3d8f46bc22 100644
--- a/sys/dev/qlxgb/qla_os.c
+++ b/sys/dev/qlxgb/qla_os.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_os.h b/sys/dev/qlxgb/qla_os.h
index 548719de890d..6c1e6f74b981 100644
--- a/sys/dev/qlxgb/qla_os.h
+++ b/sys/dev/qlxgb/qla_os.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_reg.h b/sys/dev/qlxgb/qla_reg.h
index fae144185c8a..0cc66b000843 100644
--- a/sys/dev/qlxgb/qla_reg.h
+++ b/sys/dev/qlxgb/qla_reg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgb/qla_ver.h b/sys/dev/qlxgb/qla_ver.h
index 84aa3d00ceb4..e32bd496f7d2 100644
--- a/sys/dev/qlxgb/qla_ver.h
+++ b/sys/dev/qlxgb/qla_ver.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_dbg.c b/sys/dev/qlxgbe/ql_dbg.c
index 0a7e29fd26de..0e9ec2d64c56 100644
--- a/sys/dev/qlxgbe/ql_dbg.c
+++ b/sys/dev/qlxgbe/ql_dbg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_dbg.h b/sys/dev/qlxgbe/ql_dbg.h
index 1ccf7bdc995b..863a7c8f2687 100644
--- a/sys/dev/qlxgbe/ql_dbg.h
+++ b/sys/dev/qlxgbe/ql_dbg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_def.h b/sys/dev/qlxgbe/ql_def.h
index 6bdc75136615..1ede2084efa4 100644
--- a/sys/dev/qlxgbe/ql_def.h
+++ b/sys/dev/qlxgbe/ql_def.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_glbl.h b/sys/dev/qlxgbe/ql_glbl.h
index 4643017c596d..9a5bbb669d4b 100644
--- a/sys/dev/qlxgbe/ql_glbl.h
+++ b/sys/dev/qlxgbe/ql_glbl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 7d34d0e75d1e..683407f32d59 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_hw.h b/sys/dev/qlxgbe/ql_hw.h
index dcaa4ac9808e..f59af522d0e3 100644
--- a/sys/dev/qlxgbe/ql_hw.h
+++ b/sys/dev/qlxgbe/ql_hw.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_inline.h b/sys/dev/qlxgbe/ql_inline.h
index 3018326034b4..41093de21811 100644
--- a/sys/dev/qlxgbe/ql_inline.h
+++ b/sys/dev/qlxgbe/ql_inline.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_ioctl.c b/sys/dev/qlxgbe/ql_ioctl.c
index 101d05f44604..377c28ecbcce 100644
--- a/sys/dev/qlxgbe/ql_ioctl.c
+++ b/sys/dev/qlxgbe/ql_ioctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_ioctl.h b/sys/dev/qlxgbe/ql_ioctl.h
index 43c6756d7edc..3a8150b637ab 100644
--- a/sys/dev/qlxgbe/ql_ioctl.h
+++ b/sys/dev/qlxgbe/ql_ioctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_isr.c b/sys/dev/qlxgbe/ql_isr.c
index 587daa66fd72..539a1e410524 100644
--- a/sys/dev/qlxgbe/ql_isr.c
+++ b/sys/dev/qlxgbe/ql_isr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_misc.c b/sys/dev/qlxgbe/ql_misc.c
index 840e28b53abe..18528200841e 100644
--- a/sys/dev/qlxgbe/ql_misc.c
+++ b/sys/dev/qlxgbe/ql_misc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c
index 7c9e88db47f1..471e2c43f1c5 100644
--- a/sys/dev/qlxgbe/ql_os.c
+++ b/sys/dev/qlxgbe/ql_os.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_os.h b/sys/dev/qlxgbe/ql_os.h
index 74e808d8abac..4a5c32b0f506 100644
--- a/sys/dev/qlxgbe/ql_os.h
+++ b/sys/dev/qlxgbe/ql_os.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_reset.c b/sys/dev/qlxgbe/ql_reset.c
index 16d1b8855424..76e2462c7b01 100644
--- a/sys/dev/qlxgbe/ql_reset.c
+++ b/sys/dev/qlxgbe/ql_reset.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_tmplt.h b/sys/dev/qlxgbe/ql_tmplt.h
index 2658931b7d87..39f54dd67acd 100644
--- a/sys/dev/qlxgbe/ql_tmplt.h
+++ b/sys/dev/qlxgbe/ql_tmplt.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxgbe/ql_ver.h b/sys/dev/qlxgbe/ql_ver.h
index d9e26b56f936..9887ac6c4adc 100644
--- a/sys/dev/qlxgbe/ql_ver.h
+++ b/sys/dev/qlxgbe/ql_ver.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_dbg.c b/sys/dev/qlxge/qls_dbg.c
index 8978519a6b4d..04eff20e57e0 100644
--- a/sys/dev/qlxge/qls_dbg.c
+++ b/sys/dev/qlxge/qls_dbg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_dbg.h b/sys/dev/qlxge/qls_dbg.h
index 63f7810cca1d..e4d7a416285d 100644
--- a/sys/dev/qlxge/qls_dbg.h
+++ b/sys/dev/qlxge/qls_dbg.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_def.h b/sys/dev/qlxge/qls_def.h
index 956e6edcf037..815946fafd5f 100644
--- a/sys/dev/qlxge/qls_def.h
+++ b/sys/dev/qlxge/qls_def.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_dump.c b/sys/dev/qlxge/qls_dump.c
index aec54beecdce..f829a85e3cf3 100644
--- a/sys/dev/qlxge/qls_dump.c
+++ b/sys/dev/qlxge/qls_dump.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_dump.h b/sys/dev/qlxge/qls_dump.h
index ee9ebe1d94f4..9ae3b55e1a48 100644
--- a/sys/dev/qlxge/qls_dump.h
+++ b/sys/dev/qlxge/qls_dump.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_glbl.h b/sys/dev/qlxge/qls_glbl.h
index de3ff44fc3d5..b7527742c043 100644
--- a/sys/dev/qlxge/qls_glbl.h
+++ b/sys/dev/qlxge/qls_glbl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_hw.c b/sys/dev/qlxge/qls_hw.c
index b29d62c5b0e4..b77d20e6f659 100644
--- a/sys/dev/qlxge/qls_hw.c
+++ b/sys/dev/qlxge/qls_hw.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_hw.h b/sys/dev/qlxge/qls_hw.h
index 36e21ee2a2af..6805f1e94a70 100644
--- a/sys/dev/qlxge/qls_hw.h
+++ b/sys/dev/qlxge/qls_hw.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_inline.h b/sys/dev/qlxge/qls_inline.h
index f280bf5fb701..6445567dd300 100644
--- a/sys/dev/qlxge/qls_inline.h
+++ b/sys/dev/qlxge/qls_inline.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_ioctl.c b/sys/dev/qlxge/qls_ioctl.c
index bad4307eb4ca..6b39fc96781e 100644
--- a/sys/dev/qlxge/qls_ioctl.c
+++ b/sys/dev/qlxge/qls_ioctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_ioctl.h b/sys/dev/qlxge/qls_ioctl.h
index 972ba31f2bdd..af3091f1a51b 100644
--- a/sys/dev/qlxge/qls_ioctl.h
+++ b/sys/dev/qlxge/qls_ioctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_isr.c b/sys/dev/qlxge/qls_isr.c
index 523b32fd34d1..9b571f591064 100644
--- a/sys/dev/qlxge/qls_isr.c
+++ b/sys/dev/qlxge/qls_isr.c
@@ -1,8 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c
index 7250b8369466..6b6d74c273e8 100644
--- a/sys/dev/qlxge/qls_os.c
+++ b/sys/dev/qlxge/qls_os.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_os.h b/sys/dev/qlxge/qls_os.h
index b52b1c8b9ebd..c72410745e47 100644
--- a/sys/dev/qlxge/qls_os.h
+++ b/sys/dev/qlxge/qls_os.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/qlxge/qls_ver.h b/sys/dev/qlxge/qls_ver.h
index de3b66fb62dd..afac640c8104 100644
--- a/sys/dev/qlxge/qls_ver.h
+++ b/sys/dev/qlxge/qls_ver.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
*
diff --git a/sys/dev/quicc/quicc_bfe.h b/sys/dev/quicc/quicc_bfe.h
index ea791bc277e3..a08e4cf3f8d0 100644
--- a/sys/dev/quicc/quicc_bfe.h
+++ b/sys/dev/quicc/quicc_bfe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2006 by Juniper Networks.
* All rights reserved.
*
diff --git a/sys/dev/quicc/quicc_bfe_fdt.c b/sys/dev/quicc/quicc_bfe_fdt.c
index 06d737cbfd8c..a7cd35424bea 100644
--- a/sys/dev/quicc/quicc_bfe_fdt.c
+++ b/sys/dev/quicc/quicc_bfe_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Juniper Networks.
* All rights reserved.
*
diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h
index a12e6d681b87..6271ba5e298a 100644
--- a/sys/dev/quicc/quicc_bus.h
+++ b/sys/dev/quicc/quicc_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/quicc/quicc_core.c b/sys/dev/quicc/quicc_core.c
index 1a5a15e1e2b1..b0e22b4e5913 100644
--- a/sys/dev/quicc/quicc_core.c
+++ b/sys/dev/quicc/quicc_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2006 by Juniper Networks.
* All rights reserved.
*
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 0c5eb19651d7..24b851a99ae8 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* Copyright (C) 2002 by John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 9489257d9f8d..8ba287e7251c 100644
--- a/sys/dev/rc/rcreg.h
+++ b/sys/dev/rc/rcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* Copyright (C) 2002 by John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 2d3f23c095e3..071b55b10146 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 5d2490af11db..88f414a48aa7 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -1,8 +1,6 @@
/* $OpenBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 786f0a442a98..5a284e9a91de 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -2,8 +2,6 @@
/* $OpenBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 71e309625a25..5027694d54ec 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index 74a84fc78b91..9ea7fc04e277 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index cfc53b726cdf..3479ab7c020d 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index bd1de316028d..c5a8cac7b079 100644
--- a/sys/dev/rp/rpreg.h
+++ b/sys/dev/rp/rpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index a93f48971469..fd5faf3d85c0 100644
--- a/sys/dev/rp/rpvar.h
+++ b/sys/dev/rp/rpvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index 62298fd52afc..e4e09564bdca 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015-2016, Stanislav Galabov
* Copyright (c) 2014, Aleksandr A. Mityaev
* Copyright (c) 2011, Aleksandr Rybalko
diff --git a/sys/dev/rt/if_rtreg.h b/sys/dev/rt/if_rtreg.h
index cbb70b06ae5e..56047ef6ec65 100644
--- a/sys/dev/rt/if_rtreg.h
+++ b/sys/dev/rt/if_rtreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Aleksandr Rybalko
* All rights reserved.
*
diff --git a/sys/dev/rt/if_rtvar.h b/sys/dev/rt/if_rtvar.h
index 83b0de37e951..b2869c5e61ea 100644
--- a/sys/dev/rt/if_rtvar.h
+++ b/sys/dev/rt/if_rtvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Aleksandr Rybalko <ray@ddteam.net>
* Copyright (c) 2009-2010 Alexander Egorenkov <egorenar@gmail.com>
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 0fec8d40935d..93714ca32276 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
* All rights reserved.
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index e7b92c9f459f..6d07999eb10e 100644
--- a/sys/dev/safe/safereg.h
+++ b/sys/dev/safe/safereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
* All rights reserved.
diff --git a/sys/dev/safe/safevar.h b/sys/dev/safe/safevar.h
index 6386e9b71daf..aadf30dd6e63 100644
--- a/sys/dev/safe/safevar.h
+++ b/sys/dev/safe/safevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
* All rights reserved.
diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h
index d6ddd6775a3c..be52707bd110 100644
--- a/sys/dev/scc/scc_bfe.h
+++ b/sys/dev/scc/scc_bfe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_bfe_ebus.c b/sys/dev/scc/scc_bfe_ebus.c
index 365eb28444ee..def832af5ead 100644
--- a/sys/dev/scc/scc_bfe_ebus.c
+++ b/sys/dev/scc/scc_bfe_ebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c
index 51a8ed61f0f5..bdba908324a0 100644
--- a/sys/dev/scc/scc_bfe_macio.c
+++ b/sys/dev/scc/scc_bfe_macio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_bfe_quicc.c b/sys/dev/scc/scc_bfe_quicc.c
index 6f047b75a4ee..d776e839f2b9 100644
--- a/sys/dev/scc/scc_bfe_quicc.c
+++ b/sys/dev/scc/scc_bfe_quicc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_bfe_sbus.c b/sys/dev/scc/scc_bfe_sbus.c
index b6f0f1a0e8b8..d776513f507d 100644
--- a/sys/dev/scc/scc_bfe_sbus.c
+++ b/sys/dev/scc/scc_bfe_sbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_bus.h b/sys/dev/scc/scc_bus.h
index 47a43db01a65..1e5138af9220 100644
--- a/sys/dev/scc/scc_bus.h
+++ b/sys/dev/scc/scc_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_core.c b/sys/dev/scc/scc_core.c
index a4971f8039a9..4471b9a20f72 100644
--- a/sys/dev/scc/scc_core.c
+++ b/sys/dev/scc/scc_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_dev_quicc.c b/sys/dev/scc/scc_dev_quicc.c
index 9c372e8e33c4..59c2f97037d3 100644
--- a/sys/dev/scc/scc_dev_quicc.c
+++ b/sys/dev/scc/scc_dev_quicc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_dev_sab82532.c b/sys/dev/scc/scc_dev_sab82532.c
index 2885c7152e30..bbc8bd4b9812 100644
--- a/sys/dev/scc/scc_dev_sab82532.c
+++ b/sys/dev/scc/scc_dev_sab82532.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/scc/scc_dev_z8530.c b/sys/dev/scc/scc_dev_z8530.c
index da070dfc7922..764819f9d726 100644
--- a/sys/dev/scc/scc_dev_z8530.c
+++ b/sys/dev/scc/scc_dev_z8530.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index c6781f28ec3c..05bd7a69ed43 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci.h b/sys/dev/sdhci/sdhci.h
index 5db97b9e8f9b..951ba483bf6c 100644
--- a/sys/dev/sdhci/sdhci.h
+++ b/sys/dev/sdhci/sdhci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
index bb8a2eadfcae..2e1b30e4b377 100644
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Thomas Skibo
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci_pci.c b/sys/dev/sdhci/sdhci_pci.c
index 38d5be70b6e5..00a3b8b28316 100644
--- a/sys/dev/sdhci/sdhci_pci.c
+++ b/sys/dev/sdhci/sdhci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sec/sec.c b/sys/dev/sec/sec.c
index 3d01bd99e4b7..b83e7ebb7843 100644
--- a/sys/dev/sec/sec.c
+++ b/sys/dev/sec/sec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* All rights reserved.
*
diff --git a/sys/dev/sec/sec.h b/sys/dev/sec/sec.h
index 105b49a49e28..fecfd86cb98d 100644
--- a/sys/dev/sec/sec.h
+++ b/sys/dev/sec/sec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* All rights reserved.
*
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index ef07f5db7fc2..2d0df0ffa5d8 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sf/if_sfreg.h b/sys/dev/sf/if_sfreg.h
index bec92f1c813c..0ed20acb6e15 100644
--- a/sys/dev/sf/if_sfreg.h
+++ b/sys/dev/sf/if_sfreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h
index 0b4ae1603ca5..953330fcfac8 100644
--- a/sys/dev/sfxge/common/efsys.h
+++ b/sys/dev/sfxge/common/efsys.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx.h b/sys/dev/sfxge/common/efx.h
index 1eb647b2f3c5..0f91b4fa6200 100644
--- a/sys/dev/sfxge/common/efx.h
+++ b/sys/dev/sfxge/common/efx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_bootcfg.c b/sys/dev/sfxge/common/efx_bootcfg.c
index f7b562e9d73c..d024a0c508d2 100644
--- a/sys/dev/sfxge/common/efx_bootcfg.c
+++ b/sys/dev/sfxge/common/efx_bootcfg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_ev.c b/sys/dev/sfxge/common/efx_ev.c
index 0abfed02734a..1ca0941b968e 100644
--- a/sys/dev/sfxge/common/efx_ev.c
+++ b/sys/dev/sfxge/common/efx_ev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_filter.c b/sys/dev/sfxge/common/efx_filter.c
index fee0879345ea..49770d301320 100644
--- a/sys/dev/sfxge/common/efx_filter.c
+++ b/sys/dev/sfxge/common/efx_filter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_impl.h b/sys/dev/sfxge/common/efx_impl.h
index 7d699420aeb8..a2963e558680 100644
--- a/sys/dev/sfxge/common/efx_impl.h
+++ b/sys/dev/sfxge/common/efx_impl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_intr.c b/sys/dev/sfxge/common/efx_intr.c
index db021ac514f8..ee9301d768d5 100644
--- a/sys/dev/sfxge/common/efx_intr.c
+++ b/sys/dev/sfxge/common/efx_intr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_mac.c b/sys/dev/sfxge/common/efx_mac.c
index 4a79a0458ae3..fa49e9849b9a 100644
--- a/sys/dev/sfxge/common/efx_mac.c
+++ b/sys/dev/sfxge/common/efx_mac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_mcdi.c b/sys/dev/sfxge/common/efx_mcdi.c
index 9cafc383d409..4e7ff53dcbed 100644
--- a/sys/dev/sfxge/common/efx_mcdi.c
+++ b/sys/dev/sfxge/common/efx_mcdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_mcdi.h b/sys/dev/sfxge/common/efx_mcdi.h
index 0045865450cb..ee11789e83aa 100644
--- a/sys/dev/sfxge/common/efx_mcdi.h
+++ b/sys/dev/sfxge/common/efx_mcdi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_mon.c b/sys/dev/sfxge/common/efx_mon.c
index 19f9a1f5adf3..5cbb4552b605 100644
--- a/sys/dev/sfxge/common/efx_mon.c
+++ b/sys/dev/sfxge/common/efx_mon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_nic.c b/sys/dev/sfxge/common/efx_nic.c
index 9176f88c2267..7e5bf1363178 100644
--- a/sys/dev/sfxge/common/efx_nic.c
+++ b/sys/dev/sfxge/common/efx_nic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_nvram.c b/sys/dev/sfxge/common/efx_nvram.c
index 54efc6bbf7b8..60169fc31cdf 100644
--- a/sys/dev/sfxge/common/efx_nvram.c
+++ b/sys/dev/sfxge/common/efx_nvram.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c
index 13f7a75d4c81..1db2300141c0 100644
--- a/sys/dev/sfxge/common/efx_phy.c
+++ b/sys/dev/sfxge/common/efx_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_port.c b/sys/dev/sfxge/common/efx_port.c
index ce1e14229499..febbfa2e0d3d 100644
--- a/sys/dev/sfxge/common/efx_port.c
+++ b/sys/dev/sfxge/common/efx_port.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs.h b/sys/dev/sfxge/common/efx_regs.h
index 62d17ec1421f..b817db7eee21 100644
--- a/sys/dev/sfxge/common/efx_regs.h
+++ b/sys/dev/sfxge/common/efx_regs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs_ef10.h b/sys/dev/sfxge/common/efx_regs_ef10.h
index 7c7e3c8027aa..df03a9643646 100644
--- a/sys/dev/sfxge/common/efx_regs_ef10.h
+++ b/sys/dev/sfxge/common/efx_regs_ef10.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs_mcdi.h b/sys/dev/sfxge/common/efx_regs_mcdi.h
index 33134e6abb9c..370a9ef05ac3 100644
--- a/sys/dev/sfxge/common/efx_regs_mcdi.h
+++ b/sys/dev/sfxge/common/efx_regs_mcdi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008-2013 Solarflare Communications Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sfxge/common/efx_regs_pci.h b/sys/dev/sfxge/common/efx_regs_pci.h
index 4d63c4a84b2d..f274b0b976e2 100644
--- a/sys/dev/sfxge/common/efx_regs_pci.h
+++ b/sys/dev/sfxge/common/efx_regs_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_rx.c b/sys/dev/sfxge/common/efx_rx.c
index 2716c32ea3f4..5ae2c0928e34 100644
--- a/sys/dev/sfxge/common/efx_rx.c
+++ b/sys/dev/sfxge/common/efx_rx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_sram.c b/sys/dev/sfxge/common/efx_sram.c
index 9a6cfa4860b3..beb24a408e53 100644
--- a/sys/dev/sfxge/common/efx_sram.c
+++ b/sys/dev/sfxge/common/efx_sram.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_tx.c b/sys/dev/sfxge/common/efx_tx.c
index cfaf22076ad7..cb976af2c56a 100644
--- a/sys/dev/sfxge/common/efx_tx.c
+++ b/sys/dev/sfxge/common/efx_tx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_types.h b/sys/dev/sfxge/common/efx_types.h
index 932d8dd5fde4..fb5d5507806f 100644
--- a/sys/dev/sfxge/common/efx_types.h
+++ b/sys/dev/sfxge/common/efx_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_vpd.c b/sys/dev/sfxge/common/efx_vpd.c
index df9c1b4670cb..091dfb5b21d3 100644
--- a/sys/dev/sfxge/common/efx_vpd.c
+++ b/sys/dev/sfxge/common/efx_vpd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_flash.h b/sys/dev/sfxge/common/siena_flash.h
index 72d989ac7c36..18e8779612d6 100644
--- a/sys/dev/sfxge/common/siena_flash.h
+++ b/sys/dev/sfxge/common/siena_flash.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_impl.h b/sys/dev/sfxge/common/siena_impl.h
index dea0c6a6dba8..9458dca70d07 100644
--- a/sys/dev/sfxge/common/siena_impl.h
+++ b/sys/dev/sfxge/common/siena_impl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_mac.c b/sys/dev/sfxge/common/siena_mac.c
index da982c6a7265..7646f09c5766 100644
--- a/sys/dev/sfxge/common/siena_mac.c
+++ b/sys/dev/sfxge/common/siena_mac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_nic.c b/sys/dev/sfxge/common/siena_nic.c
index 55566bf7b8a8..39922a7ddcf7 100644
--- a/sys/dev/sfxge/common/siena_nic.c
+++ b/sys/dev/sfxge/common/siena_nic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_nvram.c b/sys/dev/sfxge/common/siena_nvram.c
index 28262c9b5cae..8567c19700b2 100644
--- a/sys/dev/sfxge/common/siena_nvram.c
+++ b/sys/dev/sfxge/common/siena_nvram.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_phy.c b/sys/dev/sfxge/common/siena_phy.c
index f8857462b99a..390e06d25c87 100644
--- a/sys/dev/sfxge/common/siena_phy.c
+++ b/sys/dev/sfxge/common/siena_phy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_sram.c b/sys/dev/sfxge/common/siena_sram.c
index b3d17e2fac3a..6f4dbf462f1d 100644
--- a/sys/dev/sfxge/common/siena_sram.c
+++ b/sys/dev/sfxge/common/siena_sram.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/common/siena_vpd.c b/sys/dev/sfxge/common/siena_vpd.c
index 1cea8dc5172a..f7d685e75c24 100644
--- a/sys/dev/sfxge/common/siena_vpd.c
+++ b/sys/dev/sfxge/common/siena_vpd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 9aa1ff8ab006..94b703518248 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge.h b/sys/dev/sfxge/sfxge.h
index 679d51e39200..ed8b49d6fb28 100644
--- a/sys/dev/sfxge/sfxge.h
+++ b/sys/dev/sfxge/sfxge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_dma.c b/sys/dev/sfxge/sfxge_dma.c
index f75fab016897..afe491779597 100644
--- a/sys/dev/sfxge/sfxge_dma.c
+++ b/sys/dev/sfxge/sfxge_dma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c
index 2cfe98f1220d..a5d2de436e44 100644
--- a/sys/dev/sfxge/sfxge_ev.c
+++ b/sys/dev/sfxge/sfxge_ev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c
index bcff90b23f48..821aa3f0edaf 100644
--- a/sys/dev/sfxge/sfxge_intr.c
+++ b/sys/dev/sfxge/sfxge_intr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_mcdi.c b/sys/dev/sfxge/sfxge_mcdi.c
index 025bed0d73de..4a437bbc0891 100644
--- a/sys/dev/sfxge/sfxge_mcdi.c
+++ b/sys/dev/sfxge/sfxge_mcdi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_port.c b/sys/dev/sfxge/sfxge_port.c
index 63bf4cd57994..5723f31b507a 100644
--- a/sys/dev/sfxge/sfxge_port.c
+++ b/sys/dev/sfxge/sfxge_port.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c
index b65c5c483914..3ec05e8cd4eb 100644
--- a/sys/dev/sfxge/sfxge_rx.c
+++ b/sys/dev/sfxge/sfxge_rx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_rx.h b/sys/dev/sfxge/sfxge_rx.h
index ba7deeb2971f..2196c4e93144 100644
--- a/sys/dev/sfxge/sfxge_rx.h
+++ b/sys/dev/sfxge/sfxge_rx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_tx.c b/sys/dev/sfxge/sfxge_tx.c
index 32d7a47c3708..dd78e6e8a24f 100644
--- a/sys/dev/sfxge/sfxge_tx.c
+++ b/sys/dev/sfxge/sfxge_tx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sfxge/sfxge_tx.h b/sys/dev/sfxge/sfxge_tx.h
index 430ba1f4f8bf..3750243d73d3 100644
--- a/sys/dev/sfxge/sfxge_tx.h
+++ b/sys/dev/sfxge/sfxge_tx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
*
diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
index 7c9bdd954700..9aefce1e32e5 100644
--- a/sys/dev/sge/if_sge.c
+++ b/sys/dev/sge/if_sge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2008-2010 Nikolay Denev <ndenev@gmail.com>
* Copyright (c) 2007-2008 Alexander Pohoyda <alexander.pohoyda@gmx.net>
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/sge/if_sgereg.h b/sys/dev/sge/if_sgereg.h
index 5b7d75ed6913..a72d1a5a5646 100644
--- a/sys/dev/sge/if_sgereg.h
+++ b/sys/dev/sge/if_sgereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2008, 2009, 2010 Nikolay Denev <ndenev@gmail.com>
* Copyright (c) 2007, 2008 Alexander Pohoyda <alexander.pohoyda@gmx.net>
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/siba/siba_bwn.c b/sys/dev/siba/siba_bwn.c
index cb70283d8e02..42069396fc2d 100644
--- a/sys/dev/siba/siba_bwn.c
+++ b/sys/dev/siba/siba_bwn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/siba/siba_core.c b/sys/dev/siba/siba_core.c
index 6bfc4f315894..667487838194 100644
--- a/sys/dev/siba/siba_core.c
+++ b/sys/dev/siba/siba_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/siba/siba_ids.h b/sys/dev/siba/siba_ids.h
index d90206292ac7..b5aaf3419c75 100644
--- a/sys/dev/siba/siba_ids.h
+++ b/sys/dev/siba/siba_ids.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/dev/siba/sibareg.h b/sys/dev/siba/sibareg.h
index bc6d0f149c02..1b10a91d9ef9 100644
--- a/sys/dev/siba/sibareg.h
+++ b/sys/dev/siba/sibareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/dev/siba/sibavar.h b/sys/dev/siba/sibavar.h
index b3bda80683f3..c4b34173c661 100644
--- a/sys/dev/siba/sibavar.h
+++ b/sys/dev/siba/sibavar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 6727a99b3141..8b5b3c69d1ba 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/siis/siis.h b/sys/dev/siis/siis.h
index 383b0e0b98ac..d0e0d88df713 100644
--- a/sys/dev/siis/siis.h
+++ b/sys/dev/siis/siis.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index acd2595eaaa2..ed4cbf17cd62 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index 8c9fae891828..fd2b49d32eec 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index fcabc5e032dd..7bdb755d8051 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index 3f1a79ae9ac4..a693536d33cd 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index f31027ae3f25..0ae0e7d6424d 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 JF Hay. All rights reserved.
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 87413b4a1fe3..7b00452c88ce 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index b61283484fb3..22a6019d8e62 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index cf719ec310dc..71593e6b9b00 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/sys/dev/sis/if_sisreg.h b/sys/dev/sis/if_sisreg.h
index 9523af1d2ec8..6256fde33f04 100644
--- a/sys/dev/sis/if_sisreg.h
+++ b/sys/dev/sis/if_sisreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index ae3c86251ad8..b0a46c9d97ef 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1,8 +1,6 @@
/* $OpenBSD: if_sk.c,v 2.33 2003/08/12 05:23:06 nate Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index 85d3f14ea625..49c958320b90 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -1,8 +1,6 @@
/* $OpenBSD: if_skreg.h,v 1.10 2003/08/12 05:23:06 nate Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index 30bd16c9a749..604073b72a38 100644
--- a/sys/dev/sk/xmaciireg.h
+++ b/sys/dev/sk/xmaciireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index fc24d8f67c91..262973340b20 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index ed01adc663d3..b766a656d277 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index da994e8fc4dd..06d225a03869 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index 37eb1ab6ab67..e994606c549c 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 7341f3bf5bdd..328c4520a798 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f15c7741e7f..2093aa013602 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
*
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
index ae59cfcda642..ecb97c4fa5c0 100644
--- a/sys/dev/smc/if_smc.c
+++ b/sys/dev/smc/if_smc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/smc/if_smcreg.h b/sys/dev/smc/if_smcreg.h
index 4642966f0d49..4b9390763807 100644
--- a/sys/dev/smc/if_smcreg.h
+++ b/sys/dev/smc/if_smcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/smc/if_smcvar.h b/sys/dev/smc/if_smcvar.h
index a58eb0df0374..fd42edbb2226 100644
--- a/sys/dev/smc/if_smcvar.h
+++ b/sys/dev/smc/if_smcvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Benno Rice. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 46cd32ebaadc..0306089c8629 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Gardner Buchanan <gbuchanan@shl.com>
* All rights reserved.
*
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index dd71e1f78ca0..ca4b1f48046e 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index bd144a94ff63..13f48622b270 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index bd4dc63010bd..9fab405a99aa 100644
--- a/sys/dev/sn/if_snreg.h
+++ b/sys/dev/sn/if_snreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Gardner Buchanan <gbuchanan@shl.com>
* All rights reserved.
*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index acc8da22795b..bd4f31285c65 100644
--- a/sys/dev/sn/if_snvar.h
+++ b/sys/dev/sn/if_snvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/sn/ositech.h b/sys/dev/sn/ositech.h
index c33690861b24..18ce6780151e 100644
--- a/sys/dev/sn/ositech.h
+++ b/sys/dev/sn/ositech.h
@@ -3,8 +3,6 @@
(Special thanks to Kevin MacPherson of OSITECH)
(Thanks to Ositech Communications for permitting for BSDL distribution)
- SPDX-License-Identifier: BSD-2-Clause
-
Copyright 2002 Ositech Communications Inc. All Rights Reserved
Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 14f82dc6b1aa..1c02660bec1d 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 6b3200354fd9..012910c978d3 100644
--- a/sys/dev/sound/chip.h
+++ b/sys/dev/sound/chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/clone.c b/sys/dev/sound/clone.c
index 125d80152c36..8b6c53ca5fbd 100644
--- a/sys/dev/sound/clone.c
+++ b/sys/dev/sound/clone.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/clone.h b/sys/dev/sound/clone.h
index 67aaf63b7585..18149ba266db 100644
--- a/sys/dev/sound/clone.h
+++ b/sys/dev/sound/clone.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index bd25cfd5a6dc..470ee7476c67 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index e8a8199b5008..32a7d47779c7 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
* Copyright (c) 1994,1995 Hannu Savolainen
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index d21bba9ba8de..b21d3cda1997 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Luigi Rizzo
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 6849830efc0b..7c1ae3091eab 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
*
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 62dc22703675..239fd042223a 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* Copyright (c) 1999 Ville-Pertti Keinonen
* All rights reserved.
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 79a013ae9dc6..4f5548e91ff5 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 George Reid <greid@ukug.uk.freebsd.org>
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index ea9d8177db76..bfece0773f85 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 1997 Luigi Rizzo
* All rights reserved.
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index b077a5bc6a30..020f2baf0283 100644
--- a/sys/dev/sound/isa/sb.h
+++ b/sys/dev/sound/isa/sb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,1998 Luigi Rizzo
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index cf7dd54199dc..141ea0171750 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
*
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 9cdc1b230ab4..047e11d255da 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
*
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 68922a1fd4d8..6a8e1d34f144 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 9d41c5292970..4333217829c4 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c
index 65911bcac8b6..5c012d32699c 100644
--- a/sys/dev/sound/macio/aoa.c
+++ b/sys/dev/sound/macio/aoa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/aoa.h b/sys/dev/sound/macio/aoa.h
index 59b8bc0d61de..285ae51549f2 100644
--- a/sys/dev/sound/macio/aoa.h
+++ b/sys/dev/sound/macio/aoa.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c
index c498be157d1f..46c731b08a30 100644
--- a/sys/dev/sound/macio/davbus.c
+++ b/sys/dev/sound/macio/davbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/davbusreg.h b/sys/dev/sound/macio/davbusreg.h
index c8307d9f35c2..a7ccdf16e495 100644
--- a/sys/dev/sound/macio/davbusreg.h
+++ b/sys/dev/sound/macio/davbusreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 9cf4c5a6cd34..e35a262be88c 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/onyx.c b/sys/dev/sound/macio/onyx.c
index c258723c8419..05eef0f91b19 100644
--- a/sys/dev/sound/macio/onyx.c
+++ b/sys/dev/sound/macio/onyx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 by Andreas Tobler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c
index 74ed823493b1..bfbd1b068a43 100644
--- a/sys/dev/sound/macio/snapper.c
+++ b/sys/dev/sound/macio/snapper.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c
index 24519eae3e5c..3045a2cd4c50 100644
--- a/sys/dev/sound/macio/tumbler.c
+++ b/sys/dev/sound/macio/tumbler.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright 2008 by Marco Trillo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 325106200320..4c6fe2e7c8bc 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
index eb72d1c18359..c694b7b4851d 100644
--- a/sys/dev/sound/midi/midi.h
+++ b/sys/dev/sound/midi/midi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
*
diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h
index ea19c06bae63..6b3017542cca 100644
--- a/sys/dev/sound/midi/midiq.h
+++ b/sys/dev/sound/midi/midiq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
*
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index ce4b4400cb84..5ce6648b207c 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
*
diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h
index fd244447dadb..9ac99a6c9dd5 100644
--- a/sys/dev/sound/midi/mpu401.h
+++ b/sys/dev/sound/midi/mpu401.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
*
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index 32ba8c881bda..180894964ec1 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1993 Hannu Savolainen
* All rights reserved.
diff --git a/sys/dev/sound/midi/sequencer.h b/sys/dev/sound/midi/sequencer.h
index 7a53e6245580..97ce47ade607 100644
--- a/sys/dev/sound/midi/sequencer.h
+++ b/sys/dev/sound/midi/sequencer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/pci/allegro_code.h b/sys/dev/sound/pci/allegro_code.h
index 4a46012cd242..4d5c1736c85a 100644
--- a/sys/dev/sound/pci/allegro_code.h
+++ b/sys/dev/sound/pci/allegro_code.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1996-2008, 4Front Technologies
* Copyright (C) 1997-1999 ESS Technology, Inc
* All rights reserved.
diff --git a/sys/dev/sound/pci/allegro_reg.h b/sys/dev/sound/pci/allegro_reg.h
index 5a219bb5c832..759e8e866b2e 100644
--- a/sys/dev/sound/pci/allegro_reg.h
+++ b/sys/dev/sound/pci/allegro_reg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996-2008, 4Front Technologies
* Copyright (C) 1992-2000 Don Kim (don.kim@esstech.com)
* All rights reserved.
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 7bca1d058691..de5952283cdc 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Orion Hodson <oho@acm.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index 64b609ec1e25..00661a039b45 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index f1aba8730510..ca9a539aa6c4 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/atiixp.h b/sys/dev/sound/pci/atiixp.h
index 0ea872ebbb85..1eb48f5796c9 100644
--- a/sys/dev/sound/pci/atiixp.h
+++ b/sys/dev/sound/pci/atiixp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 486964c00c49..f38ba12dacee 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index 0ca1caf97bc3..e835c7119fcb 100644
--- a/sys/dev/sound/pci/aureal.h
+++ b/sys/dev/sound/pci/aureal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 35b3257a00f8..3e4b048c5409 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h
index 5b0b8b2cb961..5c468b55ed8b 100644
--- a/sys/dev/sound/pci/cmireg.h
+++ b/sys/dev/sound/pci/cmireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index fe73e14edb29..4750daf3b969 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index bc0f00997ff8..c7b3799ab89d 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cs461x_dsp.h b/sys/dev/sound/pci/cs461x_dsp.h
index 23c4d0aa3ec3..c5dcf6191927 100644
--- a/sys/dev/sound/pci/cs461x_dsp.h
+++ b/sys/dev/sound/pci/cs461x_dsp.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1996-2008, 4Front Technologies
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 6b074018727d..5dbc7be0c586 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index a0b35c909931..5a1544da7de0 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index 85ca663e7673..d8e111b2a6c5 100644
--- a/sys/dev/sound/pci/csareg.h
+++ b/sys/dev/sound/pci/csareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index a3d8079be8a7..c8e3697ba948 100644
--- a/sys/dev/sound/pci/csavar.h
+++ b/sys/dev/sound/pci/csavar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index 96fa231d27a3..13c4745ebe5c 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* =============================================================================
* Copyright (c) 1997-1999 Yamaha Corporation. All Rights Reserved.
*
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 9c7c75cb175b..23f3d5cfe915 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 028f100c5953..e03127cbddb3 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 David O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2003 Orlando Bassotto <orlando.bassotto@ieo-research.it>
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c
index 778d17013a05..0d5fa305cba2 100644
--- a/sys/dev/sound/pci/emu10kx-midi.c
+++ b/sys/dev/sound/pci/emu10kx-midi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Seigo Tanimura
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 2003-2006 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 0099b0f044d0..406a85ff77cc 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
* Copyright (c) 2003-2007 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
* All rights reserved.
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index 94159f583d39..ca96ba6b33d0 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 2003-2007 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
* All rights reserved.
diff --git a/sys/dev/sound/pci/emu10kx.h b/sys/dev/sound/pci/emu10kx.h
index b4cfd7d6bab9..cfdb69774943 100644
--- a/sys/dev/sound/pci/emu10kx.h
+++ b/sys/dev/sound/pci/emu10kx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
* Copyright (c) 2003-2006 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
* All rights reserved.
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index f70019b47e59..9272a95c984f 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/envy24.h b/sys/dev/sound/pci/envy24.h
index 0587fc5a4641..5a3a3730b563 100644
--- a/sys/dev/sound/pci/envy24.h
+++ b/sys/dev/sound/pci/envy24.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index a4d3370dc31c..fe1fb1906481 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/envy24ht.h b/sys/dev/sound/pci/envy24ht.h
index 9b9c19e52a3c..943599401e69 100644
--- a/sys/dev/sound/pci/envy24ht.h
+++ b/sys/dev/sound/pci/envy24ht.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index e11240a9e07e..7032c84f6e9e 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
* Copyright (c) 1999 Russell Cattelan <cattelan@thebarn.com>
* Copyright (c) 1998 Joachim Kuebart <joachim.kuebart@gmx.net>
* All rights reserved.
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index e1e2fe4e933d..01cb53d0a948 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Joachim Kuebart <joachim.kuebart@gmx.net>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 4ff48bbffe9e..a8e330216101 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Dmitry Dicky diwil@dataart.com
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/hda/hda_reg.h b/sys/dev/sound/pci/hda/hda_reg.h
index 0be933ed896d..c60a74da70a6 100644
--- a/sys/dev/sound/pci/hda/hda_reg.h
+++ b/sys/dev/sound/pci/hda/hda_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 261a0ce29629..9bc9b3e4bd9d 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdaa.h b/sys/dev/sound/pci/hda/hdaa.h
index ca6b30d750d0..a85e14f0dee5 100644
--- a/sys/dev/sound/pci/hda/hdaa.h
+++ b/sys/dev/sound/pci/hda/hdaa.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*-7
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c
index e897e993bf85..abcb0d131b0c 100644
--- a/sys/dev/sound/pci/hda/hdaa_patches.c
+++ b/sys/dev/sound/pci/hda/hdaa_patches.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index ff06e5dd023f..d569e1453c8a 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 213d5a98d47f..0adc6ddce85f 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/hda/hdac_private.h b/sys/dev/sound/pci/hda/hdac_private.h
index 1406f94a8e4f..b8798d7e3b37 100644
--- a/sys/dev/sound/pci/hda/hdac_private.h
+++ b/sys/dev/sound/pci/hda/hdac_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/hdac_reg.h b/sys/dev/sound/pci/hda/hdac_reg.h
index 6ce9f76494ac..893e3d22efa6 100644
--- a/sys/dev/sound/pci/hda/hdac_reg.h
+++ b/sys/dev/sound/pci/hda/hdac_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c
index f7b10d77bb9c..e7c4e012b77b 100644
--- a/sys/dev/sound/pci/hda/hdacc.c
+++ b/sys/dev/sound/pci/hda/hdacc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index c5c70e44d1a3..d84712d4dbe9 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2012 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,14 +83,10 @@ static int
hdspe_hw_mixer(struct sc_chinfo *ch, unsigned int dst,
unsigned int src, unsigned short data)
{
- struct sc_pcminfo *scp;
- struct sc_info *sc;
- int offs;
-
- scp = ch->parent;
- sc = scp->sc;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
+ int offs = 0;
- offs = 0;
if (ch->dir == PCMDIR_PLAY)
offs = 64;
@@ -100,7 +94,7 @@ hdspe_hw_mixer(struct sc_chinfo *ch, unsigned int dst,
((offs + src + 128 * dst) * sizeof(uint32_t)),
data & 0xFFFF);
- return (0);
+ return 0;
};
static int
@@ -112,20 +106,18 @@ hdspechan_setgain(struct sc_chinfo *ch)
hdspe_hw_mixer(ch, ch->rslot, ch->rslot,
ch->rvol * HDSPE_MAX_GAIN / 100);
- return (0);
+ return 0;
}
static int
hdspemixer_init(struct snd_mixer *m)
{
- struct sc_pcminfo *scp;
- struct sc_info *sc;
+ struct sc_pcminfo *scp = mix_getdevinfo(m);
+ struct sc_info *sc = scp->sc;
int mask;
- scp = mix_getdevinfo(m);
- sc = scp->sc;
if (sc == NULL)
- return (-1);
+ return -1;
mask = SOUND_MASK_PCM;
@@ -140,22 +132,20 @@ hdspemixer_init(struct snd_mixer *m)
mix_setdevs(m, mask);
snd_mtxunlock(sc->lock);
- return (0);
+ return 0;
}
static int
hdspemixer_set(struct snd_mixer *m, unsigned dev,
unsigned left, unsigned right)
{
- struct sc_pcminfo *scp;
+ struct sc_pcminfo *scp = mix_getdevinfo(m);
struct sc_chinfo *ch;
int i;
- scp = mix_getdevinfo(m);
-
#if 0
device_printf(scp->dev, "hdspemixer_set() %d %d\n",
- left, right);
+ left,right);
#endif
for (i = 0; i < scp->chnum; i++) {
@@ -169,7 +159,7 @@ hdspemixer_set(struct snd_mixer *m, unsigned dev,
}
}
- return (0);
+ return 0;
}
static kobj_method_t hdspemixer_methods[] = {
@@ -182,13 +172,10 @@ MIXER_DECLARE(hdspemixer);
static void
hdspechan_enable(struct sc_chinfo *ch, int value)
{
- struct sc_pcminfo *scp;
- struct sc_info *sc;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
int reg;
- scp = ch->parent;
- sc = scp->sc;
-
if (ch->dir == PCMDIR_PLAY)
reg = HDSPE_OUT_ENABLE_BASE;
else
@@ -205,10 +192,8 @@ hdspe_running(struct sc_info *sc)
{
struct sc_pcminfo *scp;
struct sc_chinfo *ch;
+ int i, j, devcount, err;
device_t *devlist;
- int devcount;
- int i, j;
- int err;
if ((err = device_get_children(sc->dev, &devlist, &devcount)) != 0)
goto bad;
@@ -223,17 +208,15 @@ hdspe_running(struct sc_info *sc)
}
free(devlist, M_TEMP);
-
- return (0);
+ return 0;
bad:
#if 0
- device_printf(sc->dev, "hdspe is running\n");
+ device_printf(sc->dev,"hdspe is running\n");
#endif
free(devlist, M_TEMP);
-
- return (1);
+ return 1;
}
static void
@@ -259,16 +242,12 @@ hdspe_stop_audio(struct sc_info *sc)
static void
buffer_copy(struct sc_chinfo *ch)
{
- struct sc_pcminfo *scp;
- struct sc_info *sc;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
+ int length,src,dst;
int ssize, dsize;
- int src, dst;
- int length;
int i;
- scp = ch->parent;
- sc = scp->sc;
-
length = sndbuf_getready(ch->buffer) /
(4 /* Bytes per sample. */ * 2 /* channels */);
@@ -310,15 +289,10 @@ buffer_copy(struct sc_chinfo *ch)
}
static int
-clean(struct sc_chinfo *ch)
-{
- struct sc_pcminfo *scp;
- struct sc_info *sc;
- uint32_t *buf;
-
- scp = ch->parent;
- sc = scp->sc;
- buf = sc->rbuf;
+clean(struct sc_chinfo *ch){
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
+ uint32_t *buf = sc->rbuf;
if (ch->dir == PCMDIR_PLAY) {
buf = sc->pbuf;
@@ -327,23 +301,20 @@ clean(struct sc_chinfo *ch)
bzero(buf + HDSPE_CHANBUF_SAMPLES * ch->lslot, HDSPE_CHANBUF_SIZE);
bzero(buf + HDSPE_CHANBUF_SAMPLES * ch->rslot, HDSPE_CHANBUF_SIZE);
- return (0);
+ return 0;
}
/* Channel interface. */
static void *
hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
- struct pcm_channel *c, int dir)
+ struct pcm_channel *c, int dir)
{
- struct sc_pcminfo *scp;
+ struct sc_pcminfo *scp = devinfo;
+ struct sc_info *sc = scp->sc;
struct sc_chinfo *ch;
- struct sc_info *sc;
int num;
- scp = devinfo;
- sc = scp->sc;
-
snd_mtxlock(sc->lock);
num = scp->chnum;
@@ -367,22 +338,18 @@ hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
if (sndbuf_setup(ch->buffer, ch->data, ch->size) != 0) {
device_printf(scp->dev, "Can't setup sndbuf.\n");
- return (NULL);
+ return NULL;
}
- return (ch);
+ return ch;
}
static int
hdspechan_trigger(kobj_t obj, void *data, int go)
{
- struct sc_pcminfo *scp;
- struct sc_chinfo *ch;
- struct sc_info *sc;
-
- ch = data;
- scp = ch->parent;
- sc = scp->sc;
+ struct sc_chinfo *ch = data;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
snd_mtxlock(sc->lock);
switch (go) {
@@ -414,21 +381,17 @@ hdspechan_trigger(kobj_t obj, void *data, int go)
snd_mtxunlock(sc->lock);
- return (0);
+ return 0;
}
static uint32_t
hdspechan_getptr(kobj_t obj, void *data)
{
- struct sc_pcminfo *scp;
- struct sc_chinfo *ch;
- struct sc_info *sc;
+ struct sc_chinfo *ch = data;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
uint32_t ret, pos;
- ch = data;
- scp = ch->parent;
- sc = scp->sc;
-
snd_mtxlock(sc->lock);
ret = hdspe_read_2(sc, HDSPE_STATUS_REG);
snd_mtxunlock(sc->lock);
@@ -436,24 +399,19 @@ hdspechan_getptr(kobj_t obj, void *data)
pos = ret & HDSPE_BUF_POSITION_MASK;
pos *= 2; /* Hardbuf twice bigger. */
- return (pos);
+ return pos;
}
static int
hdspechan_free(kobj_t obj, void *data)
{
- struct sc_pcminfo *scp;
- struct sc_chinfo *ch;
- struct sc_info *sc;
-
- ch = data;
- scp = ch->parent;
- sc = scp->sc;
+ struct sc_chinfo *ch = data;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
#if 0
device_printf(scp->dev, "hdspechan_free()\n");
#endif
-
snd_mtxlock(sc->lock);
if (ch->data != NULL) {
free(ch->data, M_HDSPE);
@@ -461,15 +419,13 @@ hdspechan_free(kobj_t obj, void *data)
}
snd_mtxunlock(sc->lock);
- return (0);
+ return 0;
}
static int
hdspechan_setformat(kobj_t obj, void *data, uint32_t format)
{
- struct sc_chinfo *ch;
-
- ch = data;
+ struct sc_chinfo *ch = data;
#if 0
struct sc_pcminfo *scp = ch->parent;
@@ -478,25 +434,20 @@ hdspechan_setformat(kobj_t obj, void *data, uint32_t format)
ch->format = format;
- return (0);
+ return 0;
}
static uint32_t
hdspechan_setspeed(kobj_t obj, void *data, uint32_t speed)
{
- struct sc_pcminfo *scp;
- struct hdspe_rate *hr;
- struct sc_chinfo *ch;
- struct sc_info *sc;
+ struct sc_chinfo *ch = data;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
+ struct hdspe_rate *hr = NULL;
long long period;
int threshold;
int i;
- ch = data;
- scp = ch->parent;
- sc = scp->sc;
- hr = NULL;
-
#if 0
device_printf(scp->dev, "hdspechan_setspeed(%d)\n", speed);
#endif
@@ -548,25 +499,19 @@ hdspechan_setspeed(kobj_t obj, void *data, uint32_t speed)
sc->speed = hr->speed;
end:
-
- return (sc->speed);
+ return sc->speed;
}
static uint32_t
hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize)
{
- struct hdspe_latency *hl;
- struct sc_pcminfo *scp;
- struct sc_chinfo *ch;
- struct sc_info *sc;
+ struct sc_chinfo *ch = data;
+ struct sc_pcminfo *scp = ch->parent;
+ struct sc_info *sc = scp->sc;
+ struct hdspe_latency *hl = NULL;
int threshold;
int i;
- ch = data;
- scp = ch->parent;
- sc = scp->sc;
- hl = NULL;
-
#if 0
device_printf(scp->dev, "hdspechan_setblocksize(%d)\n", blocksize);
#endif
@@ -613,8 +558,7 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize)
sndbuf_resize(ch->buffer, (HDSPE_CHANBUF_SIZE * 2) / (sc->period * 4),
(sc->period * 4));
end:
-
- return (sndbuf_getblksz(ch->buffer));
+ return sndbuf_getblksz(ch->buffer);
}
static uint32_t hdspe_rfmt[] = {
@@ -634,17 +578,15 @@ static struct pcmchan_caps hdspe_pcaps = {32000, 192000, hdspe_pfmt, 0};
static struct pcmchan_caps *
hdspechan_getcaps(kobj_t obj, void *data)
{
- struct sc_chinfo *ch;
-
- ch = data;
+ struct sc_chinfo *ch = data;
#if 0
struct sc_pcminfo *scl = ch->parent;
device_printf(scp->dev, "hdspechan_getcaps()\n");
#endif
- return ((ch->dir == PCMDIR_PLAY) ?
- &hdspe_pcaps : &hdspe_rcaps);
+ return (ch->dir == PCMDIR_PLAY) ?
+ &hdspe_pcaps : &hdspe_rcaps;
}
static kobj_method_t hdspechan_methods[] = {
@@ -669,18 +611,15 @@ hdspe_pcm_probe(device_t dev)
device_printf(dev,"hdspe_pcm_probe()\n");
#endif
- return (0);
+ return 0;
}
static uint32_t
-hdspe_pcm_intr(struct sc_pcminfo *scp)
-{
+hdspe_pcm_intr(struct sc_pcminfo *scp) {
struct sc_chinfo *ch;
- struct sc_info *sc;
+ struct sc_info *sc = scp->sc;
int i;
- sc = scp->sc;
-
for (i = 0; i < scp->chnum; i++) {
ch = &scp->chan[i];
snd_mtxunlock(sc->lock);
@@ -688,14 +627,14 @@ hdspe_pcm_intr(struct sc_pcminfo *scp)
snd_mtxlock(sc->lock);
}
- return (0);
+ return 0;
}
static int
hdspe_pcm_attach(device_t dev)
{
- char status[SND_STATUSLEN];
struct sc_pcminfo *scp;
+ char status[SND_STATUSLEN];
char desc[64];
int i, err;
@@ -715,7 +654,7 @@ hdspe_pcm_attach(device_t dev)
err = pcm_register(dev, scp, scp->hc->play, scp->hc->rec);
if (err) {
device_printf(dev, "Can't register pcm.\n");
- return (ENXIO);
+ return ENXIO;
}
scp->chnum = 0;
@@ -737,7 +676,7 @@ hdspe_pcm_attach(device_t dev)
mixer_init(dev, &hdspemixer_class, scp);
- return (0);
+ return 0;
}
static int
@@ -748,10 +687,10 @@ hdspe_pcm_detach(device_t dev)
err = pcm_unregister(dev);
if (err) {
device_printf(dev, "Can't unregister device.\n");
- return (err);
+ return err;
}
- return (0);
+ return 0;
}
static device_method_t hdspe_pcm_methods[] = {
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index 6eb0436816a6..06411a1917d1 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2012 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -89,15 +87,11 @@ static struct hdspe_channel chan_map_rd[] = {
static void
hdspe_intr(void *p)
{
+ struct sc_info *sc = (struct sc_info *)p;
struct sc_pcminfo *scp;
- struct sc_info *sc;
device_t *devlist;
- int devcount;
- int status;
- int err;
- int i;
-
- sc = (struct sc_info *)p;
+ int devcount, status;
+ int i, err;
snd_mtxlock(sc->lock);
@@ -122,11 +116,8 @@ hdspe_intr(void *p)
static void
hdspe_dmapsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
- struct sc_info *sc;
-
- sc = (struct sc_info *)arg;
-
#if 0
+ struct sc_info *sc = (struct sc_info *)arg;
device_printf(sc->dev, "hdspe_dmapsetmap()\n");
#endif
}
@@ -144,10 +135,10 @@ hdspe_alloc_resources(struct sc_info *sc)
device_printf(sc->dev, "Unable to map SYS_RES_MEMORY.\n");
return (ENXIO);
}
-
sc->cst = rman_get_bustag(sc->cs);
sc->csh = rman_get_bushandle(sc->cs);
+
/* Allocate interrupt resource. */
sc->irqid = 0;
sc->irq = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &sc->irqid,
@@ -216,7 +207,7 @@ hdspe_alloc_resources(struct sc_info *sc)
static void
hdspe_map_dmabuf(struct sc_info *sc)
{
- uint32_t paddr, raddr;
+ uint32_t paddr,raddr;
int i;
paddr = vtophys(sc->pbuf);
@@ -241,10 +232,10 @@ hdspe_probe(device_t dev)
switch (rev) {
case PCI_REVISION_AIO:
device_set_desc(dev, "RME HDSPe AIO");
- return (0);
+ return 0;
case PCI_REVISION_RAYDAT:
device_set_desc(dev, "RME HDSPe RayDAT");
- return (0);
+ return 0;
}
}
@@ -286,15 +277,15 @@ hdspe_init(struct sc_info *sc)
sc->settings_register = 0;
hdspe_write_4(sc, HDSPE_SETTINGS_REG, sc->settings_register);
- return (0);
+ return 0;
}
static int
hdspe_attach(device_t dev)
{
- struct hdspe_channel *chan_map;
- struct sc_pcminfo *scp;
struct sc_info *sc;
+ struct sc_pcminfo *scp;
+ struct hdspe_channel *chan_map;
uint32_t rev;
int i, err;
@@ -319,18 +310,18 @@ hdspe_attach(device_t dev)
chan_map = chan_map_rd;
break;
default:
- return (ENXIO);
+ return ENXIO;
}
/* Allocate resources. */
err = hdspe_alloc_resources(sc);
if (err) {
device_printf(dev, "Unable to allocate system resources.\n");
- return (ENXIO);
+ return ENXIO;
}
if (hdspe_init(sc) != 0)
- return (ENXIO);
+ return ENXIO;
for (i = 0; i < HDSPE_MAX_CHANS && chan_map[i].descr != NULL; i++) {
scp = malloc(sizeof(struct sc_pcminfo), M_DEVBUF, M_NOWAIT | M_ZERO);
@@ -365,7 +356,7 @@ hdspe_detach(device_t dev)
sc = device_get_softc(dev);
if (sc == NULL) {
device_printf(dev,"Can't detach: softc is null.\n");
- return (0);
+ return 0;
}
err = device_delete_children(dev);
@@ -385,7 +376,7 @@ hdspe_detach(device_t dev)
if (sc->lock)
snd_mtxfree(sc->lock);
- return (0);
+ return 0;
}
static device_method_t hdspe_methods[] = {
diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h
index 2fbff2adcc65..c2654c8f4925 100644
--- a/sys/dev/sound/pci/hdspe.h
+++ b/sys/dev/sound/pci/hdspe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 03af77aca0a4..61b6781662bc 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index 89cbd49d90a7..be3f3fca3b4a 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 20f40e3c444e..fbadf3b3f7bb 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2004 Taku YAMAMOTO <taku@tackymt.homeip.net>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index d530d0db1c85..5bab021fdf1a 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Scott Long <scottl@freebsd.org>
* Copyright (c) 2001 Darrell Anderson <anderson@cs.duke.edu>
* All rights reserved.
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index 7db2127f9509..ab3542368484 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index b7fc1ade8d3e..2fec6427ae14 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 5e3805645cf2..e2db543be3a6 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 78257c3059e5..0b87f99cbf97 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index abaf74be459c..75d1ad41ff47 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/pci/spicds.c b/sys/dev/sound/pci/spicds.c
index 23a24461a069..1e7e60020c30 100644
--- a/sys/dev/sound/pci/spicds.c
+++ b/sys/dev/sound/pci/spicds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/spicds.h b/sys/dev/sound/pci/spicds.h
index a8bbbb3919b8..f98bf93d804f 100644
--- a/sys/dev/sound/pci/spicds.h
+++ b/sys/dev/sound/pci/spicds.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index a7c5cd2be6b9..6530b5b685fa 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index bdab0be534e3..4a2ec626c508 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 217d61e91e0a..2bd54e4cb296 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* Portions of this code derived from via82c686.c:
* Copyright (c) 2000 David Jones <dej@ox.org>
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index 774f946db6be..a38afc96255c 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 88f92d1277ab..4c4a4120dd06 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 David Jones <dej@ox.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h
index 02af2d38937d..43dcb4131305 100644
--- a/sys/dev/sound/pci/via82c686.h
+++ b/sys/dev/sound/pci/via82c686.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index a46efb061a8f..22c84c8128a2 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index 37230720be91..d1eac407efbe 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 70316c34b72b..bc36948c9fe9 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 4789448d2822..3112cc0d474e 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index a88d54b82504..e5ae55c1494b 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Orion Hodson
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index dbcc309a49cc..c8df443e3627 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Orion Hodson
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index b86b67e44344..cd59a355163b 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 74a684b9a4ac..8cee01237ad3 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index ecf89df4c9a2..83ec6c1e729c 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index cd6e14d39075..45f43b55498b 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 314329de022f..5b92963375f4 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index d46334a1052c..5a0880a6acd0 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 7b15c00c4170..720f6763147b 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index dd73b050b7a1..88e35d2c20f1 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
index 73922ab55396..308d5f2e8b61 100644
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c
index 4c3cf0f14de3..f71e7956ef68 100644
--- a/sys/dev/sound/pcm/feeder_eq.c
+++ b/sys/dev/sound/pcm/feeder_eq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c
index 354c7e51df63..f6a4c937a782 100644
--- a/sys/dev/sound/pcm/feeder_format.c
+++ b/sys/dev/sound/pcm/feeder_format.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c
index 5e2bdbcb8471..5274ed46b79b 100644
--- a/sys/dev/sound/pcm/feeder_matrix.c
+++ b/sys/dev/sound/pcm/feeder_matrix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
index b2a173a65485..8e6ba27f77a5 100644
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 35622d84d26a..da6c1be2969d 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index 322d7f6b2c84..1bd3789bcd53 100644
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h
index 039f5692bfbc..49d7636e5489 100644
--- a/sys/dev/sound/pcm/g711.h
+++ b/sys/dev/sound/pcm/g711.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/intpcm.h b/sys/dev/sound/pcm/intpcm.h
index f7574718f8c8..99a7335362e8 100644
--- a/sys/dev/sound/pcm/intpcm.h
+++ b/sys/dev/sound/pcm/intpcm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h
index 5a489a37c635..6ff1074ade52 100644
--- a/sys/dev/sound/pcm/matrix.h
+++ b/sys/dev/sound/pcm/matrix.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/matrix_map.h b/sys/dev/sound/pcm/matrix_map.h
index 0d239c555449..ff79e958a444 100644
--- a/sys/dev/sound/pcm/matrix_map.h
+++ b/sys/dev/sound/pcm/matrix_map.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 15c12c1a782f..0e651f47fa2c 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 1100e3aceda0..0fb2e914433b 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h
index 15119fe16d95..a3a4ec385c7a 100644
--- a/sys/dev/sound/pcm/pcm.h
+++ b/sys/dev/sound/pcm/pcm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 0237c8e3311c..e0cb5df13fc1 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/sndstat.h b/sys/dev/sound/pcm/sndstat.h
index 026b37722449..0bdb96ac01fa 100644
--- a/sys/dev/sound/pcm/sndstat.h
+++ b/sys/dev/sound/pcm/sndstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 378cf085e4b8..44b77ee4e7ee 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index da355bf7ff33..2897aed18508 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
* Copyright (c) 1995 Hannu Savolainen
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index d8e3509d0ebd..e561bb710d8f 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index 44e666249219..04c2b4fd39e6 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/sbus/apcdmareg.h b/sys/dev/sound/sbus/apcdmareg.h
index 719da7d09d12..d4296adbe9fe 100644
--- a/sys/dev/sound/sbus/apcdmareg.h
+++ b/sys/dev/sound/sbus/apcdmareg.h
@@ -2,8 +2,6 @@
/* $OpenBSD: apcdmareg.h,v 1.2 2003/06/02 18:53:18 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c
index ffa4845d87e2..83f70f3a4813 100644
--- a/sys/dev/sound/sbus/cs4231.c
+++ b/sys/dev/sound/sbus/cs4231.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
* Copyright (c) 2004 Pyun YongHyeon
* All rights reserved.
diff --git a/sys/dev/sound/sbus/cs4231.h b/sys/dev/sound/sbus/cs4231.h
index 717e7792712e..d1e9185d31c6 100644
--- a/sys/dev/sound/sbus/cs4231.h
+++ b/sys/dev/sound/sbus/cs4231.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c
index c95d8db227fc..f263e042c4a2 100644
--- a/sys/dev/sound/unit.c
+++ b/sys/dev/sound/unit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/unit.h b/sys/dev/sound/unit.h
index fb7a85612456..e49e8f8e9bb1 100644
--- a/sys/dev/sound/unit.h
+++ b/sys/dev/sound/unit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 5de4038d297e..ac83d65f5a42 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index a3641e2178d1..2d9a87568b48 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 6bcbe6c2a52a..10e8cc430f90 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
* Copyright (c) 2006 Hans Petter Selasky
*
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index fd395ac8605e..637b5b1c0f23 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/version.h b/sys/dev/sound/version.h
index c36bc1a2d353..6dee6a2ca02e 100644
--- a/sys/dev/sound/version.h
+++ b/sys/dev/sound/version.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/spibus/ofw_spibus.c b/sys/dev/spibus/ofw_spibus.c
index d99cf095af23..c89db2cf9949 100644
--- a/sys/dev/spibus/ofw_spibus.c
+++ b/sys/dev/spibus/ofw_spibus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
@@ -82,7 +80,6 @@ ofw_spibus_attach(device_t dev)
phandle_t child;
pcell_t clock, paddr;
device_t childdev;
- uint32_t mode = SPIBUS_MODE_NONE;
sc->dev = dev;
@@ -106,24 +103,6 @@ ofw_spibus_attach(device_t dev)
}
/*
- * Try to get the cpol/cpha mode
- */
- if (OF_hasprop(child, "spi-cpol"))
- mode = SPIBUS_MODE_CPOL;
- if (OF_hasprop(child, "spi-cpha")) {
- if (mode == SPIBUS_MODE_CPOL)
- mode = SPIBUS_MODE_CPOL_CPHA;
- else
- mode = SPIBUS_MODE_CPHA;
- }
-
- /*
- * Try to get the CS polarity
- */
- if (OF_hasprop(child, "spi-cs-high"))
- paddr |= SPIBUS_CS_HIGH;
-
- /*
* Get the maximum clock frequency for device, zero means
* use the default bus speed.
*/
@@ -141,7 +120,6 @@ ofw_spibus_attach(device_t dev)
continue;
dinfo->opd_dinfo.cs = paddr;
dinfo->opd_dinfo.clock = clock;
- dinfo->opd_dinfo.mode = mode;
if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
0) {
free(dinfo, M_DEVBUF);
@@ -214,10 +192,10 @@ static device_method_t ofw_spibus_methods[] = {
DEVMETHOD_END
};
-devclass_t ofw_spibus_devclass;
+static devclass_t ofwspibus_devclass;
DEFINE_CLASS_1(spibus, ofw_spibus_driver, ofw_spibus_methods,
sizeof(struct spibus_softc), spibus_driver);
-DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, ofw_spibus_devclass, 0, 0);
+DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, ofwspibus_devclass, 0, 0);
MODULE_VERSION(ofw_spibus, 1);
MODULE_DEPEND(ofw_spibus, spibus, 1, 1, 1);
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
index 0005615a6304..e6cffb3d23b2 100644
--- a/sys/dev/ste/if_ste.c
+++ b/sys/dev/ste/if_ste.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ste/if_stereg.h b/sys/dev/ste/if_stereg.h
index a27cb0a89a25..e3aa51bff266 100644
--- a/sys/dev/ste/if_stereg.h
+++ b/sys/dev/ste/if_stereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index add97a571373..4479fa29de5b 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -6,8 +6,6 @@
#define STG_IO_CONTROL_FLAGS (STG_FIFO_INTERRUPTS | STG_WAIT_FOR_SELECT)
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 242db310fd89..e44a8b0e4df0 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -2,8 +2,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 4b665b9308c4..a172d52067b6 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -2,8 +2,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c
index 5d82a45b5c33..0ff2e62212a2 100644
--- a/sys/dev/stg/tmc18c30_pci.c
+++ b/sys/dev/stg/tmc18c30_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Bob Bishop
* All rights reserved.
* [Ported for FreeBSD]
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index 7444f4d6fc9d..98cf1b424096 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 599dbf5a2c88..93c9940ba649 100644
--- a/sys/dev/stg/tmc18c30reg.h
+++ b/sys/dev/stg/tmc18c30reg.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index c7d1b163cca1..06a454b8e776 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -3,8 +3,6 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index 4a4fb1ac74df..1ebb05d895ba 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_stge.c,v 1.32 2005/12/11 12:22:49 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/stge/if_stgereg.h b/sys/dev/stge/if_stgereg.h
index 9082a2c0793c..f14142a38beb 100644
--- a/sys/dev/stge/if_stgereg.h
+++ b/sys/dev/stge/if_stgereg.h
@@ -1,8 +1,6 @@
/* $NetBSD: if_stgereg.h,v 1.3 2003/02/10 21:10:07 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 135b0e85992f..b1b2102a9a31 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index db0768b0e6c9..483350439b15 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index ce97c9252c29..2c349ca5270a 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index cab8c979cd05..4d0e99cd86bc 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 5858fa9ed542..b14ee83fe324 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 31140050f876..a9c2070aeec6 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/syscons/apm/apm_saver.c b/sys/dev/syscons/apm/apm_saver.c
index efecf7327a38..567b452e0b2e 100644
--- a/sys/dev/syscons/apm/apm_saver.c
+++ b/sys/dev/syscons/apm/apm_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Nick Sayer (who stole shamelessly from blank_saver)
* All rights reserved.
*
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 93a05226eecd..38ce540b43ab 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index e453fe538c17..1a92ff9afef1 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
* Copyright (c) 1997 Chris Shenton
* Copyright (c) 1995 Søren Schmidt
diff --git a/sys/dev/syscons/dragon/dragon_saver.c b/sys/dev/syscons/dragon/dragon_saver.c
index 96f6a740db7e..6294daa77615 100644
--- a/sys/dev/syscons/dragon/dragon_saver.c
+++ b/sys/dev/syscons/dragon/dragon_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Chiharu Shibata
* All rights reserved.
*
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 222a1139f0fd..0bcc9e8ac7d3 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index 3b777d48ac81..4c995efcd640 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Brad Forschinger
* All rights reserved.
*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 8dbd8e9e99e7..792a561ed413 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index e5125441804d..5828d7e44bd6 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 03363e576a8f..ff2892416b97 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 190da5254546..9889ee546712 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 8da242c8a9f8..be4998377f5c 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* Copyright (c) 1992-1998 Søren Schmidt
* All rights reserved.
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 97f4dc7f7b15..db26787c264e 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c
index 81b1fc93114b..d44dd8983c20 100644
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 1a66f3fa763f..f0f56b5475a6 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 74e7428eefb3..b896484bb76e 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 0a04cba9a220..d36fa8ad625d 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 2ca2e375e90f..6ae923dfe291 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 44b667b8ab82..8d2b224b36dd 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index af2d2c315536..15f8edde4350 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 631a2dca7347..56bfc011eb50 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 266b36e84386..a6ca467750f0 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 4442738a4c80..06236ab8987d 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1998 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 8174dd95223d..8ea0939eb575 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index 3355e9f9f654..a800118774aa 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_io.h b/sys/dev/tdfx/tdfx_io.h
index ced08f3e8a44..faec61e11771 100644
--- a/sys/dev/tdfx/tdfx_io.h
+++ b/sys/dev/tdfx/tdfx_io.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c
index e20763b37647..8a6399ff5604 100644
--- a/sys/dev/tdfx/tdfx_linux.c
+++ b/sys/dev/tdfx/tdfx_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 The FreeBSD Project
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index 4a29e5a8dc11..a3235cc8ba02 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 4156e23b88d6..be423751ca35 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_pci.h b/sys/dev/tdfx/tdfx_pci.h
index 9998d9e82046..0c60e5a2b6c1 100644
--- a/sys/dev/tdfx/tdfx_pci.h
+++ b/sys/dev/tdfx/tdfx_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index 6eda3797a2cb..1e10e3c3a669 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/terasic/de4led/terasic_de4led.c b/sys/dev/terasic/de4led/terasic_de4led.c
index ee99bd541233..bcef7aff8bd3 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.c
+++ b/sys/dev/terasic/de4led/terasic_de4led.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/de4led/terasic_de4led.h b/sys/dev/terasic/de4led/terasic_de4led.h
index 873a531ff3e1..4475e9b3b91a 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.h
+++ b/sys/dev/terasic/de4led/terasic_de4led.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/de4led/terasic_de4led_fdt.c b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
index d8473f7d0fbf..feab93342d7d 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_fdt.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/de4led/terasic_de4led_nexus.c b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
index 33ea2377cc03..a8eb5f1af0d2 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_nexus.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl.c b/sys/dev/terasic/mtl/terasic_mtl.c
index 10e3b413ca96..2a0744bce197 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.c
+++ b/sys/dev/terasic/mtl/terasic_mtl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl.h b/sys/dev/terasic/mtl/terasic_mtl.h
index 2ab6de00b7a0..f03e6f05cb80 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.h
+++ b/sys/dev/terasic/mtl/terasic_mtl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_fdt.c b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
index d6b198ee0b9c..e592521fe8ed 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_fdt.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012-2013 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_nexus.c b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
index dd136be4870a..e88dc06bf686 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_nexus.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_pixel.c b/sys/dev/terasic/mtl/terasic_mtl_pixel.c
index a4e4735f6da0..a7cbbde2c4af 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_pixel.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_pixel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_reg.c b/sys/dev/terasic/mtl/terasic_mtl_reg.c
index 8fe4855ef907..e5bac611dec7 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_reg.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_reg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_syscons.c b/sys/dev/terasic/mtl/terasic_mtl_syscons.c
index 18d4f980aa4f..97d989161f91 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_syscons.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_syscons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/terasic/mtl/terasic_mtl_text.c b/sys/dev/terasic/mtl/terasic_mtl_text.c
index b437702ce2ee..905e62f25ca9 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_text.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_text.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index c966302c7136..421f5fd16145 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index a6b358bc1ea9..d55e1507fff0 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c
index 70c1d17ec3fc..5d218e794f5e 100644
--- a/sys/dev/tl/if_tl.c
+++ b/sys/dev/tl/if_tl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/tl/if_tlreg.h b/sys/dev/tl/if_tlreg.h
index 51fb6820bd8e..4a82cc5d9727 100644
--- a/sys/dev/tl/if_tlreg.h
+++ b/sys/dev/tl/if_tlreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 484b14965fc6..5374807f2c11 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -27,8 +27,6 @@ __FBSDID("$FreeBSD$");
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* (C)Copyright 1995-2001 Tekram Technology Co.,Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index e1f629a63285..f72335ae2398 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.h
@@ -5,8 +5,6 @@
* PCI SCSI Bus Master Host Adapter Device Driver
* (SCSI chip set used Tekram ASIC TRM-S1040)
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* (C)Copyright 1995-2001 Tekram Technology Co.,Ltd.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
index 9950f8e895ed..3fd872659f50 100644
--- a/sys/dev/tsec/if_tsec.c
+++ b/sys/dev/tsec/if_tsec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
* All rights reserved.
diff --git a/sys/dev/tsec/if_tsec.h b/sys/dev/tsec/if_tsec.h
index ae0a7330779f..d13f46398b06 100644
--- a/sys/dev/tsec/if_tsec.h
+++ b/sys/dev/tsec/if_tsec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
* All rights reserved.
*
diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c
index cfad15b533cf..7f25a42e1624 100644
--- a/sys/dev/tsec/if_tsec_fdt.c
+++ b/sys/dev/tsec/if_tsec_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
* All rights reserved.
diff --git a/sys/dev/tsec/if_tsecreg.h b/sys/dev/tsec/if_tsecreg.h
index 18a81df71432..1994298cd534 100644
--- a/sys/dev/tsec/if_tsecreg.h
+++ b/sys/dev/tsec/if_tsecreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl.h b/sys/dev/twa/tw_cl.h
index 82aba006ea7e..ab1936d73021 100644
--- a/sys/dev/twa/tw_cl.h
+++ b/sys/dev/twa/tw_cl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_externs.h b/sys/dev/twa/tw_cl_externs.h
index 1c5a313f03f4..9fd2a3280b9f 100644
--- a/sys/dev/twa/tw_cl_externs.h
+++ b/sys/dev/twa/tw_cl_externs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_fwif.h b/sys/dev/twa/tw_cl_fwif.h
index 2e3f9048a6f6..52f76bfeab14 100644
--- a/sys/dev/twa/tw_cl_fwif.h
+++ b/sys/dev/twa/tw_cl_fwif.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_init.c b/sys/dev/twa/tw_cl_init.c
index 29ed60e58b7d..a39da75b7ffd 100644
--- a/sys/dev/twa/tw_cl_init.c
+++ b/sys/dev/twa/tw_cl_init.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_intr.c b/sys/dev/twa/tw_cl_intr.c
index aa89f79d92a9..a7c90d39555f 100644
--- a/sys/dev/twa/tw_cl_intr.c
+++ b/sys/dev/twa/tw_cl_intr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_io.c b/sys/dev/twa/tw_cl_io.c
index 77d69a3a37c4..1e1ca6cd676d 100644
--- a/sys/dev/twa/tw_cl_io.c
+++ b/sys/dev/twa/tw_cl_io.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_ioctl.h b/sys/dev/twa/tw_cl_ioctl.h
index 6c10b0bcefa1..aab7fd958154 100644
--- a/sys/dev/twa/tw_cl_ioctl.h
+++ b/sys/dev/twa/tw_cl_ioctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_misc.c b/sys/dev/twa/tw_cl_misc.c
index 4a0c5f3839ea..b0bf8e4aa272 100644
--- a/sys/dev/twa/tw_cl_misc.c
+++ b/sys/dev/twa/tw_cl_misc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_cl_share.h b/sys/dev/twa/tw_cl_share.h
index 087e8022f939..727684984c56 100644
--- a/sys/dev/twa/tw_cl_share.h
+++ b/sys/dev/twa/tw_cl_share.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl.h b/sys/dev/twa/tw_osl.h
index 27289fc0de1e..bed16cda68ff 100644
--- a/sys/dev/twa/tw_osl.h
+++ b/sys/dev/twa/tw_osl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index 62a47874509f..699c0f468eab 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_externs.h b/sys/dev/twa/tw_osl_externs.h
index bd8250312c5e..08963e5b2f7b 100644
--- a/sys/dev/twa/tw_osl_externs.h
+++ b/sys/dev/twa/tw_osl_externs.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index 71cfdf0e6a21..1bb7574c0820 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* Copyright (c) 2000 Michael Smith
diff --git a/sys/dev/twa/tw_osl_includes.h b/sys/dev/twa/tw_osl_includes.h
index 06b69f1a95b4..21f662e9dd3b 100644
--- a/sys/dev/twa/tw_osl_includes.h
+++ b/sys/dev/twa/tw_osl_includes.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_inline.h b/sys/dev/twa/tw_osl_inline.h
index 43fe0c72772e..74d100d9636f 100644
--- a/sys/dev/twa/tw_osl_inline.h
+++ b/sys/dev/twa/tw_osl_inline.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_ioctl.h b/sys/dev/twa/tw_osl_ioctl.h
index 3d26cbb642da..10066a71288d 100644
--- a/sys/dev/twa/tw_osl_ioctl.h
+++ b/sys/dev/twa/tw_osl_ioctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_share.h b/sys/dev/twa/tw_osl_share.h
index 13f2a62eba7f..c17d8cc28b51 100644
--- a/sys/dev/twa/tw_osl_share.h
+++ b/sys/dev/twa/tw_osl_share.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twa/tw_osl_types.h b/sys/dev/twa/tw_osl_types.h
index 913aca0ccf9a..7fcfd4ca7515 100644
--- a/sys/dev/twa/tw_osl_types.h
+++ b/sys/dev/twa/tw_osl_types.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
* All rights reserved.
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 1419d4ffa836..cdb218032f10 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 51d021657012..ae6d501ef7bc 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 99c944ee077c..ea9a1f18a25a 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 408dcebe717a..3ba83c972c4b 100644
--- a/sys/dev/twe/twe_tables.h
+++ b/sys/dev/twe/twe_tables.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/tweio.h b/sys/dev/twe/tweio.h
index 5946360073d6..1b78472495ab 100644
--- a/sys/dev/twe/tweio.h
+++ b/sys/dev/twe/tweio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index 5397ad92e7d8..f6e7db6e1a03 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
* Copyright (c) 2003 Vinod Kashyap
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index 9512f7921e15..616f12b89ca5 100644
--- a/sys/dev/twe/twevar.h
+++ b/sys/dev/twe/twevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c
index 54985b40cb36..bf9e143c72f5 100644
--- a/sys/dev/tws/tws.c
+++ b/sys/dev/tws/tws.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws.h b/sys/dev/tws/tws.h
index 5ed3fadb4a05..0af50c4f425d 100644
--- a/sys/dev/tws/tws.h
+++ b/sys/dev/tws/tws.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_cam.c b/sys/dev/tws/tws_cam.c
index f948af092819..7475152c3926 100644
--- a/sys/dev/tws/tws_cam.c
+++ b/sys/dev/tws/tws_cam.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah <manjunath.ranganathaiah@lsi.com>
diff --git a/sys/dev/tws/tws_hdm.c b/sys/dev/tws/tws_hdm.c
index d6671d9f1a62..83d5a50b812d 100644
--- a/sys/dev/tws/tws_hdm.c
+++ b/sys/dev/tws/tws_hdm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_hdm.h b/sys/dev/tws/tws_hdm.h
index 76d14bb3c9f4..5cacf19b9326 100644
--- a/sys/dev/tws/tws_hdm.h
+++ b/sys/dev/tws/tws_hdm.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_services.c b/sys/dev/tws/tws_services.c
index db1e9e002c25..243585b6b223 100644
--- a/sys/dev/tws/tws_services.c
+++ b/sys/dev/tws/tws_services.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_services.h b/sys/dev/tws/tws_services.h
index 9fa3c3799994..f9016daa64ee 100644
--- a/sys/dev/tws/tws_services.h
+++ b/sys/dev/tws/tws_services.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_user.c b/sys/dev/tws/tws_user.c
index a3970f0af408..5c93a4b93f78 100644
--- a/sys/dev/tws/tws_user.c
+++ b/sys/dev/tws/tws_user.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tws/tws_user.h b/sys/dev/tws/tws_user.h
index 96410f68f2f2..5ae29bc2d2da 100644
--- a/sys/dev/tws/tws_user.h
+++ b/sys/dev/tws/tws_user.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2010, LSI Corp.
* All rights reserved.
* Author : Manjunath Ranganathaiah
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index e1af1acc325f..72a4c08958bb 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Semen Ustimenko (semenu@FreeBSD.org)
* All rights reserved.
*
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 3905104be819..059c2c049153 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Semen Ustimenko
* All rights reserved.
*
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 00fdee6edffd..1a6d766976fc 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Semen Ustimenko
* All rights reserved.
*
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index 6cdc49ceffba..0667aaea2ee6 100644
--- a/sys/dev/txp/3c990img.h
+++ b/sys/dev/txp/3c990img.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 1999-2003 3Com Corporation. All Rights Reserved.
*
* Redistribution and use in source and binary forms of the 3c990img.h
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 7511269c5fa2..8f63f19bc59f 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -1,8 +1,6 @@
/* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001
* Jason L. Wright <jason@thought.net>, Theo de Raadt, and
* Aaron Campbell <aaron@monkey.org>. All rights reserved.
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index 6dec2a05105c..0937deb2fe3b 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
* All rights reserved.
*
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index ebaf77e7c2ac..c40846b758de 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index 8a55eefa136d..d46c28dd4e53 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 3749e8ecb8a1..018e6b91d736 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/uart/uart_bus_ebus.c b/sys/dev/uart/uart_bus_ebus.c
index 827981a41164..c79c91e908ef 100644
--- a/sys/dev/uart/uart_bus_ebus.c
+++ b/sys/dev/uart/uart_bus_ebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index 70ade3530a94..faea2cfb32e5 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 85c4a891655d..af9b0f10a39b 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 TAKAHASHI Yoshihiro
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2001 M. Warner Losh
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index 7e92637d1783..edd3f29f25d2 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
* Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 535b03165794..c2d22afa1972 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* Copyright (c) 2001 M. Warner Losh
* All rights reserved.
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index 23ee72815b33..dff35b30dee5 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar. All rights reserved.
* Copyright (c) 2002 JF Hay. All rights reserved.
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
diff --git a/sys/dev/uart/uart_bus_scc.c b/sys/dev/uart/uart_bus_scc.c
index d56b1ee5078f..07808e6cd3dc 100644
--- a/sys/dev/uart/uart_bus_scc.c
+++ b/sys/dev/uart/uart_bus_scc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index 800f5f5f6f85..9650dd501e68 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index 7eebc0fc5213..d9e5410eacec 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c
index e73dafa59ef3..4e5ff43cdb51 100644
--- a/sys/dev/uart/uart_cpu_fdt.c
+++ b/sys/dev/uart/uart_cpu_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index f1dac960765b..d3155b08c54f 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index 17a2ca84bb6c..6cbfbe20858c 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, 2004 Marcel Moolenaar
* Copyright (c) 2004 - 2006 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/uart/uart_cpu_x86.c b/sys/dev/uart/uart_cpu_x86.c
index 5b28df144fe8..ce9cf7d61f1c 100644
--- a/sys/dev/uart/uart_cpu_x86.c
+++ b/sys/dev/uart/uart_cpu_x86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index ece433b4695c..e2c7831244b1 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index 35d6788f0c23..bc25df37f2d1 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_lpc.c b/sys/dev/uart/uart_dev_lpc.c
index d74e1889f8da..48d7be3d02db 100644
--- a/sys/dev/uart/uart_dev_lpc.c
+++ b/sys/dev/uart/uart_dev_lpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 9b6486cd2683..cad5366fdc29 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_ns8250.h b/sys/dev/uart/uart_dev_ns8250.h
index 906d920e205d..0046dfefd875 100644
--- a/sys/dev/uart/uart_dev_ns8250.h
+++ b/sys/dev/uart/uart_dev_ns8250.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
index fa148d72099a..e90e7f8d4e74 100644
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c
index 835f9fe56c52..0237d6402ee1 100644
--- a/sys/dev/uart/uart_dev_quicc.c
+++ b/sys/dev/uart/uart_dev_quicc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Juniper Networks
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 9cf41be5d7ab..59a963924953 100644
--- a/sys/dev/uart/uart_dev_sab82532.c
+++ b/sys/dev/uart/uart_dev_sab82532.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_ti8250.c b/sys/dev/uart/uart_dev_ti8250.c
index f5a230908da3..e82dbb7e2904 100644
--- a/sys/dev/uart/uart_dev_ti8250.c
+++ b/sys/dev/uart/uart_dev_ti8250.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ian Lepore
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index e57ae525ffd9..5bacd4012e0c 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 9cc15452f1aa..cf5cd5bb91dd 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 05a4597930f9..84b55536b6e3 100644
--- a/sys/dev/uart/uart_kbd_sun.h
+++ b/sys/dev/uart/uart_kbd_sun.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index dcdaf9f1929c..f3dc50ceb26c 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 7eaf2f7745c2..27ceb5b19343 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 94c7b0506045..53e3ef8d4e2e 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1,8 +1,6 @@
/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
* Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 57533ae6d335..f78dc450f4cd 100644
--- a/sys/dev/ubsec/ubsecreg.h
+++ b/sys/dev/ubsec/ubsecreg.h
@@ -2,8 +2,6 @@
/* $OpenBSD: ubsecreg.h,v 1.27 2002/09/11 22:40:31 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Theo de Raadt
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
*
diff --git a/sys/dev/ubsec/ubsecvar.h b/sys/dev/ubsec/ubsecvar.h
index acbf32a29736..4a9fa0bfd355 100644
--- a/sys/dev/ubsec/ubsecvar.h
+++ b/sys/dev/ubsec/ubsecvar.h
@@ -2,8 +2,6 @@
/* $OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Theo de Raadt
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
*
diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c
index 010f58589813..169595cd7412 100644
--- a/sys/dev/usb/controller/at91dci.c
+++ b/sys/dev/usb/controller/at91dci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/at91dci.h b/sys/dev/usb/controller/at91dci.h
index ac504c9b1021..964e062f670b 100644
--- a/sys/dev/usb/controller/at91dci.h
+++ b/sys/dev/usb/controller/at91dci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 ATMEL
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c
index 5aa51884a6e1..0dc1f9f19294 100644
--- a/sys/dev/usb/controller/at91dci_atmelarm.c
+++ b/sys/dev/usb/controller/at91dci_atmelarm.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/at91dci_fdt.c b/sys/dev/usb/controller/at91dci_fdt.c
index 384114e0face..431b502bd252 100644
--- a/sys/dev/usb/controller/at91dci_fdt.c
+++ b/sys/dev/usb/controller/at91dci_fdt.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index 8bc27fb51ae5..8afdc92431c2 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/atmegadci.h b/sys/dev/usb/controller/atmegadci.h
index 38e2e5322931..91ba030661f9 100644
--- a/sys/dev/usb/controller/atmegadci.h
+++ b/sys/dev/usb/controller/atmegadci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c
index 4a85d82a3e75..d89ba8b70bcf 100644
--- a/sys/dev/usb/controller/atmegadci_atmelarm.c
+++ b/sys/dev/usb/controller/atmegadci_atmelarm.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/avr32dci.c b/sys/dev/usb/controller/avr32dci.c
index b8c22a6ab01f..f5456f41eff3 100644
--- a/sys/dev/usb/controller/avr32dci.c
+++ b/sys/dev/usb/controller/avr32dci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/avr32dci.h b/sys/dev/usb/controller/avr32dci.h
index b46893b390f6..2d80344fd485 100644
--- a/sys/dev/usb/controller/avr32dci.h
+++ b/sys/dev/usb/controller/avr32dci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/dwc_otg.c b/sys/dev/usb/controller/dwc_otg.c
index b649d31d0c2e..5560f070dc96 100644
--- a/sys/dev/usb/controller/dwc_otg.c
+++ b/sys/dev/usb/controller/dwc_otg.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015 Daisuke Aoyama. All rights reserved.
* Copyright (c) 2012-2015 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2010-2011 Aleksandr Rybalko. All rights reserved.
diff --git a/sys/dev/usb/controller/dwc_otg.h b/sys/dev/usb/controller/dwc_otg.h
index 9d0b0eea77cd..038b072aeef7 100644
--- a/sys/dev/usb/controller/dwc_otg.h
+++ b/sys/dev/usb/controller/dwc_otg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c
index fd9a42bd6495..80d3388050ff 100644
--- a/sys/dev/usb/controller/dwc_otg_fdt.c
+++ b/sys/dev/usb/controller/dwc_otg_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/dwc_otgreg.h b/sys/dev/usb/controller/dwc_otgreg.h
index 3c50ca58a6dc..8b9538aef0be 100644
--- a/sys/dev/usb/controller/dwc_otgreg.h
+++ b/sys/dev/usb/controller/dwc_otgreg.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index 4229d96ab204..e7c85a18d279 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2004 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 2004 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h
index 9d460e6f9f74..0d1e19a39e52 100644
--- a/sys/dev/usb/controller/ehci.h
+++ b/sys/dev/usb/controller/ehci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c
index 525a2c49a8c3..a877d5ea5fd1 100644
--- a/sys/dev/usb/controller/ehci_fsl.c
+++ b/sys/dev/usb/controller/ehci_fsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c
index 20d040845243..7e7a57d4014a 100644
--- a/sys/dev/usb/controller/ehci_imx.c
+++ b/sys/dev/usb/controller/ehci_imx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c
index 52d45a33b0bd..02554ecf1d40 100644
--- a/sys/dev/usb/controller/ehci_ixp4xx.c
+++ b/sys/dev/usb/controller/ehci_ixp4xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c
index 0c898f488c01..f433b4be9c55 100644
--- a/sys/dev/usb/controller/ehci_mv.c
+++ b/sys/dev/usb/controller/ehci_mv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c
index 61efbee453c4..49f00c732ffc 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ehcireg.h b/sys/dev/usb/controller/ehcireg.h
index 81939e203df8..2394b2c17c9a 100644
--- a/sys/dev/usb/controller/ehcireg.h
+++ b/sys/dev/usb/controller/ehcireg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index d2dea9fcbaa9..c7bc8b3fdfd6 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/musb_otg.h b/sys/dev/usb/controller/musb_otg.h
index 55ab7aa6c646..7fe19a7ce654 100644
--- a/sys/dev/usb/controller/musb_otg.h
+++ b/sys/dev/usb/controller/musb_otg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c
index 81859b70f9dc..b752e630f48f 100644
--- a/sys/dev/usb/controller/musb_otg_atmelarm.c
+++ b/sys/dev/usb/controller/musb_otg_atmelarm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index ae9ae4488b89..a33ce04733bb 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h
index 50bc1a7f0dd8..9d8ac7dc8321 100644
--- a/sys/dev/usb/controller/ohci.h
+++ b/sys/dev/usb/controller/ohci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c
index 27929aa25ff0..31a1f57b9929 100644
--- a/sys/dev/usb/controller/ohci_pci.c
+++ b/sys/dev/usb/controller/ohci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c
index 6255ae19df17..2e0682766fc3 100644
--- a/sys/dev/usb/controller/ohci_s3c24x0.c
+++ b/sys/dev/usb/controller/ohci_s3c24x0.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2009 Andrew Turner. All rights reserved.
*
diff --git a/sys/dev/usb/controller/ohcireg.h b/sys/dev/usb/controller/ohcireg.h
index c6ea41135cc4..7f14875c6273 100644
--- a/sys/dev/usb/controller/ohcireg.h
+++ b/sys/dev/usb/controller/ohcireg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index 16ffa7756878..013a5f310422 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/controller/uhci.h b/sys/dev/usb/controller/uhci.h
index fd6a71e0338b..801952a73f6f 100644
--- a/sys/dev/usb/controller/uhci.h
+++ b/sys/dev/usb/controller/uhci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c
index c24a34eda283..2f8b4647cc1d 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/uhcireg.h b/sys/dev/usb/controller/uhcireg.h
index fa0e4eb9ce87..95eae494e71b 100644
--- a/sys/dev/usb/controller/uhcireg.h
+++ b/sys/dev/usb/controller/uhcireg.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index 154717537da8..9f7ce2461816 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index f8e48b9a5a9c..f4d06b783c71 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h
index 13001b1d3924..bc9cbc14c735 100644
--- a/sys/dev/usb/controller/uss820dci.h
+++ b/sys/dev/usb/controller/uss820dci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c
index 465a3a1c6594..2684d38d49db 100644
--- a/sys/dev/usb/controller/uss820dci_atmelarm.c
+++ b/sys/dev/usb/controller/uss820dci_atmelarm.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index 12ecdefffd81..b773c28a20b6 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index b2459d9f3e58..8ca628580c94 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
index 6c93c12c426c..44845b3fbf8a 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h
index b49bc09a8e7a..0e588ecba361 100644
--- a/sys/dev/usb/controller/xhcireg.h
+++ b/sys/dev/usb/controller/xhcireg.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c
index afb997944bdf..d1bee0e673c1 100644
--- a/sys/dev/usb/gadget/g_audio.c
+++ b/sys/dev/usb/gadget/g_audio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_audio.h b/sys/dev/usb/gadget/g_audio.h
index 111071cda0ad..530e0c46dc37 100644
--- a/sys/dev/usb/gadget/g_audio.h
+++ b/sys/dev/usb/gadget/g_audio.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_keyboard.c b/sys/dev/usb/gadget/g_keyboard.c
index 3a5980a8e9bc..a1ad566275c4 100644
--- a/sys/dev/usb/gadget/g_keyboard.c
+++ b/sys/dev/usb/gadget/g_keyboard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_keyboard.h b/sys/dev/usb/gadget/g_keyboard.h
index 3e24462c2fe5..669bf8ac6ef3 100644
--- a/sys/dev/usb/gadget/g_keyboard.h
+++ b/sys/dev/usb/gadget/g_keyboard.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_modem.c b/sys/dev/usb/gadget/g_modem.c
index 9ffa63bbb682..cc480ecc1e00 100644
--- a/sys/dev/usb/gadget/g_modem.c
+++ b/sys/dev/usb/gadget/g_modem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_modem.h b/sys/dev/usb/gadget/g_modem.h
index c7add7a8ffc1..c0d7e332e71d 100644
--- a/sys/dev/usb/gadget/g_modem.h
+++ b/sys/dev/usb/gadget/g_modem.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_mouse.c b/sys/dev/usb/gadget/g_mouse.c
index f041edb85555..6aa5413291de 100644
--- a/sys/dev/usb/gadget/g_mouse.c
+++ b/sys/dev/usb/gadget/g_mouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/gadget/g_mouse.h b/sys/dev/usb/gadget/g_mouse.h
index 3d256b0a0de1..6e763bcf486c 100644
--- a/sys/dev/usb/gadget/g_mouse.h
+++ b/sys/dev/usb/gadget/g_mouse.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c
index 5d6c0dffd31c..2d93d09d6a86 100644
--- a/sys/dev/usb/input/atp.c
+++ b/sys/dev/usb/input/atp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Rohit Grover
* All rights reserved.
*
diff --git a/sys/dev/usb/input/uep.c b/sys/dev/usb/input/uep.c
index 56110b59eca7..f14735ab6c16 100644
--- a/sys/dev/usb/input/uep.c
+++ b/sys/dev/usb/input/uep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index 2a903c82f4f1..88c68a7bff5d 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -8,8 +8,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index b7f93c1385d9..f6d16f33a3b1 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -3,8 +3,6 @@ __FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index 0db781237266..c393f31a94e7 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/input/usb_rdesc.h b/sys/dev/usb/input/usb_rdesc.h
index 00eea1223f30..23ea620b73e9 100644
--- a/sys/dev/usb/input/usb_rdesc.h
+++ b/sys/dev/usb/input/usb_rdesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Nick Hibma <n_hibma@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index e9d8cf73ae0b..6a02618e01f9 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Huang Wen Hui
* All rights reserved.
*
diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c
index 78bb6eaa2a17..c4294fec4a12 100644
--- a/sys/dev/usb/misc/udbp.c
+++ b/sys/dev/usb/misc/udbp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-2000 Whistle Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c
index aecff8ed8bd5..e7423b268845 100644
--- a/sys/dev/usb/misc/ufm.c
+++ b/sys/dev/usb/misc/ufm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index 5669e3fc4b47..a756820bf358 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_auereg.h b/sys/dev/usb/net/if_auereg.h
index dfbaac424bf8..4d0843eb8b1a 100644
--- a/sys/dev/usb/net/if_auereg.h
+++ b/sys/dev/usb/net/if_auereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index 68f4479d8e21..aa1ce0ed4c37 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axereg.h b/sys/dev/usb/net/if_axereg.h
index 2654bbbab9af..64cb2352485a 100644
--- a/sys/dev/usb/net/if_axereg.h
+++ b/sys/dev/usb/net/if_axereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index a92b69fa14b7..eb025c72a802 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Kevin Lo
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h
index f8eec25346c2..1825d3b0994b 100644
--- a/sys/dev/usb/net/if_axgereg.h
+++ b/sys/dev/usb/net/if_axgereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013-2014 Kevin Lo
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 584dbf9dc8bd..81d6276eab7d 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_cdce.c,v 1.4 2004/10/24 12:50:54 augustss Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
* Copyright (c) 2003-2005 Craig Boston
* Copyright (c) 2004 Daniel Hartmeier
diff --git a/sys/dev/usb/net/if_cdcereg.h b/sys/dev/usb/net/if_cdcereg.h
index 26d037c593b8..1bc2d6039dc1 100644
--- a/sys/dev/usb/net/if_cdcereg.h
+++ b/sys/dev/usb/net/if_cdcereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003-2005 Craig Boston
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 9d66e51289b9..1190f98231e2 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cuereg.h b/sys/dev/usb/net/if_cuereg.h
index b5cccee42c19..ff245c0513eb 100644
--- a/sys/dev/usb/net/if_cuereg.h
+++ b/sys/dev/usb/net/if_cuereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index ab323bfeacac..d7035881e097 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2009 Diego Giagio. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_iphethvar.h b/sys/dev/usb/net/if_iphethvar.h
index 4f9901891e62..65b0c940c600 100644
--- a/sys/dev/usb/net/if_iphethvar.h
+++ b/sys/dev/usb/net/if_iphethvar.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2009 Diego Giagio. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 4c07043e1712..562ead2809e7 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kuefw.h b/sys/dev/usb/net/if_kuefw.h
index 8b799f01f850..2b055a92ed7b 100644
--- a/sys/dev/usb/net/if_kuefw.h
+++ b/sys/dev/usb/net/if_kuefw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kuereg.h b/sys/dev/usb/net/if_kuereg.h
index 2f5d7ccb3b38..16ad044d07ef 100644
--- a/sys/dev/usb/net/if_kuereg.h
+++ b/sys/dev/usb/net/if_kuereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 14619eccdf39..e6aaac95cc76 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: 0BSD AND BSD-4-Clause
- *
* Copyright (c) 2011 Rick van der Zwet <info@rickvanderzwet.nl>
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/sys/dev/usb/net/if_mosreg.h b/sys/dev/usb/net/if_mosreg.h
index b8034feb8e44..c811d55279e3 100644
--- a/sys/dev/usb/net/if_mosreg.h
+++ b/sys/dev/usb/net/if_mosreg.h
@@ -32,8 +32,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 3766c993e4ed..9b86e88474b8 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_ruereg.h b/sys/dev/usb/net/if_ruereg.h
index 688ee24e51eb..c90a9692156e 100644
--- a/sys/dev/usb/net/if_ruereg.h
+++ b/sys/dev/usb/net/if_ruereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 27ed2f56f482..25a737795ae7 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
* All rights reserved.
diff --git a/sys/dev/usb/net/if_smscreg.h b/sys/dev/usb/net/if_smscreg.h
index 5ad79b9e13ea..31a63828badf 100644
--- a/sys/dev/usb/net/if_smscreg.h
+++ b/sys/dev/usb/net/if_smscreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
* All rights reserved.
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 92a9d4008f0d..735742535164 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -2,8 +2,6 @@
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_udavreg.h b/sys/dev/usb/net/if_udavreg.h
index d892700620bf..7c35829b5d63 100644
--- a/sys/dev/usb/net/if_udavreg.h
+++ b/sys/dev/usb/net/if_udavreg.h
@@ -2,8 +2,6 @@
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 9a809cd96d42..528c1e47697e 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Anybots Inc
* written by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
* - ucom part is based on u3g.c
diff --git a/sys/dev/usb/net/if_usievar.h b/sys/dev/usb/net/if_usievar.h
index 8dc0506affbc..9ba0dc8b12ac 100644
--- a/sys/dev/usb/net/if_usievar.h
+++ b/sys/dev/usb/net/if_usievar.h
@@ -2,8 +2,6 @@
/*-
* Copyright (c) 2011 Anybots Inc
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* written by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
* - ucom part is based on u3g.c
*
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 017d07c3c134..746ddbae6aa7 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/net/ruephyreg.h b/sys/dev/usb/net/ruephyreg.h
index 38c508d5f01c..01d3cc172246 100644
--- a/sys/dev/usb/net/ruephyreg.h
+++ b/sys/dev/usb/net/ruephyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index 7f40233b33a2..c94e67625a94 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Fredrik Lindberg <fli@shapeshifter.se>
* All rights reserved.
*
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index 53c40302d491..0b0350cea34b 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Andrew Thompson (thompsa@FreeBSD.org)
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h
index 59c41a9171b0..af7cad437f97 100644
--- a/sys/dev/usb/net/usb_ethernet.h
+++ b/sys/dev/usb/net/usb_ethernet.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index f8614449ee01..7e0e54aacef0 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h
index e7f2e02f6084..bb9fe190e166 100644
--- a/sys/dev/usb/quirk/usb_quirk.h
+++ b/sys/dev/usb/quirk/usb_quirk.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index b03024ef2dea..74159687e76c 100644
--- a/sys/dev/usb/serial/ubsa.c
+++ b/sys/dev/usb/serial/ubsa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index 8a3ea4f33a77..10fb564c430b 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -8,8 +8,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index 42baecf5d641..e3fdeedc8a23 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -1,8 +1,6 @@
/* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2007, Takanori Watanabe
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index b8c3a0189b37..66aedecd1041 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index c27232eca218..dfb41e1871d0 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
#define UFOMA_HANDSFREE
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2005, Takanori Watanabe
* Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index ab3b160428fc..8cccdce7367c 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -1,8 +1,6 @@
/* $NetBSD: uftdi.c,v 1.13 2002/09/23 05:51:23 simonb Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c
index 19bcfca05b7a..d78c326c9a91 100644
--- a/sys/dev/usb/serial/ugensa.c
+++ b/sys/dev/usb/serial/ugensa.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c
index ba83ad7d2ac8..d483ce59017f 100644
--- a/sys/dev/usb/serial/uipaq.c
+++ b/sys/dev/usb/serial/uipaq.c
@@ -1,9 +1,7 @@
/* $NetBSD: uipaq.c,v 1.4 2006/11/16 01:33:27 christos Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 2000-2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c
index 80873b985cc3..529f83554457 100644
--- a/sys/dev/usb/serial/ulpt.c
+++ b/sys/dev/usb/serial/ulpt.c
@@ -4,8 +4,6 @@ __FBSDID("$FreeBSD$");
/* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index bcff8190344d..c5ac0d6c52aa 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h
index 288988c2d9b6..8ba57c138781 100644
--- a/sys/dev/usb/serial/umcs.h
+++ b/sys/dev/usb/serial/umcs.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c
index 5ec06ec76b3b..251e0790fce7 100644
--- a/sys/dev/usb/serial/umct.c
+++ b/sys/dev/usb/serial/umct.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Scott Long
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 11bd375113fb..ce51361121e1 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index 9854e4e7884b..1bcf131dd29b 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index f9255cdb82fc..4c4f8f287078 100644
--- a/sys/dev/usb/serial/usb_serial.c
+++ b/sys/dev/usb/serial/usb_serial.c
@@ -1,8 +1,6 @@
/* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001-2003, 2005, 2008
* Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index 4ad35e79140e..2b3e258d50ae 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c
index 83b3657798cd..4d72e38d9df4 100644
--- a/sys/dev/usb/serial/uvisor.c
+++ b/sys/dev/usb/serial/uvisor.c
@@ -14,8 +14,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c
index 201cea923057..0a6e7146a436 100644
--- a/sys/dev/usb/serial/uvscom.c
+++ b/sys/dev/usb/serial/uvscom.c
@@ -4,8 +4,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index a789b85c155b..acec1c9da528 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
* Nick Hibma <n_hibma@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c
index b205bff0c1a3..7de31324b775 100644
--- a/sys/dev/usb/storage/urio.c
+++ b/sys/dev/usb/storage/urio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Iwasa Kazmi
* All rights reserved.
*
diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c
index b2958e584f98..69c3d2087f0e 100644
--- a/sys/dev/usb/storage/ustorage_fs.c
+++ b/sys/dev/usb/storage/ustorage_fs.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2003-2005 Alan Stern
* Copyright (C) 2008 Hans Petter Selasky
* All rights reserved.
diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c
index f94b92519b34..9bebbf6eb8bc 100644
--- a/sys/dev/usb/template/usb_template.c
+++ b/sys/dev/usb/template/usb_template.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/template/usb_template.h b/sys/dev/usb/template/usb_template.h
index f9268f7ab7b5..1b320c689f1b 100644
--- a/sys/dev/usb/template/usb_template.h
+++ b/sys/dev/usb/template/usb_template.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/template/usb_template_audio.c b/sys/dev/usb/template/usb_template_audio.c
index 8abdbb1d8e1d..7c7cebe33367 100644
--- a/sys/dev/usb/template/usb_template_audio.c
+++ b/sys/dev/usb/template/usb_template_audio.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/template/usb_template_cdce.c b/sys/dev/usb/template/usb_template_cdce.c
index 3defec8540c7..68f69d0ad573 100644
--- a/sys/dev/usb/template/usb_template_cdce.c
+++ b/sys/dev/usb/template/usb_template_cdce.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/template/usb_template_kbd.c b/sys/dev/usb/template/usb_template_kbd.c
index 6737aba30528..306b2fee155c 100644
--- a/sys/dev/usb/template/usb_template_kbd.c
+++ b/sys/dev/usb/template/usb_template_kbd.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/template/usb_template_modem.c b/sys/dev/usb/template/usb_template_modem.c
index d64c20f07b76..6a976f7cbf17 100644
--- a/sys/dev/usb/template/usb_template_modem.c
+++ b/sys/dev/usb/template/usb_template_modem.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/template/usb_template_mouse.c b/sys/dev/usb/template/usb_template_mouse.c
index 302b69a3eda5..a48ccf4d61d6 100644
--- a/sys/dev/usb/template/usb_template_mouse.c
+++ b/sys/dev/usb/template/usb_template_mouse.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/template/usb_template_msc.c b/sys/dev/usb/template/usb_template_msc.c
index 12226a2b2216..6809e63ff6e4 100644
--- a/sys/dev/usb/template/usb_template_msc.c
+++ b/sys/dev/usb/template/usb_template_msc.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/template/usb_template_mtp.c b/sys/dev/usb/template/usb_template_mtp.c
index a2bfc04c2dc7..d428e992f062 100644
--- a/sys/dev/usb/template/usb_template_mtp.c
+++ b/sys/dev/usb/template/usb_template_mtp.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/ufm_ioctl.h b/sys/dev/usb/ufm_ioctl.h
index 599d36d4c620..5a233883546c 100644
--- a/sys/dev/usb/ufm_ioctl.h
+++ b/sys/dev/usb/ufm_ioctl.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 0e549ae4b05e..bcea2ac8bd19 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h
index 710436c16eb9..3ceeb1efa7e3 100644
--- a/sys/dev/usb/usb_bus.h
+++ b/sys/dev/usb/usb_bus.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index 54ace4a1d8a2..8a344ccfdf71 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_busdma.h b/sys/dev/usb/usb_busdma.h
index d75e67eee8fe..077bf8b86417 100644
--- a/sys/dev/usb/usb_busdma.h
+++ b/sys/dev/usb/usb_busdma.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_cdc.h b/sys/dev/usb/usb_cdc.h
index d77c24bb7ad8..86f351707359 100644
--- a/sys/dev/usb/usb_cdc.h
+++ b/sys/dev/usb/usb_cdc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 59139e64bd99..6a2f6b03edda 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_core.c b/sys/dev/usb/usb_core.c
index bb7408a680df..1516e77425df 100644
--- a/sys/dev/usb/usb_core.c
+++ b/sys/dev/usb/usb_core.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h
index b19cb5b9df4b..739a0039160d 100644
--- a/sys/dev/usb/usb_core.h
+++ b/sys/dev/usb/usb_core.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c
index 7e4760cd636e..9c7fa6e1d062 100644
--- a/sys/dev/usb/usb_debug.c
+++ b/sys/dev/usb/usb_debug.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_debug.h b/sys/dev/usb/usb_debug.h
index 87c0dcfe3d5f..e30f2c2c83d8 100644
--- a/sys/dev/usb/usb_debug.h
+++ b/sys/dev/usb/usb_debug.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index de07b99b503d..47ab5a03edd3 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_dev.h b/sys/dev/usb/usb_dev.h
index ae851153efb1..f87ba53bc1a2 100644
--- a/sys/dev/usb/usb_dev.h
+++ b/sys/dev/usb/usb_dev.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 19b439e2f953..c33069bb145a 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index 1cf48ea14a3a..22e15606380f 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c
index 1f4370ad2d53..24c13f9f5dc1 100644
--- a/sys/dev/usb/usb_dynamic.c
+++ b/sys/dev/usb/usb_dynamic.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h
index 2d46afc83560..e52c46fb75b8 100644
--- a/sys/dev/usb/usb_dynamic.h
+++ b/sys/dev/usb/usb_dynamic.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_endian.h b/sys/dev/usb/usb_endian.h
index 597617677282..0bbcb9bf828c 100644
--- a/sys/dev/usb/usb_endian.h
+++ b/sys/dev/usb/usb_endian.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_error.c b/sys/dev/usb/usb_error.c
index b2b44e18fa50..5987d8107c4d 100644
--- a/sys/dev/usb/usb_error.c
+++ b/sys/dev/usb/usb_error.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h
index fc06f6980fb8..3bc9d2c1eb52 100644
--- a/sys/dev/usb/usb_freebsd.h
+++ b/sys/dev/usb/usb_freebsd.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_freebsd_loader.h b/sys/dev/usb/usb_freebsd_loader.h
index 9f7c5821b76c..aa26008bbe40 100644
--- a/sys/dev/usb/usb_freebsd_loader.h
+++ b/sys/dev/usb/usb_freebsd_loader.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index 42387a95f317..73b62a7ee5e3 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_generic.h b/sys/dev/usb/usb_generic.h
index d03f25cd9455..835ec72afd09 100644
--- a/sys/dev/usb/usb_generic.h
+++ b/sys/dev/usb/usb_generic.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c
index 58088644f090..fcbdf95f748a 100644
--- a/sys/dev/usb/usb_handle_request.c
+++ b/sys/dev/usb/usb_handle_request.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c
index b68a364e6892..2c045dbed442 100644
--- a/sys/dev/usb/usb_hid.c
+++ b/sys/dev/usb/usb_hid.c
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c
index 7caa4fbcf3a9..4b2c984cd84e 100644
--- a/sys/dev/usb/usb_hub.c
+++ b/sys/dev/usb/usb_hub.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
* Copyright (c) 2008-2010 Hans Petter Selasky. All rights reserved.
diff --git a/sys/dev/usb/usb_hub.h b/sys/dev/usb/usb_hub.h
index 3d4e08373107..16430d9b29a7 100644
--- a/sys/dev/usb/usb_hub.h
+++ b/sys/dev/usb/usb_hub.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index 7cf90649db00..683f3e61b858 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/usb_lookup.c b/sys/dev/usb/usb_lookup.c
index f3faf7e8ac42..86e1a82a74c0 100644
--- a/sys/dev/usb/usb_lookup.c
+++ b/sys/dev/usb/usb_lookup.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_mbuf.c b/sys/dev/usb/usb_mbuf.c
index eacef78be4cc..ff2f6da2afda 100644
--- a/sys/dev/usb/usb_mbuf.c
+++ b/sys/dev/usb/usb_mbuf.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_mbuf.h b/sys/dev/usb/usb_mbuf.h
index 2466e2e4c4dc..3b331ffce68b 100644
--- a/sys/dev/usb/usb_mbuf.h
+++ b/sys/dev/usb/usb_mbuf.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c
index 0db7015549ad..b99fd2918e35 100644
--- a/sys/dev/usb/usb_msctest.c
+++ b/sys/dev/usb/usb_msctest.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008,2011 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h
index 6b5d3283738b..d3f26c2b193c 100644
--- a/sys/dev/usb/usb_msctest.h
+++ b/sys/dev/usb/usb_msctest.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_parse.c b/sys/dev/usb/usb_parse.c
index 5cace00fadc7..07446966fccf 100644
--- a/sys/dev/usb/usb_parse.c
+++ b/sys/dev/usb/usb_parse.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_pci.h b/sys/dev/usb/usb_pci.h
index 86e8cb397e4d..6eebc55175bf 100644
--- a/sys/dev/usb/usb_pci.h
+++ b/sys/dev/usb/usb_pci.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c
index 7c7d9ec45296..82ad8e4e9cbb 100644
--- a/sys/dev/usb/usb_pf.c
+++ b/sys/dev/usb/usb_pf.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/usb/usb_pf.h b/sys/dev/usb/usb_pf.h
index 36dfa833c1d2..9d51e98c0500 100644
--- a/sys/dev/usb/usb_pf.h
+++ b/sys/dev/usb/usb_pf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c
index 99c20090263b..16d93b4b8615 100644
--- a/sys/dev/usb/usb_process.c
+++ b/sys/dev/usb/usb_process.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 7be78917b8f0..dd20afd4e65a 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c
index 074372d390c3..7c02282f6538 100644
--- a/sys/dev/usb/usb_request.c
+++ b/sys/dev/usb/usb_request.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
diff --git a/sys/dev/usb/usb_request.h b/sys/dev/usb/usb_request.h
index 7c65313265ef..9f0a4e644d55 100644
--- a/sys/dev/usb/usb_request.h
+++ b/sys/dev/usb/usb_request.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c
index dec306cdfda2..a2ca28b643a7 100644
--- a/sys/dev/usb/usb_transfer.c
+++ b/sys/dev/usb/usb_transfer.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index da632a738262..f035240b2b47 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c
index 8a85bf6506bb..cc9ede184bf4 100644
--- a/sys/dev/usb/usb_util.c
+++ b/sys/dev/usb/usb_util.c
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h
index 87e54d35150e..7e52404f1fd3 100644
--- a/sys/dev/usb/usb_util.h
+++ b/sys/dev/usb/usb_util.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 02ff4ceb8cf3..1a59fbb8cad4 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Andrew Thompson
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index d0ee6f9d330a..1e450f8f4ff2 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Andrew Thompson
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 8870e2918df1..31aa7ea4b2d8 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index dff4e5c201b8..470be6fcdead 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND 0BSD
- *
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* Copyright (c) 2008-2009 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/usb/wlan/if_zydfw.h b/sys/dev/usb/wlan/if_zydfw.h
index f18442e924bf..46f5c2aba751 100644
--- a/sys/dev/usb/wlan/if_zydfw.h
+++ b/sys/dev/usb/wlan/if_zydfw.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2001, 2002, 2003,2004 ZyDAS Technology Corporation.
* All rights reserved.
*
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index e0ae98fa0b39..315f273eef9d 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index 88e6f22f3124..c8b3f1bb459b 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index 6e707e2d5965..ca899cc5fc0a 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/viawd/viawd.c b/sys/dev/viawd/viawd.c
index 95a4a1111780..46d7644f77ea 100644
--- a/sys/dev/viawd/viawd.c
+++ b/sys/dev/viawd/viawd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/viawd/viawd.h b/sys/dev/viawd/viawd.h
index 4771a8663079..d311b8848dc2 100644
--- a/sys/dev/viawd/viawd.h
+++ b/sys/dev/viawd/viawd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/balloon/virtio_balloon.c b/sys/dev/virtio/balloon/virtio_balloon.c
index 678a25ce21d0..6d00ef38bfa3 100644
--- a/sys/dev/virtio/balloon/virtio_balloon.c
+++ b/sys/dev/virtio/balloon/virtio_balloon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/balloon/virtio_balloon.h b/sys/dev/virtio/balloon/virtio_balloon.h
index b871dfb01c56..f143341572cd 100644
--- a/sys/dev/virtio/balloon/virtio_balloon.h
+++ b/sys/dev/virtio/balloon/virtio_balloon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers.
*
diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c
index 6fb64cf32605..7b273641a5dd 100644
--- a/sys/dev/virtio/block/virtio_blk.c
+++ b/sys/dev/virtio/block/virtio_blk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/block/virtio_blk.h b/sys/dev/virtio/block/virtio_blk.h
index c27bc371d06e..8ce6e159b49b 100644
--- a/sys/dev/virtio/block/virtio_blk.h
+++ b/sys/dev/virtio/block/virtio_blk.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers.
*
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 63bbc29c9efb..37189753012e 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h
index bd6938b1c9fe..15436d983ca9 100644
--- a/sys/dev/virtio/network/if_vtnetvar.h
+++ b/sys/dev/virtio/network/if_vtnetvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h
index b0c80b58c732..f4f9febf59a2 100644
--- a/sys/dev/virtio/network/virtio_net.h
+++ b/sys/dev/virtio/network/virtio_net.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers.
*
diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c
index 100b44cd1843..121351fda26b 100644
--- a/sys/dev/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtio/pci/virtio_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/pci/virtio_pci.h b/sys/dev/virtio/pci/virtio_pci.h
index 8212e36bb733..f071ad638d4c 100644
--- a/sys/dev/virtio/pci/virtio_pci.h
+++ b/sys/dev/virtio/pci/virtio_pci.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright IBM Corp. 2007
*
* Authors:
diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c
index 18326891f05e..8c08853f3500 100644
--- a/sys/dev/virtio/random/virtio_random.c
+++ b/sys/dev/virtio/random/virtio_random.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c
index 102758f8ab44..0c08b84a1461 100644
--- a/sys/dev/virtio/scsi/virtio_scsi.c
+++ b/sys/dev/virtio/scsi/virtio_scsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/scsi/virtio_scsi.h b/sys/dev/virtio/scsi/virtio_scsi.h
index 9a9c5232dfee..caf7aaf84e64 100644
--- a/sys/dev/virtio/scsi/virtio_scsi.h
+++ b/sys/dev/virtio/scsi/virtio_scsi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers.
*
diff --git a/sys/dev/virtio/scsi/virtio_scsivar.h b/sys/dev/virtio/scsi/virtio_scsivar.h
index 3e4109e65870..f30f66751b81 100644
--- a/sys/dev/virtio/scsi/virtio_scsivar.h
+++ b/sys/dev/virtio/scsi/virtio_scsivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c
index 131c4c7d954d..eede8f504c49 100644
--- a/sys/dev/virtio/virtio.c
+++ b/sys/dev/virtio/virtio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h
index 15e598a11d16..47c678c37ab1 100644
--- a/sys/dev/virtio/virtio.h
+++ b/sys/dev/virtio/virtio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2014, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/virtio_ring.h b/sys/dev/virtio/virtio_ring.h
index ee2609685d06..8e902ab59c2b 100644
--- a/sys/dev/virtio/virtio_ring.h
+++ b/sys/dev/virtio/virtio_ring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright Rusty Russell IBM Corporation 2007.
*
* This header is BSD licensed so anyone can use the definitions to implement
diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c
index e23d4d25c47f..6bd148ff3806 100644
--- a/sys/dev/virtio/virtqueue.c
+++ b/sys/dev/virtio/virtqueue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/virtio/virtqueue.h b/sys/dev/virtio/virtqueue.h
index 7b2db673f7ae..afeb1c77ef76 100644
--- a/sys/dev/virtio/virtqueue.h
+++ b/sys/dev/virtio/virtqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index f6454916368b..6bfd5e9f298c 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -3,8 +3,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/sys/dev/vkbd/vkbd_var.h b/sys/dev/vkbd/vkbd_var.h
index d5f3ec81d03b..51e7ff467d17 100644
--- a/sys/dev/vkbd/vkbd_var.h
+++ b/sys/dev/vkbd/vkbd_var.h
@@ -1,8 +1,6 @@
/*-
* vkbd_var.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index b1c7b540155c..5ffee24c1588 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/vr/if_vrreg.h b/sys/dev/vr/if_vrreg.h
index fdb581ace0a2..3618c1bae936 100644
--- a/sys/dev/vr/if_vrreg.h
+++ b/sys/dev/vr/if_vrreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/vt/colors/vt_termcolors.c b/sys/dev/vt/colors/vt_termcolors.c
index fabec41387c2..40b4c7f1215d 100644
--- a/sys/dev/vt/colors/vt_termcolors.c
+++ b/sys/dev/vt/colors/vt_termcolors.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/colors/vt_termcolors.h b/sys/dev/vt/colors/vt_termcolors.h
index dbea54a1c75b..fd54733dd320 100644
--- a/sys/dev/vt/colors/vt_termcolors.h
+++ b/sys/dev/vt/colors/vt_termcolors.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/font/vt_font_default.c b/sys/dev/vt/font/vt_font_default.c
index 4fe00a3269e5..636103b373a4 100644
--- a/sys/dev/vt/font/vt_font_default.c
+++ b/sys/dev/vt/font/vt_font_default.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2014 Dimitar Toshkov Zhekov. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/vt/font/vt_mouse_cursor.c b/sys/dev/vt/font/vt_mouse_cursor.c
index 386fe99a1f48..5e012150c2d3 100644
--- a/sys/dev/vt/font/vt_mouse_cursor.c
+++ b/sys/dev/vt/font/vt_mouse_cursor.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index 7b8b88cad51a..9c9904088a1e 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
index 29306f336e4a..3eddfba48021 100644
--- a/sys/dev/vt/hw/fb/vt_early_fb.c
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
index 6145940b2476..1a9bbecd2e35 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
index 6a185bab0dcb..98ecefa77f6c 100644
--- a/sys/dev/vt/hw/fb/vt_fb.h
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c
index 5c9c0695ce94..0776a8e622db 100644
--- a/sys/dev/vt/hw/ofwfb/ofwfb.c
+++ b/sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/dev/vt/logo/logo_freebsd.c b/sys/dev/vt/logo/logo_freebsd.c
index f6d141f09cfc..beb3f0c4990b 100644
--- a/sys/dev/vt/logo/logo_freebsd.c
+++ b/sys/dev/vt/logo/logo_freebsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index cea9191ae7ad..0ca6dbe7c719 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
index ae6251a59eeb..ce3e621cb22a 100644
--- a/sys/dev/vt/vt_buf.c
+++ b/sys/dev/vt/vt_buf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt_consolectl.c b/sys/dev/vt/vt_consolectl.c
index 4353271255ff..a7042fd14706 100644
--- a/sys/dev/vt/vt_consolectl.c
+++ b/sys/dev/vt/vt_consolectl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 87dcd49a03cb..34b3ff268b1a 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, 2013 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt_font.c b/sys/dev/vt/vt_font.c
index c51385e3891c..4c369c68bdb2 100644
--- a/sys/dev/vt/vt_font.c
+++ b/sys/dev/vt/vt_font.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/dev/vt/vt_sysmouse.c b/sys/dev/vt/vt_sysmouse.c
index 4afb9e1e126b..019050b7694e 100644
--- a/sys/dev/vt/vt_sysmouse.c
+++ b/sys/dev/vt/vt_sysmouse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
index b0f588888a4a..d3eb06a6ba38 100644
--- a/sys/dev/vte/if_vte.c
+++ b/sys/dev/vte/if_vte.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/vte/if_vtereg.h b/sys/dev/vte/if_vtereg.h
index 2d90525010dc..536617b88c1a 100644
--- a/sys/dev/vte/if_vtereg.h
+++ b/sys/dev/vte/if_vtereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/vte/if_vtevar.h b/sys/dev/vte/if_vtevar.h
index 9f2f7dda5bbf..a8e79d09c68a 100644
--- a/sys/dev/vte/if_vtevar.h
+++ b/sys/dev/vte/if_vtevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 75769fd70a00..a1ba239a7b9e 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 6fd165d08134..72fff6aed21a 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index 80894cf877dd..08ac4088abac 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index e4a3ab7aa846..8c312e2cbe97 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/vxge/include/vxge-debug.h b/sys/dev/vxge/include/vxge-debug.h
index 175fb2e1c317..a4ba89443a3a 100644
--- a/sys/dev/vxge/include/vxge-debug.h
+++ b/sys/dev/vxge/include/vxge-debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxge-defs.h b/sys/dev/vxge/include/vxge-defs.h
index ef94ef2ea984..a533a903211e 100644
--- a/sys/dev/vxge/include/vxge-defs.h
+++ b/sys/dev/vxge/include/vxge-defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxge-list.h b/sys/dev/vxge/include/vxge-list.h
index 3f1c5070b265..56ad02c6e508 100644
--- a/sys/dev/vxge/include/vxge-list.h
+++ b/sys/dev/vxge/include/vxge-list.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxge-os-debug.h b/sys/dev/vxge/include/vxge-os-debug.h
index af60012560c9..1608ddbcfe96 100644
--- a/sys/dev/vxge/include/vxge-os-debug.h
+++ b/sys/dev/vxge/include/vxge-os-debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxge-os-pal.h b/sys/dev/vxge/include/vxge-os-pal.h
index b91d8ca24dff..32a64dfeb4fb 100644
--- a/sys/dev/vxge/include/vxge-os-pal.h
+++ b/sys/dev/vxge/include/vxge-os-pal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxge-queue.h b/sys/dev/vxge/include/vxge-queue.h
index 057047f06191..4745403f2cc0 100644
--- a/sys/dev/vxge/include/vxge-queue.h
+++ b/sys/dev/vxge/include/vxge-queue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-config.h b/sys/dev/vxge/include/vxgehal-config.h
index 303d14b5a7b1..7f5c6dbeec31 100644
--- a/sys/dev/vxge/include/vxgehal-config.h
+++ b/sys/dev/vxge/include/vxgehal-config.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-ll.h b/sys/dev/vxge/include/vxgehal-ll.h
index 78a7e97f23ab..7e034485721f 100644
--- a/sys/dev/vxge/include/vxgehal-ll.h
+++ b/sys/dev/vxge/include/vxgehal-ll.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-mgmt.h b/sys/dev/vxge/include/vxgehal-mgmt.h
index 1c99a2f60878..effc9ab0a1cf 100644
--- a/sys/dev/vxge/include/vxgehal-mgmt.h
+++ b/sys/dev/vxge/include/vxgehal-mgmt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-mgmtaux.h b/sys/dev/vxge/include/vxgehal-mgmtaux.h
index 47d5795ccb4d..8ded696d2a75 100644
--- a/sys/dev/vxge/include/vxgehal-mgmtaux.h
+++ b/sys/dev/vxge/include/vxgehal-mgmtaux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-stats.h b/sys/dev/vxge/include/vxgehal-stats.h
index c486da193f5e..9dae119540a9 100644
--- a/sys/dev/vxge/include/vxgehal-stats.h
+++ b/sys/dev/vxge/include/vxgehal-stats.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-status.h b/sys/dev/vxge/include/vxgehal-status.h
index 6dcac9dd6da0..851974f9dfbe 100644
--- a/sys/dev/vxge/include/vxgehal-status.h
+++ b/sys/dev/vxge/include/vxgehal-status.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-types.h b/sys/dev/vxge/include/vxgehal-types.h
index 891964932db5..04cb1284c604 100644
--- a/sys/dev/vxge/include/vxgehal-types.h
+++ b/sys/dev/vxge/include/vxgehal-types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/include/vxgehal-version.h b/sys/dev/vxge/include/vxgehal-version.h
index 5d6a27b94ace..e58f0a1fc6fb 100644
--- a/sys/dev/vxge/include/vxgehal-version.h
+++ b/sys/dev/vxge/include/vxgehal-version.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxge-firmware.h b/sys/dev/vxge/vxge-firmware.h
index e58243533bfe..61eb440ac744 100644
--- a/sys/dev/vxge/vxge-firmware.h
+++ b/sys/dev/vxge/vxge-firmware.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxge-osdep.h b/sys/dev/vxge/vxge-osdep.h
index 4d8ae718d62f..66caaeb04201 100644
--- a/sys/dev/vxge/vxge-osdep.h
+++ b/sys/dev/vxge/vxge-osdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxge.c b/sys/dev/vxge/vxge.c
index 115fedb0d319..166577f52404 100644
--- a/sys/dev/vxge/vxge.c
+++ b/sys/dev/vxge/vxge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxge.h b/sys/dev/vxge/vxge.h
index 27ef68c6b236..37ab88b9f074 100644
--- a/sys/dev/vxge/vxge.h
+++ b/sys/dev/vxge/vxge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxge-queue.c b/sys/dev/vxge/vxgehal/vxge-queue.c
index 32a775a98cb4..c2a2b5aa19cb 100644
--- a/sys/dev/vxge/vxgehal/vxge-queue.c
+++ b/sys/dev/vxge/vxgehal/vxge-queue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-blockpool.c b/sys/dev/vxge/vxgehal/vxgehal-blockpool.c
index 3da5dc66da5a..cc5150455220 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-blockpool.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-blockpool.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-blockpool.h b/sys/dev/vxge/vxgehal/vxgehal-blockpool.h
index 837623b5d227..fb3a2aa1dbc3 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-blockpool.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-blockpool.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-channel.c b/sys/dev/vxge/vxgehal/vxgehal-channel.c
index 95f5c496d6b0..d497843ee91d 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-channel.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-channel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-channel.h b/sys/dev/vxge/vxgehal/vxgehal-channel.h
index 4c17c468f18f..552b550e4d8f 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-channel.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-channel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-common-reg.h b/sys/dev/vxge/vxgehal/vxgehal-common-reg.h
index 124be2741dae..19be2595377c 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-common-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-common-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-config-priv.h b/sys/dev/vxge/vxgehal/vxgehal-config-priv.h
index 7b1f7bc454f8..f593358654d5 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-config-priv.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-config-priv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-config.c b/sys/dev/vxge/vxgehal/vxgehal-config.c
index fdd5823f963a..15a48e216ffa 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-config.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-debug.h b/sys/dev/vxge/vxgehal/vxgehal-debug.h
index 89e959ec800f..57e39f46215d 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-debug.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-device.c b/sys/dev/vxge/vxgehal/vxgehal-device.c
index d7216c9b124d..faa5f79308d8 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-device.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-device.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-device.h b/sys/dev/vxge/vxgehal/vxgehal-device.h
index c7587a99d4a7..e44f8f28b27b 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-device.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-device.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-doorbells.c b/sys/dev/vxge/vxgehal/vxgehal-doorbells.c
index 060610787aa4..ab53e028d35c 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-doorbells.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-doorbells.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-doorbells.h b/sys/dev/vxge/vxgehal/vxgehal-doorbells.h
index 7b0bd7ea1316..fa0006d8f6ec 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-doorbells.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-doorbells.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-driver.c b/sys/dev/vxge/vxgehal/vxgehal-driver.c
index 51d87ed30c68..ce3ae75687c1 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-driver.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-driver.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-driver.h b/sys/dev/vxge/vxgehal/vxgehal-driver.h
index 23cdbdf2752c..6aa6def9d374 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-driver.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-driver.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-fifo.c b/sys/dev/vxge/vxgehal/vxgehal-fifo.c
index 3e45c8db3b42..30dfa3d5557b 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-fifo.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-fifo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-fifo.h b/sys/dev/vxge/vxgehal/vxgehal-fifo.h
index b4b70a8aebc2..5cb20bc36568 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-fifo.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-fifo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c b/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c
index 541b006eed17..1bcdbf2a3d61 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h b/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h
index 1ae0e6b12f01..b9529fe99dbd 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h b/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h
index db37799d43d3..6e03af356e47 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h b/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h
index 7986363f82b5..213d196e5884 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mgmt.c b/sys/dev/vxge/vxgehal/vxgehal-mgmt.c
index 0414f25ad6ee..c58ddb29ca92 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mgmt.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-mgmt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c b/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c
index 342cb52672a3..995cbc7073f4 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mm.c b/sys/dev/vxge/vxgehal/vxgehal-mm.c
index 27fbbaccc218..4a8eb0869fb3 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mm.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-mm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mm.h b/sys/dev/vxge/vxgehal/vxgehal-mm.h
index 9694a542c7cb..549b814d11ad 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mm.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-mm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h b/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h
index d871e5b5d114..0c8d68d12246 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c b/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c
index 7bdc9fd108d8..38527637eb03 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h b/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h
index eddc3a889f08..324130e8f34e 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h b/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h
index 9f7940df50b4..62ac39e4f98c 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-regdefs.h b/sys/dev/vxge/vxgehal/vxgehal-regdefs.h
index ac0ac8179027..9ba8e5751427 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-regdefs.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-regdefs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-regs.h b/sys/dev/vxge/vxgehal/vxgehal-regs.h
index 2b7271c094b6..a18e97b0ffa0 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-regs.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-regs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-ring.c b/sys/dev/vxge/vxgehal/vxgehal-ring.c
index 1278ad6e4ab4..1570dea17815 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-ring.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-ring.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-ring.h b/sys/dev/vxge/vxgehal/vxgehal-ring.h
index 40554a8b57f4..223116728b27 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-ring.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-ring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h b/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h
index 84f6d7e29440..18414e26c555 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-srpcim.c b/sys/dev/vxge/vxgehal/vxgehal-srpcim.c
index da2ba1ae4b56..64c5288d46d5 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-srpcim.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-srpcim.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-srpcim.h b/sys/dev/vxge/vxgehal/vxgehal-srpcim.h
index 409d11a92062..a0973209e85a 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-srpcim.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-srpcim.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-swapper.c b/sys/dev/vxge/vxgehal/vxgehal-swapper.c
index 6290a57d0133..475317d93fba 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-swapper.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-swapper.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-swapper.h b/sys/dev/vxge/vxgehal/vxgehal-swapper.h
index 71a4c35c794c..97a5d56dbd50 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-swapper.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-swapper.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h b/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h
index b273af5031e6..748f4b057499 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c b/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c
index a299b1417072..c4067e984a5a 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c
+++ b/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h b/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h
index 4dc41598c5c4..09afc65fefe5 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h b/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h
index 65eed0594335..20eeedd7a8a2 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h b/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h
index 57cf371acb21..2b958ae61f4a 100644
--- a/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h
+++ b/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgehal/vxgehal.h b/sys/dev/vxge/vxgehal/vxgehal.h
index 46d534e1b99b..3a7b4e39edf1 100644
--- a/sys/dev/vxge/vxgehal/vxgehal.h
+++ b/sys/dev/vxge/vxgehal/vxgehal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/vxge/vxgell-version.h b/sys/dev/vxge/vxgell-version.h
index a311cb3dce62..d229d5f5cc81 100644
--- a/sys/dev/vxge/vxgell-version.h
+++ b/sys/dev/vxge/vxgell-version.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 44e2aaad1a33..f385f8158bba 100644
--- a/sys/dev/watchdog/watchdog.c
+++ b/sys/dev/watchdog/watchdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 2013 iXsystems.com,
* author: Alfred Perlstein <alfred@freebsd.org>
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index 80101e1e2823..ca66226dd898 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wb/if_wbreg.h b/sys/dev/wb/if_wbreg.h
index a1dd905ea4d5..16eb8a1cc2f8 100644
--- a/sys/dev/wb/if_wbreg.h
+++ b/sys/dev/wb/if_wbreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wbwd/wbwd.c b/sys/dev/wbwd/wbwd.c
index fd88aa9e248e..6216b15e0c94 100644
--- a/sys/dev/wbwd/wbwd.c
+++ b/sys/dev/wbwd/wbwd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Sandvine Incorporated ULC.
* Copyright (c) 2012 iXsystems, Inc.
* All rights reserved.
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index dd8a9883eda3..c2a8e1b2fd46 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_macio.c b/sys/dev/wi/if_wi_macio.c
index 96d2f9906fa4..6f25553af013 100644
--- a/sys/dev/wi/if_wi_macio.c
+++ b/sys/dev/wi/if_wi_macio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 22bd0d6f8dfa..82c1680bd08f 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index c347f2b3f0d3..0478a6d42b25 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 4bc504e3bb9d..d5e12cabe514 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index ce9a07ad61f2..55151fe9a43d 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002
* M Warner Losh <imp@freebsd.org>. All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/wtap/if_medium.c b/sys/dev/wtap/if_medium.c
index f4b84d3784de..74faa5b149d5 100644
--- a/sys/dev/wtap/if_medium.c
+++ b/sys/dev/wtap/if_medium.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/if_medium.h b/sys/dev/wtap/if_medium.h
index 03d6e2ffefc0..0650a5ee0efb 100644
--- a/sys/dev/wtap/if_medium.h
+++ b/sys/dev/wtap/if_medium.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index e9cb3d418fe8..96461298fcb7 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c
index 043e42ea74e1..c03293eafe3d 100644
--- a/sys/dev/wtap/if_wtap_module.c
+++ b/sys/dev/wtap/if_wtap_module.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/if_wtapioctl.h b/sys/dev/wtap/if_wtapioctl.h
index 5aabcacb0b2b..23d0f17adb00 100644
--- a/sys/dev/wtap/if_wtapioctl.h
+++ b/sys/dev/wtap/if_wtapioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h
index d081ecd358f4..a5cfd4946971 100644
--- a/sys/dev/wtap/if_wtapvar.h
+++ b/sys/dev/wtap/if_wtapvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c
index de94e710b262..82ce5e8a119e 100644
--- a/sys/dev/wtap/plugins/visibility.c
+++ b/sys/dev/wtap/plugins/visibility.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/plugins/visibility.h b/sys/dev/wtap/plugins/visibility.h
index 920c495fcf05..a5e84b06876c 100644
--- a/sys/dev/wtap/plugins/visibility.h
+++ b/sys/dev/wtap/plugins/visibility.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/plugins/visibility_ioctl.h b/sys/dev/wtap/plugins/visibility_ioctl.h
index 7c53fcd69c88..08760c6c5c07 100644
--- a/sys/dev/wtap/plugins/visibility_ioctl.h
+++ b/sys/dev/wtap/plugins/visibility_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/plugins/wtap_plugin.h b/sys/dev/wtap/plugins/wtap_plugin.h
index aa286e82accf..3ced37f7f761 100644
--- a/sys/dev/wtap/plugins/wtap_plugin.h
+++ b/sys/dev/wtap/plugins/wtap_plugin.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c
index b76fae1d6299..6014e3963a6d 100644
--- a/sys/dev/wtap/wtap_hal/hal.c
+++ b/sys/dev/wtap/wtap_hal/hal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/wtap_hal/hal.h b/sys/dev/wtap/wtap_hal/hal.h
index f03e92de4d23..f41aed9672b4 100644
--- a/sys/dev/wtap/wtap_hal/hal.h
+++ b/sys/dev/wtap/wtap_hal/hal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/wtap/wtap_hal/handler.h b/sys/dev/wtap/wtap_hal/handler.h
index 6ffc58af36ed..ef645fe2a94b 100644
--- a/sys/dev/wtap/wtap_hal/handler.h
+++ b/sys/dev/wtap/wtap_hal/handler.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
*
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 3cd050b70dca..e18af8ca2b2e 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
- *
* Copyright (c) 1998, 1999, 2003 Scott Mitchell
* All rights reserved.
*
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index ba6277d209c9..fb2cff608e0a 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Takeshi Shibagaki
* All rights reserved.
*
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index 820d10603efb..b81ae6b1f745 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Scott Mitchell
* All rights reserved.
*
diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h
index 57211dc47946..616b52c2e918 100644
--- a/sys/dev/xe/if_xevar.h
+++ b/sys/dev/xe/if_xevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998, 1999 Scott Mitchell
* All rights reserved.
*
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index bd7a013f8039..9c9735e5b24f 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2012 Spectra Logic Corporation
* All rights reserved.
*
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 45cabf43c44d..d5aa97e03b73 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
* Copyright (c) 2010 Justin T. Gibbs, Spectra Logic Corporation
* All rights reserved.
*
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 11b9d845234e..1e030138cdd3 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2011 Spectra Logic Corporation
* All rights reserved.
*
diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c
index bdb1a8c82706..79e7454879e6 100644
--- a/sys/dev/xen/netback/netback_unit_tests.c
+++ b/sys/dev/xen/netback/netback_unit_tests.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2011 Spectra Logic Corporation
* All rights reserved.
*
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index b972161a8b29..e7ce7b9f5769 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2006 Kip Macy
* Copyright (c) 2015 Wei Liu <wei.liu2@citrix.com>
* All rights reserved.
diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c
index ca445d10ede1..833e38bd7e2f 100644
--- a/sys/dev/xen/pcifront/pcifront.c
+++ b/sys/dev/xen/pcifront/pcifront.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2006, Cisco Systems, Inc.
* All rights reserved.
*
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index 465d978fbbb9..7acc8451d83d 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Adrian Chadd
* Copyright (c) 2012 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/dev/xen/timer/timer.h b/sys/dev/xen/timer/timer.h
index d618cae2bbad..38518cb394c6 100644
--- a/sys/dev/xen/timer/timer.h
+++ b/sys/dev/xen/timer/timer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
*
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index 4093c033c601..3a596b4a4f98 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008 Citrix Systems, Inc.
* All rights reserved.
*
diff --git a/sys/dev/xen/xenpci/xenpcivar.h b/sys/dev/xen/xenpci/xenpcivar.h
index ece80f18f159..45d12159ed09 100644
--- a/sys/dev/xen/xenpci/xenpcivar.h
+++ b/sys/dev/xen/xenpci/xenpcivar.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2008 Citrix Systems, Inc.
* All rights reserved.
*
diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
index 48b1962051db..4c1c238981d1 100644
--- a/sys/dev/xl/if_xl.c
+++ b/sys/dev/xl/if_xl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/xl/if_xlreg.h b/sys/dev/xl/if_xlreg.h
index 56d073a6e2e8..b27e038e2580 100644
--- a/sys/dev/xl/if_xlreg.h
+++ b/sys/dev/xl/if_xlreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c
index 77c853751beb..a5555c7ff3f9 100644
--- a/sys/dev/xl/xlphy.c
+++ b/sys/dev/xl/xlphy.c
@@ -1,8 +1,6 @@
/* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause
- *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 36c16487dd7c..3fa216c971ff 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 349a7d2bce61..274fb3e05c22 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_mount.h b/sys/fs/cd9660/cd9660_mount.h
index 83ae8ec2a0a7..f59dfc0c6875 100644
--- a/sys/fs/cd9660/cd9660_mount.h
+++ b/sys/fs/cd9660/cd9660_mount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 1b6a676f51dd..19d723e1e6e2 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 067202ff16d8..80e233e769be 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 1336981af100..a6880393c01c 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index 222f136ee801..f6fa050368d2 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 95a28f73efc6..fdce1dabe0ff 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index e79418db60ec..a55846403316 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 5c82bd6a22b9..b3ea48a04338 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 56693e20b425..a831d7b881c4 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 844131c50cd3..75c004c40b62 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index ddc0e1831bb2..c7de6afc34e6 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_alloc.c b/sys/fs/ext2fs/ext2_alloc.c
index 3ae306aeff2b..4ab370539d17 100644
--- a/sys/fs/ext2fs/ext2_alloc.c
+++ b/sys/fs/ext2fs/ext2_alloc.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_balloc.c b/sys/fs/ext2fs/ext2_balloc.c
index b4b570588e36..e2f4f84ceb65 100644
--- a/sys/fs/ext2fs/ext2_balloc.c
+++ b/sys/fs/ext2fs/ext2_balloc.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_bmap.c b/sys/fs/ext2fs/ext2_bmap.c
index 28c5ba90a46d..ef603dd7bc5f 100644
--- a/sys/fs/ext2fs/ext2_bmap.c
+++ b/sys/fs/ext2fs/ext2_bmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/fs/ext2fs/ext2_extern.h b/sys/fs/ext2fs/ext2_extern.h
index ce2f7c6cb43e..c981927e5cdb 100644
--- a/sys/fs/ext2fs/ext2_extern.h
+++ b/sys/fs/ext2fs/ext2_extern.h
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c
index 24c99c24e3fe..0157ea6caee5 100644
--- a/sys/fs/ext2fs/ext2_inode.c
+++ b/sys/fs/ext2fs/ext2_inode.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_lookup.c b/sys/fs/ext2fs/ext2_lookup.c
index 65b43f2b9bf4..64a835072904 100644
--- a/sys/fs/ext2fs/ext2_lookup.c
+++ b/sys/fs/ext2fs/ext2_lookup.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/fs/ext2fs/ext2_mount.h b/sys/fs/ext2fs/ext2_mount.h
index 0ce13021fd0e..4fc70b387362 100644
--- a/sys/fs/ext2fs/ext2_mount.h
+++ b/sys/fs/ext2fs/ext2_mount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_subr.c b/sys/fs/ext2fs/ext2_subr.c
index 7de82983b36c..bbd7d9ce58cd 100644
--- a/sys/fs/ext2fs/ext2_subr.c
+++ b/sys/fs/ext2fs/ext2_subr.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c
index 840311decb69..99ae4d60980c 100644
--- a/sys/fs/ext2fs/ext2_vfsops.c
+++ b/sys/fs/ext2fs/ext2_vfsops.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 8bb33474d7b9..01479a8aa1c2 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/fs/ext2fs/fs.h b/sys/fs/ext2fs/fs.h
index 6907cc27bb74..c69847867e40 100644
--- a/sys/fs/ext2fs/fs.h
+++ b/sys/fs/ext2fs/fs.h
@@ -5,8 +5,6 @@
* University of Utah, Department of Computer Science
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h
index 0cc5ec5d24eb..1468864b48cf 100644
--- a/sys/fs/ext2fs/inode.h
+++ b/sys/fs/ext2fs/inode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index b578b7309130..3d4cfb4e574d 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 2097ddcee4b1..f63eea35581c 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index d3117a595785..7d1d5288ba11 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 0bf56bb23e48..4c85d9d4ec2d 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1995
* The Regents of the University of California.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/sys/fs/fuse/fuse.h b/sys/fs/fuse/fuse.h
index 8275076f03d9..ef9d561e78da 100644
--- a/sys/fs/fuse/fuse.h
+++ b/sys/fs/fuse/fuse.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_debug.h b/sys/fs/fuse/fuse_debug.h
index 7876f2ec2d6d..254e15bff611 100644
--- a/sys/fs/fuse/fuse_debug.h
+++ b/sys/fs/fuse/fuse_debug.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c
index 0b851d424efd..53f0ceaee8c8 100644
--- a/sys/fs/fuse/fuse_device.c
+++ b/sys/fs/fuse/fuse_device.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_file.c b/sys/fs/fuse/fuse_file.c
index aa2f56144eb5..376e5f599b14 100644
--- a/sys/fs/fuse/fuse_file.c
+++ b/sys/fs/fuse/fuse_file.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_file.h b/sys/fs/fuse/fuse_file.h
index 0c84ee39c3ba..097cf18d43e6 100644
--- a/sys/fs/fuse/fuse_file.h
+++ b/sys/fs/fuse/fuse_file.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c
index b4fab5521bc3..4e0a163708ed 100644
--- a/sys/fs/fuse/fuse_internal.c
+++ b/sys/fs/fuse/fuse_internal.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_internal.h b/sys/fs/fuse/fuse_internal.h
index aeea9028125f..187245cbd907 100644
--- a/sys/fs/fuse/fuse_internal.h
+++ b/sys/fs/fuse/fuse_internal.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c
index 494ea52c3f71..1497220e7225 100644
--- a/sys/fs/fuse/fuse_io.c
+++ b/sys/fs/fuse/fuse_io.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_io.h b/sys/fs/fuse/fuse_io.h
index b59de06394a7..b56e14a6a779 100644
--- a/sys/fs/fuse/fuse_io.h
+++ b/sys/fs/fuse/fuse_io.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c
index 87104b5dac8c..376dab6b8ecd 100644
--- a/sys/fs/fuse/fuse_ipc.c
+++ b/sys/fs/fuse/fuse_ipc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h
index 49a14c2cc004..cd08969c61b7 100644
--- a/sys/fs/fuse/fuse_ipc.h
+++ b/sys/fs/fuse/fuse_ipc.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_kernel.h b/sys/fs/fuse/fuse_kernel.h
index ccaee2e0e472..07cd4a999588 100644
--- a/sys/fs/fuse/fuse_kernel.h
+++ b/sys/fs/fuse/fuse_kernel.h
@@ -1,4 +1,4 @@
-/*--
+/*-
* This file defines the kernel interface of FUSE
* Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
*
diff --git a/sys/fs/fuse/fuse_main.c b/sys/fs/fuse/fuse_main.c
index fe38085d5606..d09e1c394515 100644
--- a/sys/fs/fuse/fuse_main.c
+++ b/sys/fs/fuse/fuse_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc.
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c
index 25d8be16d2e9..1ba95992385d 100644
--- a/sys/fs/fuse/fuse_node.c
+++ b/sys/fs/fuse/fuse_node.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_node.h b/sys/fs/fuse/fuse_node.h
index bb80be5378ed..dcdc9ff20100 100644
--- a/sys/fs/fuse/fuse_node.h
+++ b/sys/fs/fuse/fuse_node.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_param.h b/sys/fs/fuse/fuse_param.h
index 1ba68f9e0463..493c3859aaf2 100644
--- a/sys/fs/fuse/fuse_param.h
+++ b/sys/fs/fuse/fuse_param.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c
index 700d4450c2e7..0a3337303d9f 100644
--- a/sys/fs/fuse/fuse_vfsops.c
+++ b/sys/fs/fuse/fuse_vfsops.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 3cb6ceca985e..36ea4cf91077 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Google Inc. and Amit Singh
* All rights reserved.
*
diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h
index 941efc1cbdef..066b6a70baf1 100644
--- a/sys/fs/nfs/nfs.h
+++ b/sys/fs/nfs/nfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index 39c9d634d2b1..11fcd623dacc 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index 3a184159e0f9..376c837c8eac 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 867f150485a8..ade5436dc211 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index 609a49f52195..1db88d69344b 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h
index f582afe37deb..5f102d357914 100644
--- a/sys/fs/nfs/nfsm_subs.h
+++ b/sys/fs/nfs/nfsm_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h
index 1bbab2da7daa..16c578bad195 100644
--- a/sys/fs/nfs/nfsport.h
+++ b/sys/fs/nfs/nfsport.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 948500ed668a..136f6dd1409e 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/nfsrvcache.h b/sys/fs/nfs/nfsrvcache.h
index 5bf3fd5a7026..119a68dc1094 100644
--- a/sys/fs/nfs/nfsrvcache.h
+++ b/sys/fs/nfs/nfsrvcache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/rpcv2.h b/sys/fs/nfs/rpcv2.h
index 7b3a999d4608..d2174ac722cd 100644
--- a/sys/fs/nfs/rpcv2.h
+++ b/sys/fs/nfs/rpcv2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfs/xdr_subs.h b/sys/fs/nfs/xdr_subs.h
index 9b65cd90709e..a3e69f966976 100644
--- a/sys/fs/nfs/xdr_subs.h
+++ b/sys/fs/nfs/xdr_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs.h b/sys/fs/nfsclient/nfs.h
index e46411d0494a..e05e55373427 100644
--- a/sys/fs/nfsclient/nfs.h
+++ b/sys/fs/nfsclient/nfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c
index c924ebd1bb83..69cda19b0502 100644
--- a/sys/fs/nfsclient/nfs_clbio.c
+++ b/sys/fs/nfsclient/nfs_clbio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clcomsubs.c b/sys/fs/nfsclient/nfs_clcomsubs.c
index b8c8ce46aed4..82c4fc468431 100644
--- a/sys/fs/nfsclient/nfs_clcomsubs.c
+++ b/sys/fs/nfsclient/nfs_clcomsubs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clkrpc.c b/sys/fs/nfsclient/nfs_clkrpc.c
index 22ddee7d6f07..d60370c18445 100644
--- a/sys/fs/nfsclient/nfs_clkrpc.c
+++ b/sys/fs/nfsclient/nfs_clkrpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clnfsiod.c b/sys/fs/nfsclient/nfs_clnfsiod.c
index 024c8aab70a2..25ff694aa469 100644
--- a/sys/fs/nfsclient/nfs_clnfsiod.c
+++ b/sys/fs/nfsclient/nfs_clnfsiod.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c
index 830848a2dd49..87d6d6110715 100644
--- a/sys/fs/nfsclient/nfs_clnode.c
+++ b/sys/fs/nfsclient/nfs_clnode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c
index f4b9c0c1c82d..aea87b6441f3 100644
--- a/sys/fs/nfsclient/nfs_clport.c
+++ b/sys/fs/nfsclient/nfs_clport.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 9bfd044e665b..373e1c98a4f7 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c
index 7212494489f9..352e0fe8d69a 100644
--- a/sys/fs/nfsclient/nfs_clsubs.c
+++ b/sys/fs/nfsclient/nfs_clsubs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index 9e9d9f0f63a5..0e424885ac87 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c
index 86239577e2f8..5a6f2228db11 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h
index 3a41d13f635b..370dbc45b60f 100644
--- a/sys/fs/nfsclient/nfsmount.h
+++ b/sys/fs/nfsclient/nfsmount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h
index c7e5f81db07f..1bb06f2894b7 100644
--- a/sys/fs/nfsclient/nfsnode.h
+++ b/sys/fs/nfsclient/nfsnode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdcache.c b/sys/fs/nfsserver/nfs_nfsdcache.c
index 08e29fd21ee8..0b7bf8f3e1fb 100644
--- a/sys/fs/nfsserver/nfs_nfsdcache.c
+++ b/sys/fs/nfsserver/nfs_nfsdcache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c
index c9b5cf0f714a..fc34969b9596 100644
--- a/sys/fs/nfsserver/nfs_nfsdkrpc.c
+++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index 9fd3eb78c566..49e9a22a3e74 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 68d59aebc6c3..d47a74c8e826 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c
index c079ef6ce989..f45bba4986d3 100644
--- a/sys/fs/nfsserver/nfs_nfsdsocket.c
+++ b/sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c
index 0dc2a81804ef..eafaa58fe41a 100644
--- a/sys/fs/nfsserver/nfs_nfsdsubs.c
+++ b/sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 5bda76a1514e..0972dfc409c3 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index adf7abf34dec..39aa68970883 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 36b19ba3d150..87b89da19988 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 55f216d40ee1..4ee6b4546c08 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c
index c3ae1f60f7af..a41e7d1ba1b8 100644
--- a/sys/fs/procfs/procfs.c
+++ b/sys/fs/procfs/procfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Dag-Erling Smørgrav
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 62c4a1d93f06..259822451b0d 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index bd81decf55ca..1598443bce90 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Brian Scott Dean, brdean@unx.sas.com.
* All rights reserved.
*
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 7b00084c019a..d2f01535eb57 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 605fef98cac9..9fb46383c92f 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 8889697527a6..d4a789635b01 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993 Sean Eric Fagan
* Copyright (c) 1993
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index abf6d887d69d..16c917e78795 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_osrel.c b/sys/fs/procfs/procfs_osrel.c
index 7d7ebb711594..d32bd6d537d2 100644
--- a/sys/fs/procfs/procfs_osrel.c
+++ b/sys/fs/procfs/procfs_osrel.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Konstantin Belousov
* All rights reserved.
*
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index f12559479b11..3f784782d897 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 8e16b8939e6c..3885f566f6ea 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1999 Adrian Chadd
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 3dbd1ee08486..defdec39ca72 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index 5ed664e9fc9b..80cecc5c0179 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index af3a972dede5..38820595c706 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 The Regents of the University of California.
* Copyright (c) 1994 Jan-Simon Pendry.
* Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc.
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index de1e73701c7f..6f53473e778e 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Jan-Simon Pendry
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 5912281697e9..2ba4f06206fe 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994, 1995 The Regents of the University of California.
* Copyright (c) 1994, 1995 Jan-Simon Pendry.
* Copyright (c) 2005, 2006, 2012 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc.
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 3766dc8cbad6..16cc438a2205 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 1994, 1995 Jan-Simon Pendry.
* Copyright (c) 1992, 1993, 1994, 1995
* The Regents of the University of California.
diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index 5ca245a40554..eb70c28bcc63 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 1997, 1998, 1999
* Nan Yang Computer Services Limited. All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index 6e65a65f3389..a2642c29ece7 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index ee4e30ba53d1..350661c73236 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 1997, 1998, 1999
* Nan Yang Computer Services Limited. All rights reserved.
@@ -9,7 +7,7 @@
* Parts written by Greg Lehey.
*
* This software is distributed under the so-called ``Berkeley
- * License'': *
+ * License'': *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index b0c4680f15a5..4c79691dbeee 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 5b82df87e980..ef1ba426b141 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index 26d853dfeb58..1b4ff7eaa693 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Peter Jeremy
* All rights reserved.
*
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 9fd52007793f..6502749a2cef 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/sys/i386/i386/bpf_jit_machdep.c b/sys/i386/i386/bpf_jit_machdep.c
index 979f9d1fdf88..e0aaf018cc4e 100644
--- a/sys/i386/i386/bpf_jit_machdep.c
+++ b/sys/i386/i386/bpf_jit_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/i386/i386/bpf_jit_machdep.h b/sys/i386/i386/bpf_jit_machdep.h
index 909d1c2ef55f..4ae5494a72aa 100644
--- a/sys/i386/i386/bpf_jit_machdep.h
+++ b/sys/i386/i386/bpf_jit_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index a69776ae2d09..fcac38a00b48 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c
index d501b847fda9..06809ad2a4b8 100644
--- a/sys/i386/i386/gdb_machdep.c
+++ b/sys/i386/i386/gdb_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index b4a52001ea9e..c4c61ed3ac90 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index c5a2b8e533d0..86dc734ea6f2 100644
--- a/sys/i386/i386/geode.c
+++ b/sys/i386/i386/geode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index a80e2ffd577b..7008365eeb80 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index bde411b5122f..ce861338973a 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) KATO Takenori, 1997, 1998.
*
* All rights reserved. Unpublished rights reserved under the copyright
diff --git a/sys/i386/i386/io.c b/sys/i386/i386/io.c
index 7cc9179d4472..152f6b1dc5e6 100644
--- a/sys/i386/i386/io.c
+++ b/sys/i386/i386/io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index 2968518ee534..091b189a3ea5 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Brian Fundakowski Feldman
* All rights reserved.
*
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index d298ba06bacf..08fe3b1b27b1 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 Tamotsu Hattori.
* Copyright (c) 2001 Mitsuru IWASAKI.
* All rights reserved.
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 2dabb9dc6be7..cd41673079f0 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index f5cc84a2f7f5..accd092f1c57 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/i386/i386/minidump_machdep.c b/sys/i386/i386/minidump_machdep.c
index 16fb506256f7..6fd11f3721ac 100644
--- a/sys/i386/i386/minidump_machdep.c
+++ b/sys/i386/i386/minidump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 3165919d7a8e..ddfe57fc9bc8 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
*
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 00c97dd90fbc..4fa4dd318e62 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c
index 5dbaa5811ff4..7ab685c5ea35 100644
--- a/sys/i386/i386/ptrace_machdep.c
+++ b/sys/i386/i386/ptrace_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 1bb2948c2542..a2beccfecc4f 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 7aa085f37d0a..38bddf6477e3 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
index 8ebb27ad7f40..5e857db0a801 100644
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index be9b038c6514..0db839bb66b0 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 83ec4229ec58..1865fa215fc9 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index d99112544cb7..552751575fb4 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_dirent.h b/sys/i386/ibcs2/ibcs2_dirent.h
index 1d28797e5f43..918adf1adc8e 100644
--- a/sys/i386/ibcs2/ibcs2_dirent.h
+++ b/sys/i386/ibcs2/ibcs2_dirent.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_errno.c b/sys/i386/ibcs2/ibcs2_errno.c
index 6511ac59e1c1..c3b385af49b5 100644
--- a/sys/i386/ibcs2/ibcs2_errno.c
+++ b/sys/i386/ibcs2/ibcs2_errno.c
@@ -1,7 +1,5 @@
/*-
* ibcs2_errno.c
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_errno.h b/sys/i386/ibcs2/ibcs2_errno.h
index 0ef1adf1637c..1e38f40ef4ba 100644
--- a/sys/i386/ibcs2/ibcs2_errno.h
+++ b/sys/i386/ibcs2/ibcs2_errno.h
@@ -1,7 +1,5 @@
/*-
* ibcs2_errno.h
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 391568210555..5d06d4d32e9b 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.h b/sys/i386/ibcs2/ibcs2_fcntl.h
index ee12d2a6aea3..75a2b62e3836 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.h
+++ b/sys/i386/ibcs2/ibcs2_fcntl.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 75352a51e248..3275303a9109 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -1,8 +1,6 @@
/* $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.
*
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 0ecfe20c1004..4bf3dd1de389 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index e6de18b48804..9f35e67c9ec2 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.h
+++ b/sys/i386/ibcs2/ibcs2_ipc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index 04480548603e..5b25c12e3983 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1995 Steven Wallace
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 637aa54ae129..6044d62764d5 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Steven Wallace
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1992, 1993
diff --git a/sys/i386/ibcs2/ibcs2_mount.h b/sys/i386/ibcs2/ibcs2_mount.h
index 050511ac55d2..67161482c114 100644
--- a/sys/i386/ibcs2/ibcs2_mount.h
+++ b/sys/i386/ibcs2/ibcs2_mount.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 4e47adc0b290..0492beff74eb 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index f6e08be0f7d8..80f3c5ac17ef 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 1e3a6f446738..4c17aa9bc977 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_signal.h b/sys/i386/ibcs2/ibcs2_signal.h
index 6d47b63722bc..59070aa0640f 100644
--- a/sys/i386/ibcs2/ibcs2_signal.h
+++ b/sys/i386/ibcs2/ibcs2_signal.h
@@ -1,8 +1,6 @@
/* $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.
*
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index a11a4b9f6688..3b5a7e53551d 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index b403063fedce..533a4827b8d9 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 4f0a073e6a99..115c2ae2ac29 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_stat.h b/sys/i386/ibcs2/ibcs2_stat.h
index e22143a7b57c..1ab76fb97e47 100644
--- a/sys/i386/ibcs2/ibcs2_stat.h
+++ b/sys/i386/ibcs2/ibcs2_stat.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_statfs.h b/sys/i386/ibcs2/ibcs2_statfs.h
index b5fd047213c4..51eb84413fd8 100644
--- a/sys/i386/ibcs2/ibcs2_statfs.h
+++ b/sys/i386/ibcs2/ibcs2_statfs.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_stropts.h b/sys/i386/ibcs2/ibcs2_stropts.h
index d05d6932b92b..7623da353120 100644
--- a/sys/i386/ibcs2/ibcs2_stropts.h
+++ b/sys/i386/ibcs2/ibcs2_stropts.h
@@ -1,7 +1,5 @@
/*-
* ibcs2_stropts.h
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 7dae55ca2fab..17964af5a7b0 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index c254a37cff96..83482f2af6d9 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_termios.h b/sys/i386/ibcs2/ibcs2_termios.h
index 3f956eca430e..bce259fcb374 100644
--- a/sys/i386/ibcs2/ibcs2_termios.h
+++ b/sys/i386/ibcs2/ibcs2_termios.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_time.h b/sys/i386/ibcs2/ibcs2_time.h
index 7ba81a3a1c35..15b23fa587b2 100644
--- a/sys/i386/ibcs2/ibcs2_time.h
+++ b/sys/i386/ibcs2/ibcs2_time.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_types.h b/sys/i386/ibcs2/ibcs2_types.h
index e3e03267dab0..f80a83c6cc7b 100644
--- a/sys/i386/ibcs2/ibcs2_types.h
+++ b/sys/i386/ibcs2/ibcs2_types.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_unistd.h b/sys/i386/ibcs2/ibcs2_unistd.h
index 68eb03136692..77e5afd2738e 100644
--- a/sys/i386/ibcs2/ibcs2_unistd.h
+++ b/sys/i386/ibcs2/ibcs2_unistd.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_ustat.h b/sys/i386/ibcs2/ibcs2_ustat.h
index ef853bf3bfa4..19af5bb638c8 100644
--- a/sys/i386/ibcs2/ibcs2_ustat.h
+++ b/sys/i386/ibcs2/ibcs2_ustat.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 2a040183af88..d63a640f92b3 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h
index 226d923c439a..be43fa6f4be6 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_utime.h b/sys/i386/ibcs2/ibcs2_utime.h
index d2c06862a923..b0a43498188f 100644
--- a/sys/i386/ibcs2/ibcs2_utime.h
+++ b/sys/i386/ibcs2/ibcs2_utime.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_utsname.h b/sys/i386/ibcs2/ibcs2_utsname.h
index fe9a6a040203..748c17b4c696 100644
--- a/sys/i386/ibcs2/ibcs2_utsname.h
+++ b/sys/i386/ibcs2/ibcs2_utsname.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 6e417386cb06..829f6abba814 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index ef2d3af9e00b..3a5611df0daa 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h
index 2f0b84220b53..49bdd5a30757 100644
--- a/sys/i386/include/_bus.h
+++ b/sys/i386/include/_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 85dbe79a9586..b2d4a6b28902 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index c22f980f6418..e7ddf134e4d3 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 8e068162be74..13d2f4da17b4 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 71cc5dc4a348..ef595d5f52be 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon 97222
* All rights reserved.
*
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 8b55695f8593..95e98a7e43c2 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
diff --git a/sys/i386/include/counter.h b/sys/i386/include/counter.h
index 4b83b10f983d..73b49cefc5be 100644
--- a/sys/i386/include/counter.h
+++ b/sys/i386/include/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 4b500d70501b..e0662450d039 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index e9d4abba8b9c..23be5a3cdd00 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index a5c4e4ccdbc2..02af4f14d631 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sys/i386/include/elan_mmcr.h b/sys/i386/include/elan_mmcr.h
index a337d8383922..a02d4b2c90ff 100644
--- a/sys/i386/include/elan_mmcr.h
+++ b/sys/i386/include/elan_mmcr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 John Birrell
* All rights reserved.
*
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 34c06e3ee278..8d07887be252 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index b7c154743d0c..cda9e46230ca 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h
index 2036323bb0d0..a60ba18d0448 100644
--- a/sys/i386/include/gdb_machdep.h
+++ b/sys/i386/include/gdb_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index 9ece4e968c7b..c676c4541831 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 Andrew Moore, Talke Studio
* All rights reserved.
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index 44d3e3f032ab..c91768131394 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,7 +1,5 @@
/* $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:
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index 360b324aac62..8816f3c8ddea 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h
index 17d54c4ccd3b..a8dd45642f94 100644
--- a/sys/i386/include/intr_machdep.h
+++ b/sys/i386/include/intr_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index 1d137071211c..ca83a36cdb5a 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David O'Brien
* All rights reserved.
*
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h
index 377d8257164b..0322f1ede2c1 100644
--- a/sys/i386/include/ioctl_meteor.h
+++ b/sys/i386/include/ioctl_meteor.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 David O'Brien
* All rights reserved.
*
diff --git a/sys/i386/include/iodev.h b/sys/i386/include/iodev.h
index 5aced158609e..9f53cacff001 100644
--- a/sys/i386/include/iodev.h
+++ b/sys/i386/include/iodev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/i386/include/kdb.h b/sys/i386/include/kdb.h
index beb2bd0e4132..1b407cbc5e7d 100644
--- a/sys/i386/include/kdb.h
+++ b/sys/i386/include/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index 8d437add22d2..35eea1f619de 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 63a6232614b8..2347f73487de 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h
index 41e34da79264..649b5576f306 100644
--- a/sys/i386/include/memdev.h
+++ b/sys/i386/include/memdev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/i386/include/minidump.h b/sys/i386/include/minidump.h
index 341ec0892a53..55508a370e70 100644
--- a/sys/i386/include/minidump.h
+++ b/sys/i386/include/minidump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/i386/include/mp_watchdog.h b/sys/i386/include/mp_watchdog.h
index e1fc0742ee1e..bcec051a942f 100644
--- a/sys/i386/include/mp_watchdog.h
+++ b/sys/i386/include/mp_watchdog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index d3b92aef1acc..05572285cde2 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index e493db2482c1..f7968f830800 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index a3fe8d54368e..355dc615ecd0 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index 0802fcf6cb14..c67d866cd944 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 39c053de7171..558565b872cb 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 850b5e532e22..81e1bed513b4 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index fbbbc40df243..1ec6f580ea0f 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) Peter Wemm
* All rights reserved.
*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index e0ba0f639236..6e417d95839d 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
index 0f52cc6fcfea..ff057cec166a 100644
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h
index 9794504da499..5774757ce67a 100644
--- a/sys/i386/include/ppireg.h
+++ b/sys/i386/include/ppireg.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index de2968e20100..8fe7a6cdc254 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index aead6e01746e..d4db0c9d829d 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 690802a075d3..188319323399 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index ba21b9ab4316..e906fa192c6c 100644
--- a/sys/i386/include/runq.h
+++ b/sys/i386/include/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 5b24d0fe895c..635dffc48f34 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1990 William F. Jolitz
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/i386/include/sf_buf.h b/sys/i386/include/sf_buf.h
index e66bf4cbe185..f1f1cd3ee243 100644
--- a/sys/i386/include/sf_buf.h
+++ b/sys/i386/include/sf_buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index 922100edb3ad..8de466452e47 100644
--- a/sys/i386/include/sigframe.h
+++ b/sys/i386/include/sigframe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index f5c6983dc5ea..26c1ee636383 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/i386/include/smapi.h b/sys/i386/include/smapi.h
index 72edd9202d19..63b9927016b2 100644
--- a/sys/i386/include/smapi.h
+++ b/sys/i386/include/smapi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Matthew N. Dodd <winter@freebsd.org>
* All rights reserved.
*
diff --git a/sys/i386/include/timerreg.h b/sys/i386/include/timerreg.h
index 77e6cad5775d..cf5f281c0aa1 100644
--- a/sys/i386/include/timerreg.h
+++ b/sys/i386/include/timerreg.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index c672f4362ec1..29907d420498 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h
index 6a72e568c9cd..fe21b3462665 100644
--- a/sys/i386/include/ucontext.h
+++ b/sys/i386/include/ucontext.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index 7d1524b4e55f..a71b2ffc8a04 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/i386/include/vm.h b/sys/i386/include/vm.h
index 2e9c30da9936..22d2ecafe211 100644
--- a/sys/i386/include/vm.h
+++ b/sys/i386/include/vm.h
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 42e8516c4274..2253d5c504cd 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 1361b26add7c..987ac624abab 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index 36def7034af5..5a053f12c94e 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.h
@@ -1,7 +1,5 @@
/* $NetBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* [NetBSD for NEC PC98 series]
* Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
* All rights reserved.
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index d226e8a71ac8..e3e4755dee99 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 1ab9065a3323..9b27088e7899 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/i386/isa/pmtimer.c b/sys/i386/isa/pmtimer.c
index ceba1d7807eb..b5a030266db0 100644
--- a/sys/i386/isa/pmtimer.c
+++ b/sys/i386/isa/pmtimer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 430e10cc5334..bdcd7e427d06 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 042f9758ff6b..9363b474b7cc 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
@@ -11,22 +9,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 471e295bf617..c483350483c6 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
@@ -8,22 +6,25 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
* $FreeBSD$
*/
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 93801925890b..1867cfebdd2c 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
@@ -8,22 +6,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 01cca331bef8..36e8df204334 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
*
@@ -8,22 +6,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index 5614772bab75..a4b39b37aeb1 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexander Kabaev
* All rights reserved.
*
@@ -8,22 +6,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 8756be2f5916..7b1b35f4caf5 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
@@ -8,22 +6,24 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index d3e5439fdbcd..288bcb9dd8fd 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index a2d73f77ff8a..6aeaae3502be 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 7410ddd796ec..c959d74128d0 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h
index 955fd4996b4e..abd181198d41 100644
--- a/sys/isa/pnpreg.h
+++ b/sys/isa/pnpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, Sujal M. Patel
* All rights reserved.
*
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index d84c2b072485..71e7ae8011e8 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 41502434f1cb..2599ff4ce7a4 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Terrence R. Lambert
* All rights reserved.
*
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 5e8e3d76cdad..035251d332c2 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 94ed4a07d0ec..8d11e940942b 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_cons.c b/sys/kern/kern_cons.c
index 3c139a2bd278..d219c81f7dc7 100644
--- a/sys/kern/kern_cons.c
+++ b/sys/kern/kern_cons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1991 The Regents of the University of California.
* Copyright (c) 1999 Michael Smith
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index f6cbd42c7902..e194eb27598d 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 1e2c8c83f26d..6c8fb3eb2418 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 851b345bcfd9..e165ed5200ab 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 8623f11972c8..0d76d5b80062 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index a9cdd0320b12..fdffd83a0e1c 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 527fa328ed85..410a971e968e 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1991, 1993
* The Regents of the University of California.
* Copyright (c) 2005-2009 Robert N. M. Watson
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 8ae2fd0227b8..2851d9abe8ad 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index ed910f2cc1e6..9947fbd6007f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index fe28a55b5614..9e210d3d9599 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
* The Regents of the University of California.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index ea07fb6a4720..d7eda134450f 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c
index 1e678b832a8d..7af547b3a5dc 100644
--- a/sys/kern/kern_rmlock.c
+++ b/sys/kern/kern_rmlock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Stephan Uphoff <ups@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 29941cac74db..f30e43600422 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 85e26630b109..ae8357d72748 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index ad7102f6a03a..dbdf0302862e 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 963247db3912..5e116a086c35 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index e0ad6b6a8859..b2e9f9c189f2 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 767b23fd564c..a3c7b8b2da27 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index b04b2103e361..65b1a3552b2b 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c
index bf03a46315c2..27aea72a3e94 100644
--- a/sys/kern/ksched.c
+++ b/sys/kern/ksched.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c
index 09788936644b..ac6cd60a5d6e 100644
--- a/sys/kern/p1003_1b.c
+++ b/sys/kern/p1003_1b.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997, 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/posix4_mib.c b/sys/kern/posix4_mib.c
index f95b1be832ed..a4d7951305d7 100644
--- a/sys/kern/posix4_mib.c
+++ b/sys/kern/posix4_mib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 656888ccac83..81dc31444038 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index ee01750783dc..53fad8111bab 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 62632e01da7f..eb2011cb33eb 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Matthew Dillon. All Rights Reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index 7595c320ed24..f58166f6170e 100644
--- a/sys/kern/subr_clock.c
+++ b/sys/kern/subr_clock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/kern/subr_hash.c b/sys/kern/subr_hash.c
index b61f2baddc9a..2aae04359b05 100644
--- a/sys/kern/subr_hash.c
+++ b/sys/kern/subr_hash.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index c50ff9302d41..1e6127425d57 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index b4505c356ff5..21220ca938de 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000, 2001 Boris Popov
* All rights reserved.
*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 75361da43700..8c147a8cf4ea 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c
index b88caa92e7ba..fbfa1a647471 100644
--- a/sys/kern/subr_pcpu.c
+++ b/sys/kern/subr_pcpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Wind River Systems, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 5d5ca44a99de..576c4199a91a 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 761511ecfa8d..56b17f5c4c21 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/subr_rtc.c b/sys/kern/subr_rtc.c
index d45709dd7ee5..0dfc4eeb3bdc 100644
--- a/sys/kern/subr_rtc.c
+++ b/sys/kern/subr_rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California.
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 9987980e01c1..806ca4ff75cc 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/subr_sglist.c b/sys/kern/subr_sglist.c
index 94307905bf67..0d371a48ded3 100644
--- a/sys/kern/subr_sglist.c
+++ b/sys/kern/subr_sglist.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index 25b4ba89e5fb..f720914cea98 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index be0c01363cd9..1c9db438f7a1 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c
index 5e33f496a95f..c00a9017bc73 100644
--- a/sys/kern/subr_uio.c
+++ b/sys/kern/subr_uio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c73e4b29c226..60e628f660b6 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 82e226fecb78..edc64aac8043 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 221690c3e265..6dce01d0b6d6 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/tty_info.c b/sys/kern/tty_info.c
index 5eca2905e328..6849d0b06ed1 100644
--- a/sys/kern/tty_info.c
+++ b/sys/kern/tty_info.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index c014a268ef1b..a80b974c1aaf 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 6b34ffc9937f..5f103eb6c583 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 2b7bb4740852..8b7f4fdd516c 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -2,8 +2,6 @@
/* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 513cf3d0b336..547238ff43d7 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 0740af7835b1..15ca984393d9 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California.
* Copyright (c) 2004 The FreeBSD Foundation
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 542bb5ae5081..72ca38a226d7 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a9faf1a3b481..0ff3540e846a 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California.
* Copyright (c) 2004-2009 Robert N. M. Watson
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index b0a5875f98e7..586aaeef443f 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 8214134e5232..f6be7a7e53dc 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Modifications/enhancements:
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 5f8225d44086..78e9565bb6b7 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 13f242627c7a..ad43a23a23c5 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 380ed20bf479..9ac193a9ebd5 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 49fa8ed6af48..80f23db75640 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 61118313493b..195e82b2572e 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2004 Poul-Henning Kamp
* Copyright (c) 1999 Michael Smith
* Copyright (c) 1989, 1993
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c
index b7b4b9c0f8eb..cdfb9f0647a2 100644
--- a/sys/kern/vfs_mountroot.c
+++ b/sys/kern/vfs_mountroot.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010 Marcel Moolenaar
* Copyright (c) 1999-2004 Poul-Henning Kamp
* Copyright (c) 1999 Michael Smith
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 0b603f32aa6e..8ef878ee9cf4 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index e5bb4d9c935b..52a41fed192c 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 12cbe3154782..f8a41bf2307a 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/libkern/arm/muldi3.c b/sys/libkern/arm/muldi3.c
index b7a6d1099f2d..8cdb478be9b6 100644
--- a/sys/libkern/arm/muldi3.c
+++ b/sys/libkern/arm/muldi3.c
@@ -1,8 +1,6 @@
/* $NetBSD: muldi3.c,v 1.8 2003/08/07 16:32:09 agc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 6d9f8f7b282a..4ad69745c21a 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index f42c521edf02..1eab1d60d99f 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index f0b534780fa5..cd00ba9e6b52 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/bsearch.c b/sys/libkern/bsearch.c
index 5043c0206aff..cbac2fb762b2 100644
--- a/sys/libkern/bsearch.c
+++ b/sys/libkern/bsearch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index b7267b4275ba..9a2b5e3f4fbc 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index ff9c41dcb804..27b1cf0a0429 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 4dfc7fbab67b..6bd9c7c928b6 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/ffsl.c b/sys/libkern/ffsl.c
index 0ebf3207e663..a0278b1117b8 100644
--- a/sys/libkern/ffsl.c
+++ b/sys/libkern/ffsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/fls.c b/sys/libkern/fls.c
index 57b7abe19f4e..46b7481826ea 100644
--- a/sys/libkern/fls.c
+++ b/sys/libkern/fls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/flsl.c b/sys/libkern/flsl.c
index 08808455862b..04c3f4fe16ab 100644
--- a/sys/libkern/flsl.c
+++ b/sys/libkern/flsl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/flsll.c b/sys/libkern/flsll.c
index cb30d0bd5551..ed5ec9200033 100644
--- a/sys/libkern/flsll.c
+++ b/sys/libkern/flsll.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/fnmatch.c b/sys/libkern/fnmatch.c
index 9ae236bebb9c..5e7bda6ecec9 100644
--- a/sys/libkern/fnmatch.c
+++ b/sys/libkern/fnmatch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index 122c706399e9..470139419653 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index 4b2491b5159a..e26f6fab3428 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/memchr.c b/sys/libkern/memchr.c
index a615f21f7dac..a00ea6d40912 100644
--- a/sys/libkern/memchr.c
+++ b/sys/libkern/memchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/memcmp.c b/sys/libkern/memcmp.c
index c10645f31006..6a6e69cb614f 100644
--- a/sys/libkern/memcmp.c
+++ b/sys/libkern/memcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index b228654ba43e..050d47e255be 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index 0963486d2387..b4cc91f1cff2 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index c645f0767522..9c83f608d430 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index fc4ca32f5aa0..4850d89cb7cb 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 9c580fee2030..22a14ef5021f 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 3b8ce57f1ee1..a7800d0eeb55 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strcasecmp.c b/sys/libkern/strcasecmp.c
index cfa2d8ed9a59..a7bba221d02d 100644
--- a/sys/libkern/strcasecmp.c
+++ b/sys/libkern/strcasecmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 0b6638bac372..13738f97e26c 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strchr.c b/sys/libkern/strchr.c
index a7049e230465..6ee479833890 100644
--- a/sys/libkern/strchr.c
+++ b/sys/libkern/strchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 3a90e0f630f5..43a06d9be587 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 51de8a1ba5c9..4b902c281b23 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index 17e81bf5cef8..268ffbe4fe77 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index fd523584ef02..d4d0964317ba 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strrchr.c b/sys/libkern/strrchr.c
index 78ef6796564b..6ff7eb45b943 100644
--- a/sys/libkern/strrchr.c
+++ b/sys/libkern/strrchr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strsep.c b/sys/libkern/strsep.c
index e9fab7f7bfa3..46122697e8bb 100644
--- a/sys/libkern/strsep.c
+++ b/sys/libkern/strsep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strstr.c b/sys/libkern/strstr.c
index 228e7525528e..12c2a9189aab 100644
--- a/sys/libkern/strstr.c
+++ b/sys/libkern/strstr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strtol.c b/sys/libkern/strtol.c
index 4523eb2ad01c..ea7dd5567285 100644
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strtoq.c b/sys/libkern/strtoq.c
index 759910c0a226..e83adb1f0e35 100644
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strtoul.c b/sys/libkern/strtoul.c
index d5ae6de0d5d2..44adf5a30118 100644
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strtouq.c b/sys/libkern/strtouq.c
index 4c89339cba9f..49c3750b2a8a 100644
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index e07c7343ccda..cd41c697014f 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index d3019e54d7f9..71c9272364d8 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index 2fdc6ec3ddba..e3776413722c 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c
index b1c1e3a273a4..2713618607eb 100644
--- a/sys/mips/adm5120/adm5120_machdep.c
+++ b/sys/mips/adm5120/adm5120_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/adm5120/adm5120reg.h b/sys/mips/adm5120/adm5120reg.h
index ce8a4d5b7bd9..2f15e4675233 100644
--- a/sys/mips/adm5120/adm5120reg.h
+++ b/sys/mips/adm5120/adm5120reg.h
@@ -1,8 +1,6 @@
/* $NetBSD: adm5120reg.h,v 1.1 2007/03/20 08:52:03 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
index b1d6efa69785..0fb0b54ca5cd 100644
--- a/sys/mips/adm5120/admpci.c
+++ b/sys/mips/adm5120/admpci.c
@@ -1,8 +1,6 @@
/* $NetBSD: admpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 David Young. All rights reserved.
*
* Redistribution and use in source and binary forms, with or
diff --git a/sys/mips/adm5120/console.c b/sys/mips/adm5120/console.c
index 89495c3954c4..20cd53dfccba 100644
--- a/sys/mips/adm5120/console.c
+++ b/sys/mips/adm5120/console.c
@@ -1,8 +1,6 @@
/* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c
index 545b9e5d5550..65f522fff8de 100644
--- a/sys/mips/adm5120/if_admsw.c
+++ b/sys/mips/adm5120/if_admsw.c
@@ -1,8 +1,6 @@
/* $NetBSD: if_admsw.c,v 1.3 2007/04/22 19:26:25 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/if_admswreg.h b/sys/mips/adm5120/if_admswreg.h
index 28ec5156a2cf..a4cfa338e06b 100644
--- a/sys/mips/adm5120/if_admswreg.h
+++ b/sys/mips/adm5120/if_admswreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: if_admswreg.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/if_admswvar.h b/sys/mips/adm5120/if_admswvar.h
index d7d341ade4e5..1304fac4dd02 100644
--- a/sys/mips/adm5120/if_admswvar.h
+++ b/sys/mips/adm5120/if_admswvar.h
@@ -1,8 +1,6 @@
/* $NetBSD: if_admswvar.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c
index a52b405c7f14..90216c19349f 100644
--- a/sys/mips/adm5120/obio.c
+++ b/sys/mips/adm5120/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/obiovar.h b/sys/mips/adm5120/obiovar.h
index 8a688bfb2206..f09972c6b71e 100644
--- a/sys/mips/adm5120/obiovar.h
+++ b/sys/mips/adm5120/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/uart_bus_adm5120.c b/sys/mips/adm5120/uart_bus_adm5120.c
index 926c9b217f7c..8d7943f23510 100644
--- a/sys/mips/adm5120/uart_bus_adm5120.c
+++ b/sys/mips/adm5120/uart_bus_adm5120.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/mips/adm5120/uart_cpu_adm5120.c b/sys/mips/adm5120/uart_cpu_adm5120.c
index a9d93500297a..935d109fe16f 100644
--- a/sys/mips/adm5120/uart_cpu_adm5120.c
+++ b/sys/mips/adm5120/uart_cpu_adm5120.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/adm5120/uart_dev_adm5120.c b/sys/mips/adm5120/uart_dev_adm5120.c
index d7c8186898d6..5c3e691b0236 100644
--- a/sys/mips/adm5120/uart_dev_adm5120.c
+++ b/sys/mips/adm5120/uart_dev_adm5120.c
@@ -1,8 +1,6 @@
/* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* Copyright (c) 2007 Oleksandr Tymoshenko.
* All rights reserved.
diff --git a/sys/mips/adm5120/uart_dev_adm5120.h b/sys/mips/adm5120/uart_dev_adm5120.h
index e63434be360e..e7165f18d81e 100644
--- a/sys/mips/adm5120/uart_dev_adm5120.h
+++ b/sys/mips/adm5120/uart_dev_adm5120.h
@@ -1,8 +1,6 @@
/* $NetBSD: uart.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
diff --git a/sys/mips/alchemy/alchemy_machdep.c b/sys/mips/alchemy/alchemy_machdep.c
index 14f0845b6ea5..d7f242ae0ad9 100644
--- a/sys/mips/alchemy/alchemy_machdep.c
+++ b/sys/mips/alchemy/alchemy_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c
index 924cb08907d9..740445ff6e4a 100644
--- a/sys/mips/alchemy/obio.c
+++ b/sys/mips/alchemy/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/alchemy/uart_bus_alchemy.c b/sys/mips/alchemy/uart_bus_alchemy.c
index 3c96916c28ff..5c2315b8b7ce 100644
--- a/sys/mips/alchemy/uart_bus_alchemy.c
+++ b/sys/mips/alchemy/uart_bus_alchemy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/mips/alchemy/uart_cpu_alchemy.c b/sys/mips/alchemy/uart_cpu_alchemy.c
index 7ef3ec6f8fc6..c995130ccd2c 100644
--- a/sys/mips/alchemy/uart_cpu_alchemy.c
+++ b/sys/mips/alchemy/uart_cpu_alchemy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index ba323c0fa11e..ef9b96455c2b 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/apbvar.h b/sys/mips/atheros/apbvar.h
index 5d7a1c5ad02d..f9af6ffa1bfd 100644
--- a/sys/mips/atheros/apbvar.h
+++ b/sys/mips/atheros/apbvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_bus_space_reversed.c b/sys/mips/atheros/ar71xx_bus_space_reversed.c
index f889de30773c..e03ade628f5d 100644
--- a/sys/mips/atheros/ar71xx_bus_space_reversed.c
+++ b/sys/mips/atheros/ar71xx_bus_space_reversed.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_chip.c b/sys/mips/atheros/ar71xx_chip.c
index b6975989f083..94cbce753b34 100644
--- a/sys/mips/atheros/ar71xx_chip.c
+++ b/sys/mips/atheros/ar71xx_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_chip.h b/sys/mips/atheros/ar71xx_chip.h
index 64f80a7fa9af..a9b4804299d1 100644
--- a/sys/mips/atheros/ar71xx_chip.h
+++ b/sys/mips/atheros/ar71xx_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_cpudef.h b/sys/mips/atheros/ar71xx_cpudef.h
index 53454764a5d6..4b2c9fbc52a9 100644
--- a/sys/mips/atheros/ar71xx_cpudef.h
+++ b/sys/mips/atheros/ar71xx_cpudef.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c
index a8d93da531ba..19e9a0e20446 100644
--- a/sys/mips/atheros/ar71xx_ehci.c
+++ b/sys/mips/atheros/ar71xx_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/atheros/ar71xx_fixup.c b/sys/mips/atheros/ar71xx_fixup.c
index cf25d10aee88..27747bdb4892 100644
--- a/sys/mips/atheros/ar71xx_fixup.c
+++ b/sys/mips/atheros/ar71xx_fixup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_fixup.h b/sys/mips/atheros/ar71xx_fixup.h
index 8e4b4c1f6baa..f81840f7bc81 100644
--- a/sys/mips/atheros/ar71xx_fixup.h
+++ b/sys/mips/atheros/ar71xx_fixup.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_gpio.c b/sys/mips/atheros/ar71xx_gpio.c
index 5cb1ea632d81..59ac13fd6f9c 100644
--- a/sys/mips/atheros/ar71xx_gpio.c
+++ b/sys/mips/atheros/ar71xx_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_gpiovar.h b/sys/mips/atheros/ar71xx_gpiovar.h
index 8279618f9be4..47b6e64f41d0 100644
--- a/sys/mips/atheros/ar71xx_gpiovar.h
+++ b/sys/mips/atheros/ar71xx_gpiovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c
index f9eb4034bf74..58218da76b3c 100644
--- a/sys/mips/atheros/ar71xx_machdep.c
+++ b/sys/mips/atheros/ar71xx_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_ohci.c b/sys/mips/atheros/ar71xx_ohci.c
index 22a15745e6bc..aac32ec58403 100644
--- a/sys/mips/atheros/ar71xx_ohci.c
+++ b/sys/mips/atheros/ar71xx_ohci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index cff621b797f2..f8fc255f1aec 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_pci_bus_space.c b/sys/mips/atheros/ar71xx_pci_bus_space.c
index 99b81be24d2a..554018196735 100644
--- a/sys/mips/atheros/ar71xx_pci_bus_space.c
+++ b/sys/mips/atheros/ar71xx_pci_bus_space.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_setup.c b/sys/mips/atheros/ar71xx_setup.c
index d3a330c7f2d5..09ab02c3e94d 100644
--- a/sys/mips/atheros/ar71xx_setup.c
+++ b/sys/mips/atheros/ar71xx_setup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_setup.h b/sys/mips/atheros/ar71xx_setup.h
index 3b6fd327d657..39db494d5a7a 100644
--- a/sys/mips/atheros/ar71xx_setup.h
+++ b/sys/mips/atheros/ar71xx_setup.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c
index 694f168a4687..1b722d4befcd 100644
--- a/sys/mips/atheros/ar71xx_spi.c
+++ b/sys/mips/atheros/ar71xx_spi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c
index 4a51e7f5df83..bf1ebc606a11 100644
--- a/sys/mips/atheros/ar71xx_wdog.c
+++ b/sys/mips/atheros/ar71xx_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xxreg.h b/sys/mips/atheros/ar71xxreg.h
index bc426de258e5..e1f533bc0086 100644
--- a/sys/mips/atheros/ar71xxreg.h
+++ b/sys/mips/atheros/ar71xxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar724x_chip.c b/sys/mips/atheros/ar724x_chip.c
index cbd831b4095b..a365c524e5d9 100644
--- a/sys/mips/atheros/ar724x_chip.c
+++ b/sys/mips/atheros/ar724x_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar724x_chip.h b/sys/mips/atheros/ar724x_chip.h
index 0ee95ab88f90..11b30b7a217c 100644
--- a/sys/mips/atheros/ar724x_chip.h
+++ b/sys/mips/atheros/ar724x_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 22b07d09e6ad..12419d16ad02 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2011, Luiz Otavio O Souza.
* All rights reserved.
diff --git a/sys/mips/atheros/ar724xreg.h b/sys/mips/atheros/ar724xreg.h
index 8e2e1329f8a8..28cb40d9efc2 100644
--- a/sys/mips/atheros/ar724xreg.h
+++ b/sys/mips/atheros/ar724xreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar91xx_chip.c b/sys/mips/atheros/ar91xx_chip.c
index 216ef2b9c1be..645d51a99d39 100644
--- a/sys/mips/atheros/ar91xx_chip.c
+++ b/sys/mips/atheros/ar91xx_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar91xx_chip.h b/sys/mips/atheros/ar91xx_chip.h
index e75f6cc406b3..a98c2649fefd 100644
--- a/sys/mips/atheros/ar91xx_chip.h
+++ b/sys/mips/atheros/ar91xx_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar91xxreg.h b/sys/mips/atheros/ar91xxreg.h
index e4815e4034ab..2dfaeb5936c0 100644
--- a/sys/mips/atheros/ar91xxreg.h
+++ b/sys/mips/atheros/ar91xxreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar933x_chip.c b/sys/mips/atheros/ar933x_chip.c
index 791a999ab231..0113588f145b 100644
--- a/sys/mips/atheros/ar933x_chip.c
+++ b/sys/mips/atheros/ar933x_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar933x_chip.h b/sys/mips/atheros/ar933x_chip.h
index 3b1545ab0e2d..925b781750cb 100644
--- a/sys/mips/atheros/ar933x_chip.h
+++ b/sys/mips/atheros/ar933x_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar933x_uart.h b/sys/mips/atheros/ar933x_uart.h
index 7cdf0ebc75ea..5062ad044bcb 100644
--- a/sys/mips/atheros/ar933x_uart.h
+++ b/sys/mips/atheros/ar933x_uart.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar933xreg.h b/sys/mips/atheros/ar933xreg.h
index ffd778ab686d..3f31088102ec 100644
--- a/sys/mips/atheros/ar933xreg.h
+++ b/sys/mips/atheros/ar933xreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar934x_chip.c b/sys/mips/atheros/ar934x_chip.c
index 640854875c86..f59d4aaa5285 100644
--- a/sys/mips/atheros/ar934x_chip.c
+++ b/sys/mips/atheros/ar934x_chip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar934x_chip.h b/sys/mips/atheros/ar934x_chip.h
index 1f9a792a235d..ba21b25f6eec 100644
--- a/sys/mips/atheros/ar934x_chip.h
+++ b/sys/mips/atheros/ar934x_chip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/ar934xreg.h b/sys/mips/atheros/ar934xreg.h
index e93d1f3ed4d0..313465eb06cb 100644
--- a/sys/mips/atheros/ar934xreg.h
+++ b/sys/mips/atheros/ar934xreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index 2dd173847318..db14ab3c9aa6 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/atheros/if_argevar.h b/sys/mips/atheros/if_argevar.h
index 5e284cc2b814..b58acb096641 100644
--- a/sys/mips/atheros/if_argevar.h
+++ b/sys/mips/atheros/if_argevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/atheros/pcf2123_rtc.c b/sys/mips/atheros/pcf2123_rtc.c
index 0717e3597091..0cb4c8fdc160 100644
--- a/sys/mips/atheros/pcf2123_rtc.c
+++ b/sys/mips/atheros/pcf2123_rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/pcf2123reg.h b/sys/mips/atheros/pcf2123reg.h
index e20ca86acd64..bd97e6c8f493 100644
--- a/sys/mips/atheros/pcf2123reg.h
+++ b/sys/mips/atheros/pcf2123reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_bus_ar71xx.c b/sys/mips/atheros/uart_bus_ar71xx.c
index e71b20036bf9..73361521f1b0 100644
--- a/sys/mips/atheros/uart_bus_ar71xx.c
+++ b/sys/mips/atheros/uart_bus_ar71xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_bus_ar933x.c b/sys/mips/atheros/uart_bus_ar933x.c
index f4a3371d0441..1ce6c624169d 100644
--- a/sys/mips/atheros/uart_bus_ar933x.c
+++ b/sys/mips/atheros/uart_bus_ar933x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_cpu_ar71xx.c b/sys/mips/atheros/uart_cpu_ar71xx.c
index 62d7dd69e80a..f004c1fea400 100644
--- a/sys/mips/atheros/uart_cpu_ar71xx.c
+++ b/sys/mips/atheros/uart_cpu_ar71xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_cpu_ar933x.c b/sys/mips/atheros/uart_cpu_ar933x.c
index 53879b5a5dca..c4f942e41088 100644
--- a/sys/mips/atheros/uart_cpu_ar933x.c
+++ b/sys/mips/atheros/uart_cpu_ar933x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_dev_ar933x.c b/sys/mips/atheros/uart_dev_ar933x.c
index 6545ec64fb37..e769cbed4d2f 100644
--- a/sys/mips/atheros/uart_dev_ar933x.c
+++ b/sys/mips/atheros/uart_dev_ar933x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/atheros/uart_dev_ar933x.h b/sys/mips/atheros/uart_dev_ar933x.h
index f6f8a4bdb61e..d41b43ea2432 100644
--- a/sys/mips/atheros/uart_dev_ar933x.h
+++ b/sys/mips/atheros/uart_dev_ar933x.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c
index 32c317d48af4..2c153e47c798 100644
--- a/sys/mips/beri/beri_machdep.c
+++ b/sys/mips/beri/beri_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* Copyright (c) 2012-2014 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/mips/beri/beri_pic.c b/sys/mips/beri/beri_pic.c
index ac8e98fd254f..008732fb66e4 100644
--- a/sys/mips/beri/beri_pic.c
+++ b/sys/mips/beri/beri_pic.c
@@ -1,7 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
* Copyright (c) 2013 SRI International
* All rights reserved.
*
@@ -31,8 +28,6 @@
* SUCH DAMAGE.
*/
-#include "opt_platform.h"
-
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -42,118 +37,221 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <machine/bus.h>
-#include <machine/intr.h>
-
-#ifdef SMP
-#include <mips/beri/beri_mp.h>
-#endif
+#include <machine/intr_machdep.h>
-#include <dev/fdt/fdt_common.h>
-#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include "pic_if.h"
+#include <dev/fdt/fdt_common.h>
-#define BP_NUM_HARD_IRQS 5
-#define BP_NUM_IRQS 32
-/* We use hard irqs 15-31 as soft */
-#define BP_FIRST_SOFT 16
+#include "fdt_ic_if.h"
-#define BP_CFG_IRQ_S 0
-#define BP_CFG_IRQ_M (0xf << BP_CFG_IRQ_S)
-#define BP_CFG_TID_S 8
-#define BP_CFG_TID_M (0x7FFFFF << BP_CFG_TID_S)
-#define BP_CFG_ENABLE (1 << 31)
+struct beripic_softc;
-enum {
- BP_CFG,
- BP_IP_READ,
- BP_IP_SET,
- BP_IP_CLEAR
-};
+static uint64_t bp_read_cfg(struct beripic_softc *, int);
+static void bp_write_cfg(struct beripic_softc *, int, uint64_t);
+static void bp_detach_resources(device_t);
+static char *bp_strconfig(uint64_t, char *, size_t);
+static void bp_config_source(device_t, int, int, u_long, u_long);
+#ifdef __mips__
+static void bp_set_counter_name(device_t, device_t, int);
+#endif
-struct beripic_softc;
+static int beripic_fdt_probe(device_t);
+static int beripic_fdt_attach(device_t);
-struct beri_pic_isrc {
- struct intr_irqsrc isrc;
- u_int irq;
- uint32_t mips_hard_irq;
-};
+static int beripic_activate_intr(device_t, struct resource *);
+static struct resource *
+ beripic_alloc_intr(device_t, device_t, int *, u_long, u_int);
+static int beripic_config_intr(device_t, int, enum intr_trigger,
+ enum intr_polarity);
+static int beripic_release_intr(device_t, struct resource *);
+static int beripic_setup_intr(device_t, device_t, struct resource *,
+ int, driver_filter_t *, driver_intr_t *, void *, void **);
+static int beripic_teardown_intr(device_t, device_t, struct resource *,
+ void *);
-struct hirq {
- uint32_t irq;
- struct beripic_softc *sc;
-};
+static int beripic_filter(void *);
+static void beripic_intr(void *);
+
+#define BP_MAX_HARD_IRQS 6
+#define BP_FIRST_SOFT 64
struct beripic_softc {
- device_t dev;
- uint32_t nirqs;
- struct beri_pic_isrc irqs[BP_NUM_IRQS];
- struct resource *res[4 + BP_NUM_HARD_IRQS];
- void *ih[BP_NUM_HARD_IRQS];
- struct hirq hirq[BP_NUM_HARD_IRQS];
- uint8_t mips_hard_irq_idx;
+ device_t bp_dev;
+ struct resource *bp_cfg_res;
+ struct resource *bp_read_res;
+ struct resource *bp_set_res;
+ struct resource *bp_clear_res;
+ int bp_cfg_rid;
+ int bp_read_rid;
+ int bp_set_rid;
+ int bp_clear_rid;
+ bus_space_tag_t bp_cfg_bst;
+ bus_space_tag_t bp_read_bst;
+ bus_space_tag_t bp_set_bst;
+ bus_space_tag_t bp_clear_bst;
+ bus_space_handle_t bp_cfg_bsh;
+ bus_space_handle_t bp_read_bsh;
+ bus_space_handle_t bp_set_bsh;
+ bus_space_handle_t bp_clear_bsh;
+
+ struct resource *bp_irqs[BP_MAX_HARD_IRQS];
+ int bp_irq_rids[BP_MAX_HARD_IRQS];
+ int bp_nirqs;
+ int bp_next_irq;
+ int bp_next_tid;
+
+ int bp_nthreads;
+
+ int bp_nhard;
+ int bp_nsoft;
+ int bp_nsrcs;
+ struct rman bp_src_rman;
+
+#ifdef __mips__
+ mips_intrcnt_t *bp_counters;
+#endif
+
+ struct mtx bp_cfgmtx;
};
-static struct resource_spec beri_pic_spec[] = {
- { SYS_RES_MEMORY, 0, RF_ACTIVE },
- { SYS_RES_MEMORY, 1, RF_ACTIVE },
- { SYS_RES_MEMORY, 2, RF_ACTIVE },
- { SYS_RES_MEMORY, 3, RF_ACTIVE },
- { SYS_RES_IRQ, 0, RF_ACTIVE },
- { SYS_RES_IRQ, 1, RF_ACTIVE },
- { SYS_RES_IRQ, 2, RF_ACTIVE },
- { SYS_RES_IRQ, 3, RF_ACTIVE },
- { SYS_RES_IRQ, 4, RF_ACTIVE },
- { -1, 0 }
+struct beripic_intr_arg {
+ driver_filter_t *filter;
+ driver_intr_t *intr;
+ void *arg;
+ struct resource *irq;
+#ifdef __mips__
+ mips_intrcnt_t counter;
+#endif
};
-static int
-beri_pic_intr(void *arg)
+struct beripic_cookie {
+ struct beripic_intr_arg *bpia;
+ struct resource *hirq;
+ void *cookie;
+};
+
+#define BP_CFG_MASK_E 0x80000000ull
+#define BP_CFG_SHIFT_E 31
+#define BP_CFG_MASK_TID 0x7FFFFF00ull /* Depends on CPU */
+#define BP_CFG_SHIFT_TID 8
+#define BP_CFG_MASK_IRQ 0x0000000Full
+#define BP_CFG_SHIFT_IRQ 0
+#define BP_CFG_VALID (BP_CFG_MASK_E|BP_CFG_MASK_TID|BP_CFG_MASK_IRQ)
+#define BP_CFG_RESERVED ~BP_CFG_VALID
+
+#define BP_CFG_ENABLED(cfg) (((cfg) & BP_CFG_MASK_E) >> BP_CFG_SHIFT_E)
+#define BP_CFG_TID(cfg) (((cfg) & BP_CFG_MASK_TID) >> BP_CFG_SHIFT_TID)
+#define BP_CFG_IRQ(cfg) (((cfg) & BP_CFG_MASK_IRQ) >> BP_CFG_SHIFT_IRQ)
+
+MALLOC_DEFINE(M_BERIPIC, "beripic", "beripic memory");
+
+static uint64_t
+bp_read_cfg(struct beripic_softc *sc, int irq)
+{
+
+ KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+ ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+ return (bus_space_read_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8));
+}
+
+static void
+bp_write_cfg(struct beripic_softc *sc, int irq, uint64_t config)
+{
+
+ KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+ ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+ bus_space_write_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8, config);
+}
+
+static void
+bp_detach_resources(device_t dev)
{
struct beripic_softc *sc;
- struct intr_irqsrc *isrc;
- struct hirq *h;
- uint64_t intr;
- uint64_t reg;
int i;
- h = arg;
- sc = h->sc;
+ sc = device_get_softc(dev);
- intr = bus_read_8(sc->res[BP_IP_READ], 0);
- while ((i = fls(intr)) != 0) {
- i--;
- intr &= ~(1u << i);
+ if (sc->bp_cfg_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_cfg_rid,
+ sc->bp_cfg_res);
+ sc->bp_cfg_res = NULL;
+ }
+ if (sc->bp_read_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_read_rid,
+ sc->bp_read_res);
+ sc->bp_read_res = NULL;
+ }
+ if (sc->bp_set_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_set_rid,
+ sc->bp_set_res);
+ sc->bp_set_res = NULL;
+ }
+ if (sc->bp_clear_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_clear_rid,
+ sc->bp_clear_res);
+ sc->bp_clear_res = NULL;
+ }
+ for (i = sc->bp_nirqs - 1; i >= 0; i--) {
+ bus_release_resource(dev, SYS_RES_IRQ, sc->bp_irq_rids[i],
+ sc->bp_irqs[i]);
+ }
+ sc->bp_nirqs = 0;
+}
- isrc = &sc->irqs[i].isrc;
+static char *
+bp_strconfig(uint64_t config, char *configstr, size_t len)
+{
+
+ if (snprintf(configstr, len, "%s tid: %llu hardintr %llu",
+ BP_CFG_ENABLED(config) ? "enabled" : "disabled",
+ BP_CFG_TID(config), BP_CFG_IRQ(config)) > len - 1)
+ return (NULL);
+ return (configstr);
+}
- reg = bus_read_8(sc->res[BP_CFG], i * 8);
- if ((reg & BP_CFG_IRQ_M) != h->irq) {
- continue;
- }
- if ((reg & (BP_CFG_ENABLE)) == 0) {
- continue;
- }
+static void
+bp_config_source(device_t ic, int src, int enable, u_long tid, u_long irq)
+{
+ struct beripic_softc *sc;
+ uint64_t config;
- if (intr_isrc_dispatch(isrc, curthread->td_intr_frame) != 0) {
- device_printf(sc->dev, "Stray interrupt %u detected\n", i);
- }
+ sc = device_get_softc(ic);
- bus_write_8(sc->res[BP_IP_CLEAR], 0, (1 << i));
- }
+ config = 0;
+ config |= enable << BP_CFG_SHIFT_E;
+ config |= tid << BP_CFG_SHIFT_TID;
+ config |= irq << BP_CFG_SHIFT_IRQ;
+
+ bp_write_cfg(sc, src, config);
+}
+
+#ifdef __mips__
+static void
+bp_set_counter_name(device_t ic, device_t child, int src)
+{
+ struct beripic_softc *sc;
+ char name[MAXCOMLEN + 1];
- return (FILTER_HANDLED);
+ sc = device_get_softc(ic);
+
+ if (snprintf(name, sizeof(name), "bp%dsrc%d%s%s%s",
+ device_get_unit(ic), src, src < sc->bp_nhard ? "" : "s",
+ child == NULL ? "" : " ",
+ child == NULL ? " " : device_get_nameunit(child)) >= sizeof(name))
+ name[sizeof(name) - 2] = '+';
+
+ mips_intrcnt_setname(sc->bp_counters[src], name);
}
+#endif
static int
-beripic_probe(device_t dev)
+beripic_fdt_probe(device_t dev)
{
if (!ofw_bus_status_okay(dev))
@@ -163,208 +261,443 @@ beripic_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "BERI Programmable Interrupt Controller");
-
return (BUS_PROBE_DEFAULT);
}
static int
-beripic_attach(device_t dev)
+beripic_fdt_attach(device_t dev)
{
+ char configstr[64];
struct beripic_softc *sc;
- struct beri_pic_isrc *pic_isrc;
- const char *name;
- struct intr_irqsrc *isrc;
- intptr_t xref;
- uint32_t unit;
- int err;
- int i;
+ struct fdt_ic *fic;
+ pcell_t nhard, nsoft;
+ phandle_t ph;
+ int error, i, src;
+ uint64_t config;
sc = device_get_softc(dev);
- sc->dev = dev;
+ sc->bp_dev = dev;
- if (bus_alloc_resources(dev, beri_pic_spec, sc->res)) {
- device_printf(dev, "could not allocate resources\n");
- return (ENXIO);
+ mtx_init(&sc->bp_cfgmtx, "beripic config lock", NULL, MTX_DEF);
+
+ /*
+ * FDT lists CONFIG, IP_READ, IP_SET, and IP_CLEAR registers as
+ * seperate memory regions in that order.
+ */
+ sc->bp_cfg_rid = 0;
+ sc->bp_cfg_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->bp_cfg_rid, RF_ACTIVE);
+ if (sc->bp_cfg_res == NULL) {
+ device_printf(dev, "failed to map config memory");
+ error = ENXIO;
+ goto err;
+ }
+ if (bootverbose)
+ device_printf(sc->bp_dev, "config region at mem %p-%p\n",
+ (void *)rman_get_start(sc->bp_cfg_res),
+ (void *)(rman_get_start(sc->bp_cfg_res) +
+ rman_get_size(sc->bp_cfg_res)));
+
+ sc->bp_read_rid = 1;
+ sc->bp_read_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->bp_read_rid, RF_ACTIVE);
+ if (sc->bp_read_res == NULL) {
+ device_printf(dev, "failed to map IP read memory");
+ error = ENXIO;
+ goto err;
}
+ if (bootverbose)
+ device_printf(sc->bp_dev, "IP read region at mem %p-%p\n",
+ (void *)rman_get_start(sc->bp_read_res),
+ (void *)(rman_get_start(sc->bp_read_res) +
+ rman_get_size(sc->bp_read_res)));
+
+ sc->bp_set_rid = 2;
+ sc->bp_set_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->bp_set_rid, RF_ACTIVE);
+ if (sc->bp_set_res == NULL) {
+ device_printf(dev, "failed to map IP read memory");
+ error = ENXIO;
+ goto err;
+ }
+ if (bootverbose)
+ device_printf(sc->bp_dev, "IP set region at mem %p-%p\n",
+ (void *)rman_get_start(sc->bp_set_res),
+ (void *)(rman_get_start(sc->bp_set_res) +
+ rman_get_size(sc->bp_set_res)));
+
+ sc->bp_clear_rid = 3;
+ sc->bp_clear_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->bp_clear_rid, RF_ACTIVE);
+ if (sc->bp_clear_res == NULL) {
+ device_printf(dev, "failed to map IP read memory");
+ error = ENXIO;
+ goto err;
+ }
+ if (bootverbose)
+ device_printf(sc->bp_dev, "IP clear region at mem %p-%p\n",
+ (void *)rman_get_start(sc->bp_clear_res),
+ (void *)(rman_get_start(sc->bp_clear_res) +
+ rman_get_size(sc->bp_clear_res)));
+
+ i = 0;
+ for (i = 0; i < BP_MAX_HARD_IRQS; i++) {
+ sc->bp_irq_rids[i] = i;
+ sc->bp_irqs[i] = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->bp_irq_rids[i], RF_ACTIVE | RF_SHAREABLE);
+ if (sc->bp_irqs[i] == NULL)
+ break;
+ }
+ if (i == 0) {
+ device_printf(dev, "failed to allocate any parent IRQs!");
+ error = ENXIO;
+ goto err;
+ }
+ sc->bp_nirqs = i;
- xref = OF_xref_from_node(ofw_bus_get_node(dev));
- name = device_get_nameunit(dev);
- unit = device_get_unit(dev);
- sc->nirqs = BP_NUM_IRQS;
-
- for (i = 0; i < sc->nirqs; i++) {
- sc->irqs[i].irq = i;
- isrc = &sc->irqs[i].isrc;
-
- /* Assign mips hard irq number. */
- pic_isrc = (struct beri_pic_isrc *)isrc;
- pic_isrc->mips_hard_irq = sc->mips_hard_irq_idx++;
- /* Last IRQ is used for IPIs. */
- if (sc->mips_hard_irq_idx >= (BP_NUM_HARD_IRQS - 1)) {
- sc->mips_hard_irq_idx = 0;
- }
+ ph = ofw_bus_gen_get_node(device_get_parent(dev), dev);
- err = intr_isrc_register(isrc, sc->dev,
- 0, "pic%d,%d", unit, i);
- bus_write_8(sc->res[BP_CFG], i * 8, 0);
+#ifndef SMP
+ sc->bp_nthreads = 1;
+#else
+ sc->bp_nthreads = 1;
+ /* XXX: get nthreads from cpu(s) somehow */
+#endif
+
+ if (OF_getprop(ph, "hard-interrupt-sources", &nhard, sizeof(nhard))
+ <= 0) {
+ device_printf(dev, "failed to get number of hard sources");
+ error = ENXIO;
+ goto err;
+ }
+ if (OF_getprop(ph, "soft-interrupt-sources", &nsoft, sizeof(nsoft))
+ <= 0) {
+ device_printf(dev, "failed to get number of soft sources");
+ error = ENXIO;
+ goto err;
}
- /*
- * Now, when everything is initialized, it's right time to
- * register interrupt controller to interrupt framefork.
- */
- if (intr_pic_register(dev, xref) == NULL) {
- device_printf(dev, "could not register PIC\n");
- return (ENXIO);
+ sc->bp_nhard = nhard;
+ sc->bp_nsoft = nsoft;
+ sc->bp_nsrcs = sc->bp_nhard + sc->bp_nsoft;
+ /* XXX: should deal with gap between hard and soft */
+ KASSERT(sc->bp_nhard <= BP_FIRST_SOFT,
+ ("too many hard sources"));
+ KASSERT(rman_get_size(sc->bp_cfg_res) / 8 == sc->bp_nsrcs,
+ ("config space size does not match sources"));
+ KASSERT(sc->bp_nhard % 64 == 0,
+ ("Non-multiple of 64 intr counts not supported"));
+ KASSERT(sc->bp_nsoft % 64 == 0,
+ ("Non-multiple of 64 intr counts not supported"));
+ if (bootverbose)
+ device_printf(dev, "%d hard and %d soft sources\n",
+ sc->bp_nhard, sc->bp_nsoft);
+
+#ifdef __mips__
+ sc->bp_counters = malloc(sizeof(*sc->bp_counters) * sc->bp_nsrcs,
+ M_BERIPIC, M_WAITOK|M_ZERO);
+ for (i = 0; i < sc->bp_nsrcs; i++) {
+ sc->bp_counters[i] = mips_intrcnt_create("");
+ bp_set_counter_name(dev, NULL, i);
+ }
+#endif
+
+ sc->bp_src_rman.rm_start = 0;
+ sc->bp_src_rman.rm_end = sc->bp_nsrcs - 1;
+ sc->bp_src_rman.rm_type = RMAN_ARRAY;
+ sc->bp_src_rman.rm_descr = "Interrupt source";
+ if (rman_init(&(sc->bp_src_rman)) != 0 ||
+ rman_manage_region(&(sc->bp_src_rman), 0, sc->bp_nsrcs - 1) != 0) {
+ device_printf(dev, "Failed to set up sources rman");
+ error = ENXIO;
+ goto err;
}
- /* Last IRQ is used for IPIs. */
- for (i = 0; i < (BP_NUM_HARD_IRQS - 1); i++) {
- sc->hirq[i].sc = sc;
- sc->hirq[i].irq = i;
- if (bus_setup_intr(dev, sc->res[4+i], INTR_TYPE_CLK,
- beri_pic_intr, NULL, &sc->hirq[i], sc->ih[i])) {
- device_printf(dev, "could not setup irq handler\n");
- intr_pic_deregister(dev, xref);
- return (ENXIO);
+ sc->bp_cfg_bst = rman_get_bustag(sc->bp_cfg_res);
+ sc->bp_cfg_bsh = rman_get_bushandle(sc->bp_cfg_res);
+ sc->bp_read_bst = rman_get_bustag(sc->bp_read_res);
+ sc->bp_read_bsh = rman_get_bushandle(sc->bp_read_res);
+ sc->bp_set_bst = rman_get_bustag(sc->bp_set_res);
+ sc->bp_set_bsh = rman_get_bushandle(sc->bp_set_res);
+ sc->bp_clear_bst = rman_get_bustag(sc->bp_clear_res);
+ sc->bp_clear_bsh = rman_get_bushandle(sc->bp_clear_res);
+
+ for (src = 0; src < sc->bp_nsrcs; src++) {
+ config = bp_read_cfg(sc, src);
+ if (config == 0)
+ continue;
+
+ if (bootverbose) {
+ device_printf(dev, "initial config: src %d: %s\n", src,
+ bp_strconfig(config, configstr, sizeof(configstr)));
+ if (config & BP_CFG_RESERVED)
+ device_printf(dev,
+ "reserved bits not 0: 0x%016jx\n",
+ (uintmax_t) config);
}
+
+ bp_config_source(dev, src, 0, 0, 0);
}
+ fic = malloc(sizeof(*fic), M_BERIPIC, M_WAITOK|M_ZERO);
+ fic->iph = ph;
+ fic->dev = dev;
+ SLIST_INSERT_HEAD(&fdt_ic_list_head, fic, fdt_ics);
+
return (0);
+err:
+ bp_detach_resources(dev);
+
+ return (error);
}
-static void
-beri_pic_enable_intr(device_t dev, struct intr_irqsrc *isrc)
+static struct resource *
+beripic_alloc_intr(device_t ic, device_t child, int *rid, u_long irq,
+ u_int flags)
{
- struct beri_pic_isrc *pic_isrc;
struct beripic_softc *sc;
- uint64_t reg;
+ struct resource *rv;
+
+ sc = device_get_softc(ic);
+
+ rv = rman_reserve_resource(&(sc->bp_src_rman), irq, irq, 1, flags,
+ child);
+ if (rv == NULL)
+ printf("%s: could not reserve source interrupt for %s\n",
+ __func__, device_get_nameunit(child));
+ rman_set_rid(rv, *rid);
+
+ if ((flags & RF_ACTIVE) &&
+ beripic_activate_intr(ic, rv) != 0) {
+ printf("%s: could not activate interrupt\n", __func__);
+ rman_release_resource(rv);
+ return (NULL);
+ }
- sc = device_get_softc(dev);
- pic_isrc = (struct beri_pic_isrc *)isrc;
+ return (rv);
+}
- reg = BP_CFG_ENABLE;
- reg |= (pic_isrc->mips_hard_irq << BP_CFG_IRQ_S);
- bus_write_8(sc->res[BP_CFG], pic_isrc->irq * 8, reg);
+static int
+beripic_release_intr(device_t ic, struct resource *r)
+{
+
+ return (rman_release_resource(r));
}
-static void
-beri_pic_disable_intr(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_activate_intr(device_t ic, struct resource *r)
{
- struct beri_pic_isrc *pic_isrc;
- struct beripic_softc *sc;
- uint64_t reg;
+
+ return (rman_activate_resource(r));
+}
- sc = device_get_softc(dev);
- pic_isrc = (struct beri_pic_isrc *)isrc;
+static int
+beripic_deactivate_intr(device_t ic, struct resource *r)
+{
+
+ return (rman_deactivate_resource(r));
+}
+
+static int
+beripic_config_intr(device_t dev, int irq, enum intr_trigger trig,
+ enum intr_polarity pol)
+{
+
+ if (trig != INTR_TRIGGER_CONFORM || pol != INTR_POLARITY_CONFORM)
+ return (EINVAL);
- reg = bus_read_8(sc->res[BP_CFG], pic_isrc->irq * 8);
- reg &= ~BP_CFG_ENABLE;
- bus_write_8(sc->res[BP_CFG], pic_isrc->irq * 8, reg);
+ return (0);
}
static int
-beri_pic_map_intr(device_t dev, struct intr_map_data *data,
- struct intr_irqsrc **isrcp)
+beripic_setup_intr(device_t ic, device_t child, struct resource *irq,
+ int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg,
+ void **cookiep)
{
struct beripic_softc *sc;
- struct intr_map_data_fdt *daf;
- uint32_t irq;
+ struct beripic_intr_arg *bpia;
+ struct beripic_cookie *bpc;
+ int error;
+ u_long hirq, src, tid;
+
+ sc = device_get_softc(ic);
+
+ src = rman_get_start(irq);
+
+ KASSERT(src < sc->bp_nsrcs, ("source (%lu) out of range 0-%d",
+ src, sc->bp_nsrcs - 1));
+
+ bpia = malloc(sizeof(*bpia), M_BERIPIC, M_WAITOK|M_ZERO);
+ bpia->filter = filter;
+ bpia->intr = intr;
+ bpia->arg = arg;
+ bpia->irq = irq;
+#ifdef __mips__
+ bpia->counter = sc->bp_counters[src];
+ bp_set_counter_name(ic, child, src);
+#endif
- sc = device_get_softc(dev);
- daf = (struct intr_map_data_fdt *)data;
+ bpc = malloc(sizeof(*bpc), M_BERIPIC, M_WAITOK|M_ZERO);
+ bpc->bpia = bpia;
- if (data == NULL || data->type != INTR_MAP_DATA_FDT ||
- daf->ncells != 1 || daf->cells[0] >= sc->nirqs)
- return (EINVAL);
+ mtx_lock(&(sc->bp_cfgmtx));
+ bpc->hirq = sc->bp_irqs[sc->bp_next_irq];
+ hirq = rman_get_start(bpc->hirq);
+ tid = sc->bp_next_tid;
+
+ error = BUS_SETUP_INTR(device_get_parent(ic), ic, bpc->hirq, flags,
+ beripic_filter, intr == NULL ? NULL : beripic_intr, bpia,
+ &(bpc->cookie));
+ if (error != 0)
+ goto err;
+
+#ifdef NOTYET
+#ifdef SMP
+ /* XXX: bind ithread to cpu */
+ sc->bp_next_tid++;
+ if (sc->bp_next_tid >= sc->bp_nthreads)
+ sc->bp_next_tid = 0;
+#endif
+#endif
+ if (sc->bp_next_tid == 0) {
+ sc->bp_next_irq++;
+ if (sc->bp_next_irq >= sc->bp_nirqs)
+ sc->bp_next_irq = 0;
+ }
+ mtx_unlock(&(sc->bp_cfgmtx));
- irq = daf->cells[0];
+ *cookiep = bpc;
- *isrcp = &sc->irqs[irq].isrc;
+ bp_config_source(ic, rman_get_start(irq), 1, tid, hirq);
return (0);
+err:
+ free(bpc, M_BERIPIC);
+ free(bpia, M_BERIPIC);
+
+ return (error);
}
-static void
-beri_pic_post_ithread(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_teardown_intr(device_t dev, device_t child, struct resource *irq,
+ void *cookie)
{
+ struct beripic_cookie *bpc;
+ int error;
+
+ bpc = cookie;
+
+ bp_config_source(dev, rman_get_start(irq), 0, 0, 0);
+
+ free(bpc->bpia, M_BERIPIC);
+
+ error = BUS_TEARDOWN_INTR(device_get_parent(dev), dev, bpc->hirq,
+ bpc->cookie);
- beri_pic_enable_intr(dev, isrc);
+ free(bpc, M_BERIPIC);
+
+ return (error);
}
-static void
-beri_pic_pre_ithread(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_filter(void *arg)
{
+ struct beripic_intr_arg *bpic;
- beri_pic_disable_intr(dev, isrc);
+ bpic = arg;
+
+#ifdef __mips__
+ mips_intrcnt_inc(bpic->counter);
+#endif
+
+ /* XXX: Add a check that our source is high */
+
+ if (bpic->filter == NULL)
+ return (FILTER_SCHEDULE_THREAD);
+
+ return (bpic->filter(bpic->arg));
}
-#ifdef SMP
-void
-beripic_setup_ipi(device_t dev, u_int tid, u_int ipi_irq)
+static void
+beripic_intr(void *arg)
{
- struct beripic_softc *sc;
- uint64_t reg;
+ struct beripic_intr_arg *bpic;
- sc = device_get_softc(dev);
+ bpic = arg;
- reg = (BP_CFG_ENABLE);
- reg |= (ipi_irq << BP_CFG_IRQ_S);
- reg |= (tid << BP_CFG_TID_S);
- bus_write_8(sc->res[BP_CFG], ((BP_FIRST_SOFT + tid) * 8), reg);
+ KASSERT(bpic->intr != NULL,
+ ("%s installed, but no child intr", __func__));
+
+ bpic->intr(bpic->arg);
+}
+
+#ifdef SMP
+static void
+beripic_setup_ipi(device_t ic, u_int tid, u_int ipi_irq)
+{
+
+ bp_config_source(ic, BP_FIRST_SOFT + tid, 1, tid, ipi_irq);
}
-void
-beripic_send_ipi(device_t dev, u_int tid)
+static void
+beripic_send_ipi(device_t ic, u_int tid)
{
struct beripic_softc *sc;
uint64_t bit;
- sc = device_get_softc(dev);
+ sc = device_get_softc(ic);
- bit = (BP_FIRST_SOFT + tid);
- KASSERT(bit < BP_NUM_IRQS, ("tid (%d) to large\n", tid));
+ KASSERT(tid < sc->bp_nsoft, ("tid (%d) too large\n", tid));
- bus_write_8(sc->res[BP_IP_SET], 0x0, (1 << bit));
+ bit = 1ULL << (tid % 64);
+ bus_space_write_8(sc->bp_set_bst, sc->bp_set_bsh,
+ (BP_FIRST_SOFT / 8) + (tid / 64), bit);
}
-void
-beripic_clear_ipi(device_t dev, u_int tid)
+static void
+beripic_clear_ipi(device_t ic, u_int tid)
{
struct beripic_softc *sc;
uint64_t bit;
- sc = device_get_softc(dev);
+ sc = device_get_softc(ic);
- bit = (BP_FIRST_SOFT + tid);
- KASSERT(bit < BP_NUM_IRQS, ("tid (%d) to large\n", tid));
+ KASSERT(tid < sc->bp_nsoft, ("tid (%d) to large\n", tid));
- bus_write_8(sc->res[BP_IP_CLEAR], 0x0, (1 << bit));
+ bit = 1ULL << (tid % 64);
+ bus_space_write_8(sc->bp_clear_bst, sc->bp_clear_bsh,
+ (BP_FIRST_SOFT / 8) + (tid / 64), bit);
}
#endif
+devclass_t beripic_devclass;
+
static device_method_t beripic_fdt_methods[] = {
/* Device interface */
- DEVMETHOD(device_probe, beripic_probe),
- DEVMETHOD(device_attach, beripic_attach),
+ DEVMETHOD(device_probe, beripic_fdt_probe),
+ DEVMETHOD(device_attach, beripic_fdt_attach),
- /* Interrupt controller interface */
- DEVMETHOD(pic_enable_intr, beri_pic_enable_intr),
- DEVMETHOD(pic_disable_intr, beri_pic_disable_intr),
- DEVMETHOD(pic_map_intr, beri_pic_map_intr),
- DEVMETHOD(pic_post_ithread, beri_pic_post_ithread),
- DEVMETHOD(pic_pre_ithread, beri_pic_pre_ithread),
+ DEVMETHOD(fdt_ic_activate_intr, beripic_activate_intr),
+ DEVMETHOD(fdt_ic_alloc_intr, beripic_alloc_intr),
+ DEVMETHOD(fdt_ic_config_intr, beripic_config_intr),
+ DEVMETHOD(fdt_ic_deactivate_intr, beripic_deactivate_intr),
+ DEVMETHOD(fdt_ic_release_intr, beripic_release_intr),
+ DEVMETHOD(fdt_ic_setup_intr, beripic_setup_intr),
+ DEVMETHOD(fdt_ic_teardown_intr, beripic_teardown_intr),
- DEVMETHOD_END
-};
+#ifdef SMP
+ DEVMETHOD(fdt_ic_setup_ipi, beripic_setup_ipi),
+ DEVMETHOD(fdt_ic_clear_ipi, beripic_clear_ipi),
+ DEVMETHOD(fdt_ic_send_ipi, beripic_send_ipi),
+#endif
-devclass_t beripic_devclass;
+ { 0, 0 },
+};
-static driver_t beripic_driver = {
+static driver_t beripic_fdt_driver = {
"beripic",
beripic_fdt_methods,
sizeof(struct beripic_softc)
};
-EARLY_DRIVER_MODULE(beripic, ofwbus, beripic_driver, beripic_devclass, 0, 0,
- BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+DRIVER_MODULE(beripic, simplebus, beripic_fdt_driver, beripic_devclass, 0, 0);
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c
index 0592e6a4cf99..b4726c58add4 100644
--- a/sys/mips/cavium/ciu.c
+++ b/sys/mips/cavium/ciu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/cryptocteon/cavium_crypto.c b/sys/mips/cavium/cryptocteon/cavium_crypto.c
index 6ff0e6f58440..0ebab4fb3de1 100644
--- a/sys/mips/cavium/cryptocteon/cavium_crypto.c
+++ b/sys/mips/cavium/cryptocteon/cavium_crypto.c
@@ -1,9 +1,7 @@
/*
* vim:sw=4 ts=8
*/
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
*
* Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
diff --git a/sys/mips/cavium/cvmx_config.h b/sys/mips/cavium/cvmx_config.h
index 33720c772baf..e1976608e54d 100644
--- a/sys/mips/cavium/cvmx_config.h
+++ b/sys/mips/cavium/cvmx_config.h
@@ -1,6 +1,4 @@
/***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/if_octm.c b/sys/mips/cavium/if_octm.c
index 4166dccd135a..a689a0fe6726 100644
--- a/sys/mips/cavium/if_octm.c
+++ b/sys/mips/cavium/if_octm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/obio.c b/sys/mips/cavium/obio.c
index 0d0dcb02d3c8..82e5c369ef64 100644
--- a/sys/mips/cavium/obio.c
+++ b/sys/mips/cavium/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/cavium/obiovar.h b/sys/mips/cavium/obiovar.h
index fbf33b508c6b..3b58fe631ad0 100644
--- a/sys/mips/cavium/obiovar.h
+++ b/sys/mips/cavium/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/cavium-ethernet.h b/sys/mips/cavium/octe/cavium-ethernet.h
index 37cba4eb5167..cc19faf051e1 100644
--- a/sys/mips/cavium/octe/cavium-ethernet.h
+++ b/sys/mips/cavium/octe/cavium-ethernet.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-common.c b/sys/mips/cavium/octe/ethernet-common.c
index 02a9fa3ecfcd..f18eabdfe014 100644
--- a/sys/mips/cavium/octe/ethernet-common.c
+++ b/sys/mips/cavium/octe/ethernet-common.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-common.h b/sys/mips/cavium/octe/ethernet-common.h
index 33e27c952d95..cb5fc81b1349 100644
--- a/sys/mips/cavium/octe/ethernet-common.h
+++ b/sys/mips/cavium/octe/ethernet-common.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-defines.h b/sys/mips/cavium/octe/ethernet-defines.h
index 308233f9ff2b..10b38c8ecd91 100644
--- a/sys/mips/cavium/octe/ethernet-defines.h
+++ b/sys/mips/cavium/octe/ethernet-defines.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-headers.h b/sys/mips/cavium/octe/ethernet-headers.h
index 2a677aaf7508..3945e13ac678 100644
--- a/sys/mips/cavium/octe/ethernet-headers.h
+++ b/sys/mips/cavium/octe/ethernet-headers.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mdio.c b/sys/mips/cavium/octe/ethernet-mdio.c
index e679d75cc090..c61a2a643bc6 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.c
+++ b/sys/mips/cavium/octe/ethernet-mdio.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mdio.h b/sys/mips/cavium/octe/ethernet-mdio.h
index d55fccb9233e..c2c4ec69230e 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.h
+++ b/sys/mips/cavium/octe/ethernet-mdio.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mem.c b/sys/mips/cavium/octe/ethernet-mem.c
index 99a11c4483da..70c498690088 100644
--- a/sys/mips/cavium/octe/ethernet-mem.c
+++ b/sys/mips/cavium/octe/ethernet-mem.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mem.h b/sys/mips/cavium/octe/ethernet-mem.h
index 3751d99ddfd0..d9058d9b18c6 100644
--- a/sys/mips/cavium/octe/ethernet-mem.h
+++ b/sys/mips/cavium/octe/ethernet-mem.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.c b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
index d06b4a4571f5..51c55f711e74 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.c
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.h b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
index 7ea2368de7f4..b61c05494d98 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.h
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/ethernet-rgmii.c b/sys/mips/cavium/octe/ethernet-rgmii.c
index 530d8af86420..e8df9ba848a9 100644
--- a/sys/mips/cavium/octe/ethernet-rgmii.c
+++ b/sys/mips/cavium/octe/ethernet-rgmii.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-rx.c b/sys/mips/cavium/octe/ethernet-rx.c
index 5c07da49c4be..492d3e0b3265 100644
--- a/sys/mips/cavium/octe/ethernet-rx.c
+++ b/sys/mips/cavium/octe/ethernet-rx.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-rx.h b/sys/mips/cavium/octe/ethernet-rx.h
index 04952ccc6daf..735d08724328 100644
--- a/sys/mips/cavium/octe/ethernet-rx.h
+++ b/sys/mips/cavium/octe/ethernet-rx.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-sgmii.c b/sys/mips/cavium/octe/ethernet-sgmii.c
index 4f9e24e00799..76fe6c9dc503 100644
--- a/sys/mips/cavium/octe/ethernet-sgmii.c
+++ b/sys/mips/cavium/octe/ethernet-sgmii.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-spi.c b/sys/mips/cavium/octe/ethernet-spi.c
index 6296481a7338..dc9e9cce3ae6 100644
--- a/sys/mips/cavium/octe/ethernet-spi.c
+++ b/sys/mips/cavium/octe/ethernet-spi.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-tx.c b/sys/mips/cavium/octe/ethernet-tx.c
index a444aef3652a..b1d1f1435803 100644
--- a/sys/mips/cavium/octe/ethernet-tx.c
+++ b/sys/mips/cavium/octe/ethernet-tx.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-tx.h b/sys/mips/cavium/octe/ethernet-tx.h
index 749c30f83b18..0947cde41d2f 100644
--- a/sys/mips/cavium/octe/ethernet-tx.h
+++ b/sys/mips/cavium/octe/ethernet-tx.h
@@ -1,6 +1,4 @@
/*************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-util.h b/sys/mips/cavium/octe/ethernet-util.h
index add5f8918833..37b75bb2af59 100644
--- a/sys/mips/cavium/octe/ethernet-util.h
+++ b/sys/mips/cavium/octe/ethernet-util.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet-xaui.c b/sys/mips/cavium/octe/ethernet-xaui.c
index 6e5a28df1385..e1854b22b72f 100644
--- a/sys/mips/cavium/octe/ethernet-xaui.c
+++ b/sys/mips/cavium/octe/ethernet-xaui.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c
index 86776b807a88..d473d822eb43 100644
--- a/sys/mips/cavium/octe/ethernet.c
+++ b/sys/mips/cavium/octe/ethernet.c
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octe/mv88e61xxphy.c b/sys/mips/cavium/octe/mv88e61xxphy.c
index 123cba7eae33..6d018c7cb74c 100644
--- a/sys/mips/cavium/octe/mv88e61xxphy.c
+++ b/sys/mips/cavium/octe/mv88e61xxphy.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/mv88e61xxphyreg.h b/sys/mips/cavium/octe/mv88e61xxphyreg.h
index 022e66242998..420741f2fe21 100644
--- a/sys/mips/cavium/octe/mv88e61xxphyreg.h
+++ b/sys/mips/cavium/octe/mv88e61xxphyreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/octe.c b/sys/mips/cavium/octe/octe.c
index 05c60e7852d8..01b315224485 100644
--- a/sys/mips/cavium/octe/octe.c
+++ b/sys/mips/cavium/octe/octe.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/octebus.c b/sys/mips/cavium/octe/octebus.c
index 41e6fcd64932..dde314d8d5b3 100644
--- a/sys/mips/cavium/octe/octebus.c
+++ b/sys/mips/cavium/octe/octebus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/octebusvar.h b/sys/mips/cavium/octe/octebusvar.h
index 53f03e3fb824..bb488d4c9174 100644
--- a/sys/mips/cavium/octe/octebusvar.h
+++ b/sys/mips/cavium/octe/octebusvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octe/wrapper-cvmx-includes.h b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
index 3f5bf7c33610..a7caf0963e2a 100644
--- a/sys/mips/cavium/octe/wrapper-cvmx-includes.h
+++ b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
@@ -1,6 +1,4 @@
/*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
reserved.
diff --git a/sys/mips/cavium/octeon_cop2.h b/sys/mips/cavium/octeon_cop2.h
index d7f852a13b3d..b7aa031807b3 100644
--- a/sys/mips/cavium/octeon_cop2.h
+++ b/sys/mips/cavium/octeon_cop2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_ds1337.c b/sys/mips/cavium/octeon_ds1337.c
index 349ed7a783d6..73405a939056 100644
--- a/sys/mips/cavium/octeon_ds1337.c
+++ b/sys/mips/cavium/octeon_ds1337.c
@@ -1,6 +1,4 @@
/***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c
index 0faf05ce26bc..987d9b4a1fd7 100644
--- a/sys/mips/cavium/octeon_ebt3000_cf.c
+++ b/sys/mips/cavium/octeon_ebt3000_cf.c
@@ -1,6 +1,4 @@
/***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/octeon_gpio.c b/sys/mips/cavium/octeon_gpio.c
index 65a990ad7f43..58aea5ad936e 100644
--- a/sys/mips/cavium/octeon_gpio.c
+++ b/sys/mips/cavium/octeon_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_gpiovar.h b/sys/mips/cavium/octeon_gpiovar.h
index 99a5c320b385..4cf007d3be64 100644
--- a/sys/mips/cavium/octeon_gpiovar.h
+++ b/sys/mips/cavium/octeon_gpiovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_irq.h b/sys/mips/cavium/octeon_irq.h
index 7ffeb8239111..ee949560ad52 100644
--- a/sys/mips/cavium/octeon_irq.h
+++ b/sys/mips/cavium/octeon_irq.h
@@ -1,6 +1,4 @@
/***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/octeon_machdep.c b/sys/mips/cavium/octeon_machdep.c
index ae7926ad18c2..53a84427a0a6 100644
--- a/sys/mips/cavium/octeon_machdep.c
+++ b/sys/mips/cavium/octeon_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_mp.c b/sys/mips/cavium/octeon_mp.c
index 23534a47b480..783a45f81bc5 100644
--- a/sys/mips/cavium/octeon_mp.c
+++ b/sys/mips/cavium/octeon_mp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_pci_console.c b/sys/mips/cavium/octeon_pci_console.c
index bf7640e647df..cc381fb110bd 100644
--- a/sys/mips/cavium/octeon_pci_console.c
+++ b/sys/mips/cavium/octeon_pci_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_pcmap_regs.h b/sys/mips/cavium/octeon_pcmap_regs.h
index 6aad91275515..d8ef37066704 100644
--- a/sys/mips/cavium/octeon_pcmap_regs.h
+++ b/sys/mips/cavium/octeon_pcmap_regs.h
@@ -1,6 +1,4 @@
/***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c
index 2a0885b74b9b..688b154230b7 100644
--- a/sys/mips/cavium/octeon_pmc.c
+++ b/sys/mips/cavium/octeon_pmc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c
index cf82057ec63b..ea4f041aab87 100644
--- a/sys/mips/cavium/octeon_rnd.c
+++ b/sys/mips/cavium/octeon_rnd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c
index bd4a9088c5c0..b08d4db55696 100644
--- a/sys/mips/cavium/octeon_rtc.c
+++ b/sys/mips/cavium/octeon_rtc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octeon_wdog.c b/sys/mips/cavium/octeon_wdog.c
index 93658e2465f9..d01cd905a360 100644
--- a/sys/mips/cavium/octeon_wdog.c
+++ b/sys/mips/cavium/octeon_wdog.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2010-2011, Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octopci.c b/sys/mips/cavium/octopci.c
index ad1d2ea0daeb..48ef7e150f5a 100644
--- a/sys/mips/cavium/octopci.c
+++ b/sys/mips/cavium/octopci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/octopci_bus_space.c b/sys/mips/cavium/octopci_bus_space.c
index 3fc549780122..9c5b367fa947 100644
--- a/sys/mips/cavium/octopci_bus_space.c
+++ b/sys/mips/cavium/octopci_bus_space.c
@@ -2,8 +2,6 @@
/*-
* $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
*
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/cavium/octopcireg.h b/sys/mips/cavium/octopcireg.h
index e053ef80c209..2250309b87a0 100644
--- a/sys/mips/cavium/octopcireg.h
+++ b/sys/mips/cavium/octopcireg.h
@@ -1,6 +1,4 @@
/***********************license start************************************
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005-2007 Cavium Networks (support@cavium.com). All rights
* reserved.
*
diff --git a/sys/mips/cavium/octopcivar.h b/sys/mips/cavium/octopcivar.h
index 35e3b13e5a62..026e45ac9126 100644
--- a/sys/mips/cavium/octopcivar.h
+++ b/sys/mips/cavium/octopcivar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/uart_bus_octeonusart.c b/sys/mips/cavium/uart_bus_octeonusart.c
index 95deae803e8a..4284c1b0f1ad 100644
--- a/sys/mips/cavium/uart_bus_octeonusart.c
+++ b/sys/mips/cavium/uart_bus_octeonusart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c
index c81c2741a724..1fd1e000fb93 100644
--- a/sys/mips/cavium/uart_cpu_octeonusart.c
+++ b/sys/mips/cavium/uart_cpu_octeonusart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/uart_dev_oct16550.c b/sys/mips/cavium/uart_dev_oct16550.c
index 2c3772a3edeb..cfb347f06393 100644
--- a/sys/mips/cavium/uart_dev_oct16550.c
+++ b/sys/mips/cavium/uart_dev_oct16550.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/cavium/usb/octusb.c b/sys/mips/cavium/usb/octusb.c
index 56757973e1e5..c4d4ac76d8ac 100644
--- a/sys/mips/cavium/usb/octusb.c
+++ b/sys/mips/cavium/usb/octusb.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/cavium/usb/octusb.h b/sys/mips/cavium/usb/octusb.h
index b5846536bf47..8b8a5e27b3ed 100644
--- a/sys/mips/cavium/usb/octusb.h
+++ b/sys/mips/cavium/usb/octusb.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/cavium/usb/octusb_octeon.c b/sys/mips/cavium/usb/octusb_octeon.c
index 88270dcee392..5852e14e146c 100644
--- a/sys/mips/cavium/usb/octusb_octeon.c
+++ b/sys/mips/cavium/usb/octusb_octeon.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/gxemul/gxemul_machdep.c b/sys/mips/gxemul/gxemul_machdep.c
index f0fa38bafb9f..a068efc7b4ed 100644
--- a/sys/mips/gxemul/gxemul_machdep.c
+++ b/sys/mips/gxemul/gxemul_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/gxemul/mpreg.h b/sys/mips/gxemul/mpreg.h
index 8197e9725c09..f562d07cb586 100644
--- a/sys/mips/gxemul/mpreg.h
+++ b/sys/mips/gxemul/mpreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/idt/idt_machdep.c b/sys/mips/idt/idt_machdep.c
index f8976b5a1df8..b48931987d29 100644
--- a/sys/mips/idt/idt_machdep.c
+++ b/sys/mips/idt/idt_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/idtpci.c b/sys/mips/idt/idtpci.c
index f43ba5c69a1e..98d199697c71 100644
--- a/sys/mips/idt/idtpci.c
+++ b/sys/mips/idt/idtpci.c
@@ -1,8 +1,6 @@
/* $NetBSD: idtpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 David Young.
* Copyright (c) 2007 Oleskandr Tymoshenko. All rights reserved.
*
diff --git a/sys/mips/idt/idtreg.h b/sys/mips/idt/idtreg.h
index e04bb7f94d74..3a088e74e5e1 100644
--- a/sys/mips/idt/idtreg.h
+++ b/sys/mips/idt/idtreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c
index 9d6d49931348..4b5d3bfb43d0 100644
--- a/sys/mips/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007
* Oleksandr Tymoshenko <gonzo@freebsd.org>. All rights reserved.
*
diff --git a/sys/mips/idt/if_krreg.h b/sys/mips/idt/if_krreg.h
index 59a2913a3bc2..b20900ad905f 100644
--- a/sys/mips/idt/if_krreg.h
+++ b/sys/mips/idt/if_krreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007
* Oleksandr Tymoshenko <gonzo@freebsd.org>. All rights reserved.
*
diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c
index 3c3d28105831..54abbb128a4d 100644
--- a/sys/mips/idt/obio.c
+++ b/sys/mips/idt/obio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2007, Oleksandr Tymoshenko <gonzo@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/obiovar.h b/sys/mips/idt/obiovar.h
index b5b6392d03cb..526efac89e66 100644
--- a/sys/mips/idt/obiovar.h
+++ b/sys/mips/idt/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/idt/uart_bus_rc32434.c b/sys/mips/idt/uart_bus_rc32434.c
index 15f3c1f460d7..40e47705fc07 100644
--- a/sys/mips/idt/uart_bus_rc32434.c
+++ b/sys/mips/idt/uart_bus_rc32434.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/mips/idt/uart_cpu_rc32434.c b/sys/mips/idt/uart_cpu_rc32434.c
index 52fa702a2f70..51be944df7e3 100644
--- a/sys/mips/idt/uart_cpu_rc32434.c
+++ b/sys/mips/idt/uart_cpu_rc32434.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/_align.h b/sys/mips/include/_align.h
index 67585a471cb2..f945164d260c 100644
--- a/sys/mips/include/_align.h
+++ b/sys/mips/include/_align.h
@@ -1,8 +1,6 @@
/* $OpenBSD: param.h,v 1.11 1998/08/30 22:05:35 millert Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h
index 866c19f45664..b7018021148a 100644
--- a/sys/mips/include/_bus.h
+++ b/sys/mips/include/_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/mips/include/_inttypes.h b/sys/mips/include/_inttypes.h
index 2f95e3b626b6..7bea1644254d 100644
--- a/sys/mips/include/_inttypes.h
+++ b/sys/mips/include/_inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/include/_limits.h b/sys/mips/include/_limits.h
index c0ba430616aa..87559081b202 100644
--- a/sys/mips/include/_limits.h
+++ b/sys/mips/include/_limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/_stdint.h b/sys/mips/include/_stdint.h
index 83455b7780d1..ebf6eb5fcbbe 100644
--- a/sys/mips/include/_stdint.h
+++ b/sys/mips/include/_stdint.h
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index 1f654c4894f5..d37b1bc99886 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/asm.h b/sys/mips/include/asm.h
index 1712f1b16311..8a7d640f9e12 100644
--- a/sys/mips/include/asm.h
+++ b/sys/mips/include/asm.h
@@ -1,8 +1,6 @@
/* $NetBSD: asm.h,v 1.29 2000/12/14 21:29:51 jeffs Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h
index d299fb4a1bba..79f6dfe0fe01 100644
--- a/sys/mips/include/atomic.h
+++ b/sys/mips/include/atomic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/mips/include/bootinfo.h b/sys/mips/include/bootinfo.h
index 05d17879dbd0..38225a2223ec 100644
--- a/sys/mips/include/bootinfo.h
+++ b/sys/mips/include/bootinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2013 Robert N. M. Watson
* Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon 97222
* All rights reserved.
diff --git a/sys/mips/include/bus.h b/sys/mips/include/bus.h
index 9a3de385f9ec..5e85b17be6d4 100644
--- a/sys/mips/include/bus.h
+++ b/sys/mips/include/bus.h
@@ -1,8 +1,6 @@
/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/include/bus_dma.h b/sys/mips/include/bus_dma.h
index 2a9fc81f5dbf..35dfba26ebd2 100644
--- a/sys/mips/include/bus_dma.h
+++ b/sys/mips/include/bus_dma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
diff --git a/sys/mips/include/cache.h b/sys/mips/include/cache.h
index 2a028326ed6b..9fc91595a10d 100644
--- a/sys/mips/include/cache.h
+++ b/sys/mips/include/cache.h
@@ -1,8 +1,6 @@
/* $NetBSD: cache.h,v 1.6 2003/02/17 11:35:01 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/include/cache_mipsNN.h b/sys/mips/include/cache_mipsNN.h
index 80af7b075eb7..200e6859bdaa 100644
--- a/sys/mips/include/cache_mipsNN.h
+++ b/sys/mips/include/cache_mipsNN.h
@@ -1,8 +1,6 @@
/* $NetBSD: cache_mipsNN.h,v 1.4 2003/02/17 11:35:02 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/include/cache_r4k.h b/sys/mips/include/cache_r4k.h
index e01be2495c69..0ab504ecfa23 100644
--- a/sys/mips/include/cache_r4k.h
+++ b/sys/mips/include/cache_r4k.h
@@ -1,8 +1,6 @@
/* $NetBSD: cache_r4k.h,v 1.10 2003/03/08 04:43:26 rafal Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/include/counter.h b/sys/mips/include/counter.h
index 4f75781180b4..b293b296360c 100644
--- a/sys/mips/include/counter.h
+++ b/sys/mips/include/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/cpu.h b/sys/mips/include/cpu.h
index 4056368308f8..2691cf2c88e2 100644
--- a/sys/mips/include/cpu.h
+++ b/sys/mips/include/cpu.h
@@ -1,8 +1,6 @@
/* $OpenBSD: cpu.h,v 1.4 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/cpufunc.h b/sys/mips/include/cpufunc.h
index 8f28009c29f9..3ebb8c14b448 100644
--- a/sys/mips/include/cpufunc.h
+++ b/sys/mips/include/cpufunc.h
@@ -1,8 +1,6 @@
/* $OpenBSD: pio.h,v 1.2 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
* Copyright (c) 2002-2004 Juli Mallett. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/cpuinfo.h b/sys/mips/include/cpuinfo.h
index 29643a764ff1..deeb93bd6d28 100644
--- a/sys/mips/include/cpuinfo.h
+++ b/sys/mips/include/cpuinfo.h
@@ -1,8 +1,6 @@
/* $NetBSD: cpu.h,v 1.70 2003/01/17 23:36:08 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/cpuregs.h b/sys/mips/include/cpuregs.h
index d1bcb6eb50f6..a1d9bc0195da 100644
--- a/sys/mips/include/cpuregs.h
+++ b/sys/mips/include/cpuregs.h
@@ -1,8 +1,6 @@
/* $NetBSD: cpuregs.h,v 1.70 2006/05/15 02:26:54 simonb Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/db_machdep.h b/sys/mips/include/db_machdep.h
index 3039b64e8229..a4959553d9a4 100644
--- a/sys/mips/include/db_machdep.h
+++ b/sys/mips/include/db_machdep.h
@@ -1,8 +1,6 @@
/* $OpenBSD: db_machdep.h,v 1.2 1998/09/15 10:50:12 pefo Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h
index 1944000a16ea..26c4799cec5e 100644
--- a/sys/mips/include/elf.h
+++ b/sys/mips/include/elf.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 2013 M. Warner Losh. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/endian.h b/sys/mips/include/endian.h
index 09aaa7a64459..ead6dc40bb8e 100644
--- a/sys/mips/include/endian.h
+++ b/sys/mips/include/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/include/exec.h b/sys/mips/include/exec.h
index 35ab6ed03ca9..4650090f569b 100644
--- a/sys/mips/include/exec.h
+++ b/sys/mips/include/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/fdt.h b/sys/mips/include/fdt.h
index ef92de89d849..62356b8e8416 100644
--- a/sys/mips/include/fdt.h
+++ b/sys/mips/include/fdt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/mips/include/float.h b/sys/mips/include/float.h
index 0410d8c12fc2..86efd02b975c 100644
--- a/sys/mips/include/float.h
+++ b/sys/mips/include/float.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/include/floatingpoint.h b/sys/mips/include/floatingpoint.h
index b7c154743d0c..cda9e46230ca 100644
--- a/sys/mips/include/floatingpoint.h
+++ b/sys/mips/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/mips/include/frame.h b/sys/mips/include/frame.h
index 726b12995ace..c04888e1b5ac 100644
--- a/sys/mips/include/frame.h
+++ b/sys/mips/include/frame.h
@@ -1,8 +1,6 @@
/* $OpenBSD: frame.h,v 1.3 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/gdb_machdep.h b/sys/mips/include/gdb_machdep.h
index ee81255fa81c..a76a8244a31d 100644
--- a/sys/mips/include/gdb_machdep.h
+++ b/sys/mips/include/gdb_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/include/hwfunc.h b/sys/mips/include/hwfunc.h
index f1ac55520df1..5c797fc4ec45 100644
--- a/sys/mips/include/hwfunc.h
+++ b/sys/mips/include/hwfunc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2004 Juli Mallett. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/ieee.h b/sys/mips/include/ieee.h
index 02c5aafd7ec1..a7411dd2332a 100644
--- a/sys/mips/include/ieee.h
+++ b/sys/mips/include/ieee.h
@@ -1,8 +1,6 @@
/* $NetBSD: ieee754.h,v 1.4 2003/10/27 02:30:26 simonb Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/in_cksum.h b/sys/mips/include/in_cksum.h
index d55b838b42ed..72edfba91041 100644
--- a/sys/mips/include/in_cksum.h
+++ b/sys/mips/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/include/intr_machdep.h b/sys/mips/include/intr_machdep.h
index 767b9522299f..7c1d97636b73 100644
--- a/sys/mips/include/intr_machdep.h
+++ b/sys/mips/include/intr_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/kdb.h b/sys/mips/include/kdb.h
index 33e54bc5fc05..6ca665413e89 100644
--- a/sys/mips/include/kdb.h
+++ b/sys/mips/include/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/include/limits.h b/sys/mips/include/limits.h
index 0272414f31f2..238155311cd4 100644
--- a/sys/mips/include/limits.h
+++ b/sys/mips/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h
index 7fa2286d020e..622781d11b12 100644
--- a/sys/mips/include/md_var.h
+++ b/sys/mips/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/mips/include/memdev.h b/sys/mips/include/memdev.h
index b08bae904021..f30945da1cee 100644
--- a/sys/mips/include/memdev.h
+++ b/sys/mips/include/memdev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/mips/include/metadata.h b/sys/mips/include/metadata.h
index 620017260ae9..779c2f6a4744 100644
--- a/sys/mips/include/metadata.h
+++ b/sys/mips/include/metadata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/minidump.h b/sys/mips/include/minidump.h
index a4ceb02be6ea..b2d75d892979 100644
--- a/sys/mips/include/minidump.h
+++ b/sys/mips/include/minidump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
diff --git a/sys/mips/include/mips_opcode.h b/sys/mips/include/mips_opcode.h
index df1faa8b19ab..fd0e9763e4af 100644
--- a/sys/mips/include/mips_opcode.h
+++ b/sys/mips/include/mips_opcode.h
@@ -1,8 +1,6 @@
/* $OpenBSD: mips_opcode.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/octeon_cop2.h b/sys/mips/include/octeon_cop2.h
index 9bba74d591a3..d5161dcef8ed 100644
--- a/sys/mips/include/octeon_cop2.h
+++ b/sys/mips/include/octeon_cop2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/ofw_machdep.h b/sys/mips/include/ofw_machdep.h
index 1f73f67f8c1c..f14cfdfd4c64 100644
--- a/sys/mips/include/ofw_machdep.h
+++ b/sys/mips/include/ofw_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h
index 1dc311223052..7c5e667858fe 100644
--- a/sys/mips/include/param.h
+++ b/sys/mips/include/param.h
@@ -1,8 +1,6 @@
/* $OpenBSD: param.h,v 1.11 1998/08/30 22:05:35 millert Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/pcb.h b/sys/mips/include/pcb.h
index ec96f39ebb33..fa84a7d33f45 100644
--- a/sys/mips/include/pcb.h
+++ b/sys/mips/include/pcb.h
@@ -1,8 +1,6 @@
/* $OpenBSD: pcb.h,v 1.3 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/pcpu.h b/sys/mips/include/pcpu.h
index 683a68aa6812..f4be33dd8aa9 100644
--- a/sys/mips/include/pcpu.h
+++ b/sys/mips/include/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
diff --git a/sys/mips/include/pmap.h b/sys/mips/include/pmap.h
index 6d6cc3a5b8f3..03541199a401 100644
--- a/sys/mips/include/pmap.h
+++ b/sys/mips/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h
index b0d2c639c91a..da88d2a02ca0 100644
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
@@ -1,8 +1,6 @@
/* $OpenBSD: proc.h,v 1.2 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/profile.h b/sys/mips/include/profile.h
index 17cc85be6d02..aac6e5dd43b9 100644
--- a/sys/mips/include/profile.h
+++ b/sys/mips/include/profile.h
@@ -1,7 +1,5 @@
/* $OpenBSD: profile.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/pte.h b/sys/mips/include/pte.h
index 3dbf9d86108f..4b628dbef46c 100644
--- a/sys/mips/include/pte.h
+++ b/sys/mips/include/pte.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/ptrace.h b/sys/mips/include/ptrace.h
index 137f85c6733c..a34b6f9054f1 100644
--- a/sys/mips/include/ptrace.h
+++ b/sys/mips/include/ptrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/reg.h b/sys/mips/include/reg.h
index 69b2263ee3e9..0dc36c6b3204 100644
--- a/sys/mips/include/reg.h
+++ b/sys/mips/include/reg.h
@@ -1,8 +1,6 @@
/* $OpenBSD: reg.h,v 1.1 1998/01/28 11:14:53 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/regdef.h b/sys/mips/include/regdef.h
index 5a6b57f30672..b55db5633355 100644
--- a/sys/mips/include/regdef.h
+++ b/sys/mips/include/regdef.h
@@ -1,8 +1,6 @@
/* $NetBSD: regdef.h,v 1.12 2005/12/11 12:18:09 christos Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/regnum.h b/sys/mips/include/regnum.h
index 1ce21e0d1f6b..829ca4608573 100644
--- a/sys/mips/include/regnum.h
+++ b/sys/mips/include/regnum.h
@@ -1,8 +1,6 @@
/* $OpenBSD: regnum.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/reloc.h b/sys/mips/include/reloc.h
index 7b5610bda2af..113745f82623 100644
--- a/sys/mips/include/reloc.h
+++ b/sys/mips/include/reloc.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/mips/include/runq.h b/sys/mips/include/runq.h
index d3207b3fa0f5..56d6e2f35055 100644
--- a/sys/mips/include/runq.h
+++ b/sys/mips/include/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/sc_machdep.h b/sys/mips/include/sc_machdep.h
index 61a2a86f702d..4f3526fabcf0 100644
--- a/sys/mips/include/sc_machdep.h
+++ b/sys/mips/include/sc_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/mips/include/sf_buf.h b/sys/mips/include/sf_buf.h
index 27051674d1d2..d61bc9153697 100644
--- a/sys/mips/include/sf_buf.h
+++ b/sys/mips/include/sf_buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/mips/include/sigframe.h b/sys/mips/include/sigframe.h
index 03f55bc18ee0..69c7c0234d54 100644
--- a/sys/mips/include/sigframe.h
+++ b/sys/mips/include/sigframe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/include/signal.h b/sys/mips/include/signal.h
index 81e4169f6181..5107af05bba2 100644
--- a/sys/mips/include/signal.h
+++ b/sys/mips/include/signal.h
@@ -1,8 +1,6 @@
/* $OpenBSD: signal.h,v 1.2 1999/01/27 04:10:03 imp Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/sysarch.h b/sys/mips/include/sysarch.h
index effcc725d420..350ad9583eec 100644
--- a/sys/mips/include/sysarch.h
+++ b/sys/mips/include/sysarch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/include/tlb.h b/sys/mips/include/tlb.h
index 24a18136175f..c3baf783e974 100644
--- a/sys/mips/include/tlb.h
+++ b/sys/mips/include/tlb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/include/tls.h b/sys/mips/include/tls.h
index e7b80c7478be..97e090344dfd 100644
--- a/sys/mips/include/tls.h
+++ b/sys/mips/include/tls.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/include/trap.h b/sys/mips/include/trap.h
index 8d0838df12a7..32bf1a8f3f5c 100644
--- a/sys/mips/include/trap.h
+++ b/sys/mips/include/trap.h
@@ -1,8 +1,6 @@
/* $OpenBSD: trap.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/ucontext.h b/sys/mips/include/ucontext.h
index 821be941cc6a..2b1a952e80f0 100644
--- a/sys/mips/include/ucontext.h
+++ b/sys/mips/include/ucontext.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/varargs.h b/sys/mips/include/varargs.h
index 3998122fb82c..c916f3374379 100644
--- a/sys/mips/include/varargs.h
+++ b/sys/mips/include/varargs.h
@@ -1,8 +1,6 @@
/* $NetBSD: varargs.h,v 1.16 1999/01/22 14:19:54 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/mips/include/vdso.h b/sys/mips/include/vdso.h
index b4771e68edff..082df1ae52b9 100644
--- a/sys/mips/include/vdso.h
+++ b/sys/mips/include/vdso.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
diff --git a/sys/mips/include/vm.h b/sys/mips/include/vm.h
index 5a7565e997e4..658eb1ceb873 100644
--- a/sys/mips/include/vm.h
+++ b/sys/mips/include/vm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index df0b60e15d08..020d0ac0184f 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -2,8 +2,6 @@
/* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index e56df251c846..88746431e1b3 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index 0ea6e78adb0e..643943d430c5 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -1,8 +1,6 @@
/* $NetBSD: gt_pci.c,v 1.4 2003/07/15 00:24:54 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/gt_pci_bus_space.c b/sys/mips/malta/gt_pci_bus_space.c
index 861d42a7f5d7..63eaabe3ace3 100644
--- a/sys/mips/malta/gt_pci_bus_space.c
+++ b/sys/mips/malta/gt_pci_bus_space.c
@@ -2,8 +2,6 @@
/*-
* $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/gt_pci_bus_space.h b/sys/mips/malta/gt_pci_bus_space.h
index 963808b647c8..77392f544fc4 100644
--- a/sys/mips/malta/gt_pci_bus_space.h
+++ b/sys/mips/malta/gt_pci_bus_space.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/malta/gtreg.h b/sys/mips/malta/gtreg.h
index 5237409a3bbf..726f5fe328da 100644
--- a/sys/mips/malta/gtreg.h
+++ b/sys/mips/malta/gtreg.h
@@ -1,8 +1,6 @@
/* $NetBSD: gtreg.h,v 1.2 2005/12/24 20:07:03 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/gtvar.h b/sys/mips/malta/gtvar.h
index ac937fe6fd8b..f7830ef3ccce 100644
--- a/sys/mips/malta/gtvar.h
+++ b/sys/mips/malta/gtvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
index 081384fbea2d..b31ba2f3d1e8 100644
--- a/sys/mips/malta/malta_machdep.c
+++ b/sys/mips/malta/malta_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/malta/maltareg.h b/sys/mips/malta/maltareg.h
index 6b97af346bf9..c311d30885bb 100644
--- a/sys/mips/malta/maltareg.h
+++ b/sys/mips/malta/maltareg.h
@@ -1,8 +1,6 @@
/* $NetBSD: maltareg.h,v 1.1 2002/03/07 14:44:04 simonb Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/obio.c b/sys/mips/malta/obio.c
index 89169a86d8b3..64ac9c7dd854 100644
--- a/sys/mips/malta/obio.c
+++ b/sys/mips/malta/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/obiovar.h b/sys/mips/malta/obiovar.h
index cf8ccb920d17..801d46135f73 100644
--- a/sys/mips/malta/obiovar.h
+++ b/sys/mips/malta/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c
index 738785e8ea21..e075fff62e53 100644
--- a/sys/mips/malta/uart_bus_maltausart.c
+++ b/sys/mips/malta/uart_bus_maltausart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/malta/uart_cpu_maltausart.c b/sys/mips/malta/uart_cpu_maltausart.c
index be5edfd4e50c..07ea548a0a1f 100644
--- a/sys/mips/malta/uart_cpu_maltausart.c
+++ b/sys/mips/malta/uart_cpu_maltausart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/malta/yamon.c b/sys/mips/malta/yamon.c
index d2a30f2a42fe..e669bfe273c9 100644
--- a/sys/mips/malta/yamon.c
+++ b/sys/mips/malta/yamon.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008 Bruce M. Simpson
* All rights reserved.
*
diff --git a/sys/mips/malta/yamon.h b/sys/mips/malta/yamon.h
index aa2ee1a00bb1..f039ae8342d7 100644
--- a/sys/mips/malta/yamon.h
+++ b/sys/mips/malta/yamon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/mips/autoconf.c b/sys/mips/mips/autoconf.c
index da30ed6e54d2..e16c05c147d1 100644
--- a/sys/mips/mips/autoconf.c
+++ b/sys/mips/mips/autoconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/mips/bus_space_generic.c b/sys/mips/mips/bus_space_generic.c
index 6ec989010db3..b57a7393791b 100644
--- a/sys/mips/mips/bus_space_generic.c
+++ b/sys/mips/mips/bus_space_generic.c
@@ -2,8 +2,6 @@
/*-
* $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
*
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c
index e7e5b0e06fae..bd2cadade251 100644
--- a/sys/mips/mips/busdma_machdep.c
+++ b/sys/mips/mips/busdma_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Oleksandr Tymoshenko
* All rights reserved.
*
diff --git a/sys/mips/mips/cache.c b/sys/mips/mips/cache.c
index 210462e5574b..534e6cdf8268 100644
--- a/sys/mips/mips/cache.c
+++ b/sys/mips/mips/cache.c
@@ -1,8 +1,6 @@
/* $NetBSD: cache.c,v 1.33 2005/12/24 23:24:01 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/mips/cache_mipsNN.c b/sys/mips/mips/cache_mipsNN.c
index 7b1a035d70dc..50eb76b2feef 100644
--- a/sys/mips/mips/cache_mipsNN.c
+++ b/sys/mips/mips/cache_mipsNN.c
@@ -1,8 +1,6 @@
/* $NetBSD: cache_mipsNN.c,v 1.10 2005/12/24 20:07:19 perry Exp $ */
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c
index 113b75262db2..60fe134d9ccf 100644
--- a/sys/mips/mips/cpu.c
+++ b/sys/mips/mips/cpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Juli Mallett. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/db_disasm.c b/sys/mips/mips/db_disasm.c
index 8a31a2dae728..108c9dd8a1a8 100644
--- a/sys/mips/mips/db_disasm.c
+++ b/sys/mips/mips/db_disasm.c
@@ -1,7 +1,5 @@
/* $OpenBSD: db_disasm.c,v 1.1 1998/03/16 09:03:24 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/mips/db_interface.c b/sys/mips/mips/db_interface.c
index a9c84e30467b..b3da6f28b5b1 100644
--- a/sys/mips/mips/db_interface.c
+++ b/sys/mips/mips/db_interface.c
@@ -1,8 +1,6 @@
/* $OpenBSD: db_machdep.c,v 1.2 1998/09/15 10:50:13 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/db_trace.c b/sys/mips/mips/db_trace.c
index ce16dd3a18a7..1359a53fe7ff 100644
--- a/sys/mips/mips/db_trace.c
+++ b/sys/mips/mips/db_trace.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2005, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/sys/mips/mips/dump_machdep.c b/sys/mips/mips/dump_machdep.c
index 2e8540118b95..18ea63ecf931 100644
--- a/sys/mips/mips/dump_machdep.c
+++ b/sys/mips/mips/dump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/mips/elf_machdep.c b/sys/mips/mips/elf_machdep.c
index b0cd441d9d38..b332bf37d5d7 100644
--- a/sys/mips/mips/elf_machdep.c
+++ b/sys/mips/mips/elf_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/mips/mips/elf_trampoline.c b/sys/mips/mips/elf_trampoline.c
index bd96de16589e..7be26bbe62b5 100644
--- a/sys/mips/mips/elf_trampoline.c
+++ b/sys/mips/mips/elf_trampoline.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c
index f79b017d6102..4ed58e219a04 100644
--- a/sys/mips/mips/freebsd32_machdep.c
+++ b/sys/mips/mips/freebsd32_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/mips/gdb_machdep.c b/sys/mips/mips/gdb_machdep.c
index 63ae21591513..6737856410b1 100644
--- a/sys/mips/mips/gdb_machdep.c
+++ b/sys/mips/mips/gdb_machdep.c
@@ -1,8 +1,6 @@
/* $NetBSD: kgdb_machdep.c,v 1.11 2005/12/24 22:45:35 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/mips/mips/genassym.c b/sys/mips/mips/genassym.c
index 502c6e925d18..3c0c1cc8f7b4 100644
--- a/sys/mips/mips/genassym.c
+++ b/sys/mips/mips/genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/mips/in_cksum.c b/sys/mips/mips/in_cksum.c
index 8f9a2d9de106..31bcd3ebdd0a 100644
--- a/sys/mips/mips/in_cksum.c
+++ b/sys/mips/mips/in_cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/mips/mips/intr_machdep.c b/sys/mips/mips/intr_machdep.c
index c4c666196071..e8423f651f54 100644
--- a/sys/mips/mips/intr_machdep.c
+++ b/sys/mips/mips/intr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Oleksandr Tymoshenko
* Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/libkern_machdep.c b/sys/mips/mips/libkern_machdep.c
index 2ff3608145e6..6548bed6d7e8 100644
--- a/sys/mips/mips/libkern_machdep.c
+++ b/sys/mips/mips/libkern_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index 29e58dbc329b..3d44cdad0e5f 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -1,8 +1,6 @@
/* $OpenBSD: machdep.c,v 1.33 1998/09/15 10:58:54 pefo Exp $ */
/* tracked to 1.38 */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/mips/mem.c b/sys/mips/mips/mem.c
index d11f8a113943..30f4b34f57af 100644
--- a/sys/mips/mips/mem.c
+++ b/sys/mips/mips/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/mips/mips/minidump_machdep.c b/sys/mips/mips/minidump_machdep.c
index 784bc763979d..8281eaeddead 100644
--- a/sys/mips/mips/minidump_machdep.c
+++ b/sys/mips/mips/minidump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c
index 88f345310d55..9f989091e072 100644
--- a/sys/mips/mips/mp_machdep.c
+++ b/sys/mips/mips/mp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/mips/octeon_cop2.c b/sys/mips/mips/octeon_cop2.c
index ab7308cf06d8..c85522d68b1e 100644
--- a/sys/mips/mips/octeon_cop2.c
+++ b/sys/mips/mips/octeon_cop2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c
index 9c20f94c0f2e..2b02ba9571a4 100644
--- a/sys/mips/mips/pm_machdep.c
+++ b/sys/mips/mips/pm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c
index 47ac4a6d9472..2e191b5dc012 100644
--- a/sys/mips/mips/pmap.c
+++ b/sys/mips/mips/pmap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/mips/mips/ptrace_machdep.c b/sys/mips/mips/ptrace_machdep.c
index 372995c23699..2c268d8b12b9 100644
--- a/sys/mips/mips/ptrace_machdep.c
+++ b/sys/mips/mips/ptrace_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/mips/mips/sc_machdep.c b/sys/mips/mips/sc_machdep.c
index 8a77cef2fbce..a81ffddbb211 100644
--- a/sys/mips/mips/sc_machdep.c
+++ b/sys/mips/mips/sc_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/mips/mips/stack_machdep.c b/sys/mips/mips/stack_machdep.c
index 24e173ef4fc1..0f7c4bb1840f 100644
--- a/sys/mips/mips/stack_machdep.c
+++ b/sys/mips/mips/stack_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
diff --git a/sys/mips/mips/stdatomic.c b/sys/mips/mips/stdatomic.c
index d1cc6b4145c2..a3f3135f0a3d 100644
--- a/sys/mips/mips/stdatomic.c
+++ b/sys/mips/mips/stdatomic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/mips/sys_machdep.c b/sys/mips/mips/sys_machdep.c
index 24f8dbc329d3..5cd5366e3ffa 100644
--- a/sys/mips/mips/sys_machdep.c
+++ b/sys/mips/mips/sys_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index c415d7d1b2d5..8bcc534f8db8 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2007 Bruce M. Simpson.
* Copyright (c) 2003-2004 Juli Mallett.
* All rights reserved.
diff --git a/sys/mips/mips/tlb.c b/sys/mips/mips/tlb.c
index 6a908dea2c07..f554faa6f2d0 100644
--- a/sys/mips/mips/tlb.c
+++ b/sys/mips/mips/tlb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index e9aebebe9131..af2904f4a3d0 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -1,8 +1,6 @@
/* $OpenBSD: trap.c,v 1.19 1998/09/30 12:40:41 pefo Exp $ */
/* tracked to 1.23 */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/mips/uio_machdep.c b/sys/mips/mips/uio_machdep.c
index 55dbff6eadd3..d6db1f180e23 100644
--- a/sys/mips/mips/uio_machdep.c
+++ b/sys/mips/mips/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/mips/uma_machdep.c b/sys/mips/mips/uma_machdep.c
index 571651c6acaa..3bc7d5a7464f 100644
--- a/sys/mips/mips/uma_machdep.c
+++ b/sys/mips/mips/uma_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c
index f8e54437aca1..34f06a8f4dcc 100644
--- a/sys/mips/mips/vm_machdep.c
+++ b/sys/mips/mips/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/mips/nlm/board.c b/sys/mips/nlm/board.c
index bf42bca48d2d..bb335bf426a8 100644
--- a/sys/mips/nlm/board.c
+++ b/sys/mips/nlm/board.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/board.h b/sys/mips/nlm/board.h
index 17f9c04e33bf..3143d64e6f83 100644
--- a/sys/mips/nlm/board.h
+++ b/sys/mips/nlm/board.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/board_cpld.c b/sys/mips/nlm/board_cpld.c
index e1a3a2c18e14..aa138af50b74 100644
--- a/sys/mips/nlm/board_cpld.c
+++ b/sys/mips/nlm/board_cpld.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/board_eeprom.c b/sys/mips/nlm/board_eeprom.c
index d4fe1cbf3e33..c202acf4895d 100644
--- a/sys/mips/nlm/board_eeprom.c
+++ b/sys/mips/nlm/board_eeprom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/bus_space_rmi.c b/sys/mips/nlm/bus_space_rmi.c
index 87e0594b55e1..af1af691f78b 100644
--- a/sys/mips/nlm/bus_space_rmi.c
+++ b/sys/mips/nlm/bus_space_rmi.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/bus_space_rmi_pci.c b/sys/mips/nlm/bus_space_rmi_pci.c
index 7b5f487a53c4..e7ec44990f3c 100644
--- a/sys/mips/nlm/bus_space_rmi_pci.c
+++ b/sys/mips/nlm/bus_space_rmi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/clock.h b/sys/mips/nlm/clock.h
index b36823f97468..7a2be0700452 100644
--- a/sys/mips/nlm/clock.h
+++ b/sys/mips/nlm/clock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/cms.c b/sys/mips/nlm/cms.c
index 197e989f43b2..02431d6696e4 100644
--- a/sys/mips/nlm/cms.c
+++ b/sys/mips/nlm/cms.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/dev/net/mdio.c b/sys/mips/nlm/dev/net/mdio.c
index 7cf82248080a..0db54766168f 100644
--- a/sys/mips/nlm/dev/net/mdio.c
+++ b/sys/mips/nlm/dev/net/mdio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/nae.c b/sys/mips/nlm/dev/net/nae.c
index 0b55fe750f8a..3fbcbb724305 100644
--- a/sys/mips/nlm/dev/net/nae.c
+++ b/sys/mips/nlm/dev/net/nae.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/sgmii.c b/sys/mips/nlm/dev/net/sgmii.c
index 8c51ddf08fe9..1d7d741b63b3 100644
--- a/sys/mips/nlm/dev/net/sgmii.c
+++ b/sys/mips/nlm/dev/net/sgmii.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/ucore/ucore.h b/sys/mips/nlm/dev/net/ucore/ucore.h
index 6826656bb914..7d791fbd9fc4 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore.h
+++ b/sys/mips/nlm/dev/net/ucore/ucore.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/ucore/ucore_app.c b/sys/mips/nlm/dev/net/ucore/ucore_app.c
index 4a9f970c60b0..71f2805dd62a 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore_app.c
+++ b/sys/mips/nlm/dev/net/ucore/ucore_app.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/xaui.c b/sys/mips/nlm/dev/net/xaui.c
index aaf65e7483a5..ebefa66027be 100644
--- a/sys/mips/nlm/dev/net/xaui.c
+++ b/sys/mips/nlm/dev/net/xaui.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c
index 32b0f1cf0b0f..4f3aeb0d0416 100644
--- a/sys/mips/nlm/dev/net/xlpge.c
+++ b/sys/mips/nlm/dev/net/xlpge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/net/xlpge.h b/sys/mips/nlm/dev/net/xlpge.h
index 5aabc68cae68..027e1cf82ebf 100644
--- a/sys/mips/nlm/dev/net/xlpge.h
+++ b/sys/mips/nlm/dev/net/xlpge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/nlmrsa.c b/sys/mips/nlm/dev/sec/nlmrsa.c
index 2c672675c48d..8710dd9a32db 100644
--- a/sys/mips/nlm/dev/sec/nlmrsa.c
+++ b/sys/mips/nlm/dev/sec/nlmrsa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/nlmrsalib.h b/sys/mips/nlm/dev/sec/nlmrsalib.h
index c3e155d4c97c..6a29f376bb3e 100644
--- a/sys/mips/nlm/dev/sec/nlmrsalib.h
+++ b/sys/mips/nlm/dev/sec/nlmrsalib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/nlmsec.c b/sys/mips/nlm/dev/sec/nlmsec.c
index 43be89c0c04f..78fc9615ae7a 100644
--- a/sys/mips/nlm/dev/sec/nlmsec.c
+++ b/sys/mips/nlm/dev/sec/nlmsec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.c b/sys/mips/nlm/dev/sec/nlmseclib.c
index 01210c07cf33..f953025ace4b 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.c
+++ b/sys/mips/nlm/dev/sec/nlmseclib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.h b/sys/mips/nlm/dev/sec/nlmseclib.h
index fdf9b007b5f4..038b0ae9165a 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.h
+++ b/sys/mips/nlm/dev/sec/nlmseclib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/dev/sec/rsa_ucode.h b/sys/mips/nlm/dev/sec/rsa_ucode.h
index 057a2194d17c..4a4f3efa9bb6 100644
--- a/sys/mips/nlm/dev/sec/rsa_ucode.h
+++ b/sys/mips/nlm/dev/sec/rsa_ucode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/bridge.h b/sys/mips/nlm/hal/bridge.h
index 9374a7cdcfe7..05988099be2d 100644
--- a/sys/mips/nlm/hal/bridge.h
+++ b/sys/mips/nlm/hal/bridge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/cop2.h b/sys/mips/nlm/hal/cop2.h
index 80ec474a242f..9cbd266a9a19 100644
--- a/sys/mips/nlm/hal/cop2.h
+++ b/sys/mips/nlm/hal/cop2.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/cpucontrol.h b/sys/mips/nlm/hal/cpucontrol.h
index 2328bad3c2c7..1d08eb06fe7d 100644
--- a/sys/mips/nlm/hal/cpucontrol.h
+++ b/sys/mips/nlm/hal/cpucontrol.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/fmn.c b/sys/mips/nlm/hal/fmn.c
index 5e568e2df08b..8ebc7537ac35 100644
--- a/sys/mips/nlm/hal/fmn.c
+++ b/sys/mips/nlm/hal/fmn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/fmn.h b/sys/mips/nlm/hal/fmn.h
index 60548723b6ef..0f5a0336728b 100644
--- a/sys/mips/nlm/hal/fmn.h
+++ b/sys/mips/nlm/hal/fmn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/gbu.h b/sys/mips/nlm/hal/gbu.h
index adb67bbfd94c..61d624f3c7fd 100644
--- a/sys/mips/nlm/hal/gbu.h
+++ b/sys/mips/nlm/hal/gbu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/haldefs.h b/sys/mips/nlm/hal/haldefs.h
index 44890a165cc0..40a6e8492190 100644
--- a/sys/mips/nlm/hal/haldefs.h
+++ b/sys/mips/nlm/hal/haldefs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/interlaken.h b/sys/mips/nlm/hal/interlaken.h
index b967b8b89054..e89a9a53669a 100644
--- a/sys/mips/nlm/hal/interlaken.h
+++ b/sys/mips/nlm/hal/interlaken.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/iomap.h b/sys/mips/nlm/hal/iomap.h
index c5ebb68bffd2..7d9ae109c9a1 100644
--- a/sys/mips/nlm/hal/iomap.h
+++ b/sys/mips/nlm/hal/iomap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/mdio.h b/sys/mips/nlm/hal/mdio.h
index c4f3e8cde6ca..465fbf18e77f 100644
--- a/sys/mips/nlm/hal/mdio.h
+++ b/sys/mips/nlm/hal/mdio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/mips-extns.h b/sys/mips/nlm/hal/mips-extns.h
index 93c9db5d81cc..d4801e7046b4 100644
--- a/sys/mips/nlm/hal/mips-extns.h
+++ b/sys/mips/nlm/hal/mips-extns.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/mmu.h b/sys/mips/nlm/hal/mmu.h
index 7c72d0579f88..2b8554aadd64 100644
--- a/sys/mips/nlm/hal/mmu.h
+++ b/sys/mips/nlm/hal/mmu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/nae.h b/sys/mips/nlm/hal/nae.h
index a2a3756947d7..f4169c015816 100644
--- a/sys/mips/nlm/hal/nae.h
+++ b/sys/mips/nlm/hal/nae.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/nlm_hal.c b/sys/mips/nlm/hal/nlm_hal.c
index aa4bf5e00edd..65aa323b0db4 100644
--- a/sys/mips/nlm/hal/nlm_hal.c
+++ b/sys/mips/nlm/hal/nlm_hal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/nlmsaelib.h b/sys/mips/nlm/hal/nlmsaelib.h
index 230b3740f401..c61ace8e87e8 100644
--- a/sys/mips/nlm/hal/nlmsaelib.h
+++ b/sys/mips/nlm/hal/nlmsaelib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/pcibus.h b/sys/mips/nlm/hal/pcibus.h
index e6e0a3cdfa29..a11aadb371ce 100644
--- a/sys/mips/nlm/hal/pcibus.h
+++ b/sys/mips/nlm/hal/pcibus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/pic.h b/sys/mips/nlm/hal/pic.h
index c36e71383dba..1229cf5db3ab 100644
--- a/sys/mips/nlm/hal/pic.h
+++ b/sys/mips/nlm/hal/pic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/poe.h b/sys/mips/nlm/hal/poe.h
index 688d476cf838..b60ee7429ff7 100644
--- a/sys/mips/nlm/hal/poe.h
+++ b/sys/mips/nlm/hal/poe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/sgmii.h b/sys/mips/nlm/hal/sgmii.h
index 2059a40aa74d..c2f2580cb261 100644
--- a/sys/mips/nlm/hal/sgmii.h
+++ b/sys/mips/nlm/hal/sgmii.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/sys.h b/sys/mips/nlm/hal/sys.h
index 39fda2b9064a..078e63d69123 100644
--- a/sys/mips/nlm/hal/sys.h
+++ b/sys/mips/nlm/hal/sys.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/uart.h b/sys/mips/nlm/hal/uart.h
index 4783ccd7d4ce..e7e68d07e664 100644
--- a/sys/mips/nlm/hal/uart.h
+++ b/sys/mips/nlm/hal/uart.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/ucore_loader.h b/sys/mips/nlm/hal/ucore_loader.h
index 95f2caf0bea8..7ac1ed6cda47 100644
--- a/sys/mips/nlm/hal/ucore_loader.h
+++ b/sys/mips/nlm/hal/ucore_loader.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/hal/usb.h b/sys/mips/nlm/hal/usb.h
index 3101a2e498b4..476af91b43bf 100644
--- a/sys/mips/nlm/hal/usb.h
+++ b/sys/mips/nlm/hal/usb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/hal/xaui.h b/sys/mips/nlm/hal/xaui.h
index db422844711b..ffd39da9b463 100644
--- a/sys/mips/nlm/hal/xaui.h
+++ b/sys/mips/nlm/hal/xaui.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/nlm/interrupt.h b/sys/mips/nlm/interrupt.h
index ba502f3f7767..cf0a7abdc227 100644
--- a/sys/mips/nlm/interrupt.h
+++ b/sys/mips/nlm/interrupt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/intr_machdep.c b/sys/mips/nlm/intr_machdep.c
index b66118c06ee8..db15e3037e25 100644
--- a/sys/mips/nlm/intr_machdep.c
+++ b/sys/mips/nlm/intr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/msgring.h b/sys/mips/nlm/msgring.h
index deef2215209e..5366b7f73946 100644
--- a/sys/mips/nlm/msgring.h
+++ b/sys/mips/nlm/msgring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c
index 5993c892865b..bba4bde88e80 100644
--- a/sys/mips/nlm/tick.c
+++ b/sys/mips/nlm/tick.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/uart_cpu_xlp.c b/sys/mips/nlm/uart_cpu_xlp.c
index 773cf28a76ae..67627ac12a44 100644
--- a/sys/mips/nlm/uart_cpu_xlp.c
+++ b/sys/mips/nlm/uart_cpu_xlp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/usb_init.c b/sys/mips/nlm/usb_init.c
index 29e397db336f..5bcc805cae78 100644
--- a/sys/mips/nlm/usb_init.c
+++ b/sys/mips/nlm/usb_init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/xlp.h b/sys/mips/nlm/xlp.h
index 2ace3112fbe9..69faacdd0f9b 100644
--- a/sys/mips/nlm/xlp.h
+++ b/sys/mips/nlm/xlp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c
index 1237000c98fb..5f93d6c232e4 100644
--- a/sys/mips/nlm/xlp_machdep.c
+++ b/sys/mips/nlm/xlp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
*
diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c
index 35be81e7c3aa..51ae2b746c0a 100644
--- a/sys/mips/nlm/xlp_pci.c
+++ b/sys/mips/nlm/xlp_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
*
diff --git a/sys/mips/rmi/board.c b/sys/mips/rmi/board.c
index b035ba271715..7572a699713c 100644
--- a/sys/mips/rmi/board.c
+++ b/sys/mips/rmi/board.c
@@ -1,6 +1,4 @@
/*********************************************************************
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
*
* Copyright 2003-2006 Raza Microelectronics, Inc. (RMI). All rights
* reserved.
diff --git a/sys/mips/rmi/board.h b/sys/mips/rmi/board.h
index 2544e5b81af7..7d664fe8e542 100644
--- a/sys/mips/rmi/board.h
+++ b/sys/mips/rmi/board.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/bus_space_rmi.c b/sys/mips/rmi/bus_space_rmi.c
index ccaae6284a3b..b2daeb4ddcf9 100644
--- a/sys/mips/rmi/bus_space_rmi.c
+++ b/sys/mips/rmi/bus_space_rmi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/bus_space_rmi_pci.c b/sys/mips/rmi/bus_space_rmi_pci.c
index ae485c35c7cf..ebd70c1d10b4 100644
--- a/sys/mips/rmi/bus_space_rmi_pci.c
+++ b/sys/mips/rmi/bus_space_rmi_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/iic/at24co2n.c b/sys/mips/rmi/dev/iic/at24co2n.c
index a313fc311bb1..48f1880d8fa9 100644
--- a/sys/mips/rmi/dev/iic/at24co2n.c
+++ b/sys/mips/rmi/dev/iic/at24co2n.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/iic/max6657.c b/sys/mips/rmi/dev/iic/max6657.c
index 0d69dc454326..8d7006f66c03 100644
--- a/sys/mips/rmi/dev/iic/max6657.c
+++ b/sys/mips/rmi/dev/iic/max6657.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 011572ee5446..ff4810c9a434 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.h b/sys/mips/rmi/dev/nlge/if_nlge.h
index a713f960c427..680b8d9f3d65 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.h
+++ b/sys/mips/rmi/dev/nlge/if_nlge.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/sec/desc.h b/sys/mips/rmi/dev/sec/desc.h
index fe17b8e239ba..1238d001060f 100644
--- a/sys/mips/rmi/dev/sec/desc.h
+++ b/sys/mips/rmi/dev/sec/desc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/sec/rmilib.c b/sys/mips/rmi/dev/sec/rmilib.c
index 9451c1808f6b..f90123d6e3d1 100644
--- a/sys/mips/rmi/dev/sec/rmilib.c
+++ b/sys/mips/rmi/dev/sec/rmilib.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/sec/rmilib.h b/sys/mips/rmi/dev/sec/rmilib.h
index 691b455a199d..00106f9b9445 100644
--- a/sys/mips/rmi/dev/sec/rmilib.h
+++ b/sys/mips/rmi/dev/sec/rmilib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/sec/rmisec.c b/sys/mips/rmi/dev/sec/rmisec.c
index bc417440869f..31098bc65f52 100644
--- a/sys/mips/rmi/dev/sec/rmisec.c
+++ b/sys/mips/rmi/dev/sec/rmisec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/dev/xlr/debug.h b/sys/mips/rmi/dev/xlr/debug.h
index 9e0dd6bb6f7d..53f1cb21dc05 100644
--- a/sys/mips/rmi/dev/xlr/debug.h
+++ b/sys/mips/rmi/dev/xlr/debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/fmn.c b/sys/mips/rmi/fmn.c
index 0f44ab5e2045..b9c596592f4c 100644
--- a/sys/mips/rmi/fmn.c
+++ b/sys/mips/rmi/fmn.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/interrupt.h b/sys/mips/rmi/interrupt.h
index ccb66f01925d..76bbe5afa2e8 100644
--- a/sys/mips/rmi/interrupt.h
+++ b/sys/mips/rmi/interrupt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/intr_machdep.c b/sys/mips/rmi/intr_machdep.c
index 435bc35b8d12..c606548c19eb 100644
--- a/sys/mips/rmi/intr_machdep.c
+++ b/sys/mips/rmi/intr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2009 RMI Corporation
* Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c
index 363424034af8..d1f74e198fba 100644
--- a/sys/mips/rmi/iodi.c
+++ b/sys/mips/rmi/iodi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/iomap.h b/sys/mips/rmi/iomap.h
index 0395a7702ebc..72756d25483b 100644
--- a/sys/mips/rmi/iomap.h
+++ b/sys/mips/rmi/iomap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/msgring.h b/sys/mips/rmi/msgring.h
index 5cc9072d9e77..6110f5f5b25b 100644
--- a/sys/mips/rmi/msgring.h
+++ b/sys/mips/rmi/msgring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/pcibus.h b/sys/mips/rmi/pcibus.h
index b80b795d187a..7d1e9234c3ac 100644
--- a/sys/mips/rmi/pcibus.h
+++ b/sys/mips/rmi/pcibus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/mips/rmi/pic.h b/sys/mips/rmi/pic.h
index 42013c0fb1e9..d7e3add41bc7 100644
--- a/sys/mips/rmi/pic.h
+++ b/sys/mips/rmi/pic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/rmi_boot_info.h b/sys/mips/rmi/rmi_boot_info.h
index a4fa28b948d6..38c81bd395da 100644
--- a/sys/mips/rmi/rmi_boot_info.h
+++ b/sys/mips/rmi/rmi_boot_info.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/rmi_mips_exts.h b/sys/mips/rmi/rmi_mips_exts.h
index d1da62dedc66..fb2f886767bb 100644
--- a/sys/mips/rmi/rmi_mips_exts.h
+++ b/sys/mips/rmi/rmi_mips_exts.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c
index f557ce731eea..3b22795b9948 100644
--- a/sys/mips/rmi/tick.c
+++ b/sys/mips/rmi/tick.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2007 Bruce M. Simpson.
* Copyright (c) 2003-2004 Juli Mallett.
* All rights reserved.
diff --git a/sys/mips/rmi/uart_bus_xlr_iodi.c b/sys/mips/rmi/uart_bus_xlr_iodi.c
index d49f3e3edc4b..8b87262f7426 100644
--- a/sys/mips/rmi/uart_bus_xlr_iodi.c
+++ b/sys/mips/rmi/uart_bus_xlr_iodi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Raza Microelectronics
* All rights reserved.
*
diff --git a/sys/mips/rmi/uart_cpu_mips_xlr.c b/sys/mips/rmi/uart_cpu_mips_xlr.c
index 407023e4ae9e..816dec2a2608 100644
--- a/sys/mips/rmi/uart_cpu_mips_xlr.c
+++ b/sys/mips/rmi/uart_cpu_mips_xlr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/rmi/xlr_i2c.c b/sys/mips/rmi/xlr_i2c.c
index 69bd58ed67e1..337d606e3a4d 100644
--- a/sys/mips/rmi/xlr_i2c.c
+++ b/sys/mips/rmi/xlr_i2c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/xlr_machdep.c b/sys/mips/rmi/xlr_machdep.c
index 212a938e8204..ad3d07355fd0 100644
--- a/sys/mips/rmi/xlr_machdep.c
+++ b/sys/mips/rmi/xlr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2009 RMI Corporation
* Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/rmi/xlr_pci.c b/sys/mips/rmi/xlr_pci.c
index 5832e27cc93c..3d985039d559 100644
--- a/sys/mips/rmi/xlr_pci.c
+++ b/sys/mips/rmi/xlr_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/xlr_pcmcia.c b/sys/mips/rmi/xlr_pcmcia.c
index 1c510013b00b..86322669c8b1 100644
--- a/sys/mips/rmi/xlr_pcmcia.c
+++ b/sys/mips/rmi/xlr_pcmcia.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003-2009 RMI Corporation
* All rights reserved.
*
diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c
index d0cff83fc1e1..00183f7a14dc 100644
--- a/sys/mips/rmi/xls_ehci.c
+++ b/sys/mips/rmi/xls_ehci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c
index 1004a01e963b..79d7504eb5eb 100644
--- a/sys/mips/rt305x/obio.c
+++ b/sys/mips/rt305x/obio.c
@@ -1,8 +1,6 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/obiovar.h b/sys/mips/rt305x/obiovar.h
index 002194af09b6..e1742e8897c1 100644
--- a/sys/mips/rt305x/obiovar.h
+++ b/sys/mips/rt305x/obiovar.h
@@ -1,8 +1,6 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_dotg.c b/sys/mips/rt305x/rt305x_dotg.c
index 73c9a2de7553..b39046f89fc8 100644
--- a/sys/mips/rt305x/rt305x_dotg.c
+++ b/sys/mips/rt305x/rt305x_dotg.c
@@ -2,8 +2,6 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015 Stanislav Galabov. All rights reserved.
* Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
diff --git a/sys/mips/rt305x/rt305x_gpio.c b/sys/mips/rt305x/rt305x_gpio.c
index 326dfcc39d3d..56b734aa11f3 100644
--- a/sys/mips/rt305x/rt305x_gpio.c
+++ b/sys/mips/rt305x/rt305x_gpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2011, Aleksandr Rybalko <ray@ddteam.net>
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
diff --git a/sys/mips/rt305x/rt305x_gpio.h b/sys/mips/rt305x/rt305x_gpio.h
index 45d50726f3ab..8ce3ab5118dd 100644
--- a/sys/mips/rt305x/rt305x_gpio.h
+++ b/sys/mips/rt305x/rt305x_gpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_gpiovar.h b/sys/mips/rt305x/rt305x_gpiovar.h
index 0eab1a7e0f32..d486838e8d22 100644
--- a/sys/mips/rt305x/rt305x_gpiovar.h
+++ b/sys/mips/rt305x/rt305x_gpiovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_ic.c b/sys/mips/rt305x/rt305x_ic.c
index 28f61c9b96ce..8bddd4190084 100644
--- a/sys/mips/rt305x/rt305x_ic.c
+++ b/sys/mips/rt305x/rt305x_ic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_icvar.h b/sys/mips/rt305x/rt305x_icvar.h
index 4dcc88f8905b..4d969c8c708b 100644
--- a/sys/mips/rt305x/rt305x_icvar.h
+++ b/sys/mips/rt305x/rt305x_icvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_machdep.c b/sys/mips/rt305x/rt305x_machdep.c
index f1b0b2c615a1..edeb40cafdc4 100644
--- a/sys/mips/rt305x/rt305x_machdep.c
+++ b/sys/mips/rt305x/rt305x_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010-2011 by Aleksandr Rybalko. All rights reserved.
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_sysctl.c b/sys/mips/rt305x/rt305x_sysctl.c
index 6a86374d6017..077ccadb26f5 100644
--- a/sys/mips/rt305x/rt305x_sysctl.c
+++ b/sys/mips/rt305x/rt305x_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305x_sysctlvar.h b/sys/mips/rt305x/rt305x_sysctlvar.h
index 71553df4e945..91a5282a01fd 100644
--- a/sys/mips/rt305x/rt305x_sysctlvar.h
+++ b/sys/mips/rt305x/rt305x_sysctlvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/rt305xreg.h b/sys/mips/rt305x/rt305xreg.h
index 2629236dce37..458e1c97d3f6 100644
--- a/sys/mips/rt305x/rt305xreg.h
+++ b/sys/mips/rt305x/rt305xreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2015 Stanislav Galabov.
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
diff --git a/sys/mips/rt305x/rt_swreg.h b/sys/mips/rt305x/rt_swreg.h
index 9690953403d3..ab382b904547 100644
--- a/sys/mips/rt305x/rt_swreg.h
+++ b/sys/mips/rt305x/rt_swreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/uart_bus_rt305x.c b/sys/mips/rt305x/uart_bus_rt305x.c
index fdd4cab79456..8b1008029a1b 100644
--- a/sys/mips/rt305x/uart_bus_rt305x.c
+++ b/sys/mips/rt305x/uart_bus_rt305x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/mips/rt305x/uart_cpu_rt305x.c b/sys/mips/rt305x/uart_cpu_rt305x.c
index 0a6c4e4af15b..345db4604385 100644
--- a/sys/mips/rt305x/uart_cpu_rt305x.c
+++ b/sys/mips/rt305x/uart_cpu_rt305x.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/mips/rt305x/uart_dev_rt305x.c b/sys/mips/rt305x/uart_dev_rt305x.c
index e52c4e47e461..5d23b1eeaef0 100644
--- a/sys/mips/rt305x/uart_dev_rt305x.c
+++ b/sys/mips/rt305x/uart_dev_rt305x.c
@@ -1,8 +1,6 @@
/* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* Copyright (c) 2007 Oleksandr Tymoshenko.
diff --git a/sys/mips/rt305x/uart_dev_rt305x.h b/sys/mips/rt305x/uart_dev_rt305x.h
index 203a8d1d1dd9..c24b339d9fde 100644
--- a/sys/mips/rt305x/uart_dev_rt305x.h
+++ b/sys/mips/rt305x/uart_dev_rt305x.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
*
diff --git a/sys/mips/sibyte/ata_zbbus.c b/sys/mips/sibyte/ata_zbbus.c
index 84d0d51d114d..7f4706300f6d 100644
--- a/sys/mips/sibyte/ata_zbbus.c
+++ b/sys/mips/sibyte/ata_zbbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_bus_space.h b/sys/mips/sibyte/sb_bus_space.h
index 3e9dbee673c3..f3364f07a29a 100644
--- a/sys/mips/sibyte/sb_bus_space.h
+++ b/sys/mips/sibyte/sb_bus_space.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_machdep.c b/sys/mips/sibyte/sb_machdep.c
index 11a23a109d7e..5e7c2fded872 100644
--- a/sys/mips/sibyte/sb_machdep.c
+++ b/sys/mips/sibyte/sb_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_scd.c b/sys/mips/sibyte/sb_scd.c
index 366d728b4b01..50b99876acaa 100644
--- a/sys/mips/sibyte/sb_scd.c
+++ b/sys/mips/sibyte/sb_scd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_scd.h b/sys/mips/sibyte/sb_scd.h
index 91e082f86c07..f8bb6e48ff84 100644
--- a/sys/mips/sibyte/sb_scd.h
+++ b/sys/mips/sibyte/sb_scd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c
index aec8839cadc3..f87b6b8bceef 100644
--- a/sys/mips/sibyte/sb_zbbus.c
+++ b/sys/mips/sibyte/sb_zbbus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/mips/sibyte/sb_zbpci.c b/sys/mips/sibyte/sb_zbpci.c
index 26ca29bf0d3b..952fea80d355 100644
--- a/sys/mips/sibyte/sb_zbpci.c
+++ b/sys/mips/sibyte/sb_zbpci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
*
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index cd839687cb5f..8675e009194e 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 0089195df934..679f896d9538 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/bpf_buffer.c b/sys/net/bpf_buffer.c
index 9af188aba103..64bb982aab22 100644
--- a/sys/net/bpf_buffer.c
+++ b/sys/net/bpf_buffer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
*
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 4066732f716c..d0d50a042eca 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/bpf_jitter.c b/sys/net/bpf_jitter.c
index 0ab17c67232d..d024047582bd 100644
--- a/sys/net/bpf_jitter.c
+++ b/sys/net/bpf_jitter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net/bpf_jitter.h b/sys/net/bpf_jitter.h
index a0b6acce7636..90a1ff5fbb07 100644
--- a/sys/net/bpf_jitter.h
+++ b/sys/net/bpf_jitter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
* Copyright (C) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index eae696a91fcd..496f0b36b6d4 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 0badcc3c38b9..71e3b6fbd438 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
diff --git a/sys/net/if.c b/sys/net/if.c
index 87499d3e9f73..a47baa03e2b1 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if.h b/sys/net/if.h
index b352bee2f7d6..cf615815b682 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h
index 082bbb491f32..23139aa6f669 100644
--- a/sys/net/if_arc.h
+++ b/sys/net/if_arc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 9fbb2fb33c3d..3bf372baba6c 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994, 1995 Ignatios Souvatzis
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 35f44f0c2285..7d141f377163 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 0e47ed814fa7..58b1afe9eff7 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index 5f64ad9ee622..3a60b0a10d3b 100644
--- a/sys/net/if_clone.h
+++ b/sys/net/if_clone.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 1652bbc3f399..3f7472cf9822 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index abaacae2cd71..f53bc5e447dc 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
index b1e46ead2f85..26c21094d57c 100644
--- a/sys/net/if_edsc.c
+++ b/sys/net/if_edsc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 89411da45598..193136c3efae 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index cb8f69214208..3c13483987cc 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995, 1996
* Matt Thomas <matt@3am-software.com>. All rights reserved.
* Copyright (c) 1982, 1989, 1993
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index 9c743a23d976..57f42567128f 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Doug Rabson
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index cbf19cbea9ae..cfa4650ac2b8 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index 18e33701f8ae..b71c8e886874 100644
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -2,8 +2,6 @@
/* $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 81ba0023f1c0..0d96372ed5be 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -1,8 +1,6 @@
/* $NetBSD: if_llc.h,v 1.12 1999/11/19 20:41:19 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index f90cb1e0f983..4d7de10b3ca6 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index d77a58762310..5209bc838f25 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -2,8 +2,6 @@
/* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 4bfd7358a7d3..92e101ac6af4 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 604663ae24b7..765fc9961b3c 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
index be699f3960d5..98a84aafe6c7 100644
--- a/sys/net/ifq.h
+++ b/sys/net/ifq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 7bbdd577a5f5..c2cf568f6f98 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -2,8 +2,6 @@
/* $KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/radix.c b/sys/net/radix.c
index fcacf3a24a93..62c2c3b6765a 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 0f76c1a492e2..69aad831bd91 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/radix_mpath.c b/sys/net/radix_mpath.c
index e5dc29928981..d3ce92c9ee1d 100644
--- a/sys/net/radix_mpath.c
+++ b/sys/net/radix_mpath.c
@@ -1,8 +1,6 @@
/* $KAME: radix_mpath.c,v 1.17 2004/11/08 10:29:39 itojun Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/radix_mpath.h b/sys/net/radix_mpath.h
index bb6a9087a737..2b0d442e5da1 100644
--- a/sys/net/radix_mpath.h
+++ b/sys/net/radix_mpath.h
@@ -1,8 +1,6 @@
/* $KAME: radix_mpath.h,v 1.10 2004/11/06 15:44:28 itojun Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
*
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 32bf59a05fc8..477a65db26e7 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index aa6b0304fc89..1b347e02a8dd 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 248d20e93ad6..9e22528b7e98 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/net/route.c b/sys/net/route.c
index 74b86197761c..3652eb43dce6 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/route.h b/sys/net/route.h
index 3b8202d14054..d76ed7006d8e 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 13f4e9844ee2..88ad42178f34 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index cd1ba9d913ea..601b138463fd 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 65d508e5c6d7..794d8b83818b 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -2,8 +2,6 @@
* Definitions for tcp compression routines.
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index abf2a3a0d425..6d171f4585a2 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -2,8 +2,6 @@
/* $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 00aa136e8643..d3e72bc2823e 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 3312676105fe..0ce68120e121 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 1a097d526f55..27e51f78b69c 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index c55948b0e54f..4fa303fbb89e 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (c) 1988 Stephen Deering.
* Copyright (c) 1992, 1993
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index f62fa828dfe2..8f574290b8eb 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 Stephen Deering.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 2d71f8bcd019..5242d07d1cb6 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*-a
* Copyright (c) 1988 Stephen Deering.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 4a2db5b485da..a40920fdce49 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (C) 2001 WIDE Project. All rights reserved.
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 5c1d8c9324a6..d254ee0dd6dd 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 6751f135d639..64492c9b178b 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index c30709c878ea..0d9945ce5ca9 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index ce9c192dbbe9..9526960e2b9f 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993, 1995
* The Regents of the University of California.
* Copyright (c) 2007-2009 Robert N. M. Watson
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 392aa95aa1f9..4e3fbe5595bf 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 31b8b593abf2..363716ff2175 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 46c5e29fe8cc..acd2e62a2e5c 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 2a83c6b3c2ae..08055c4fad1d 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 55d83e372c9c..98bd1e999404 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 9a8a8fe410dd..ff870579bbc7 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -2,8 +2,6 @@
/* $KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index a5c7d56e083d..fcb7c3e5fcca 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 2b8c8241619c..9fce01d7cd68 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -1,8 +1,6 @@
/* $KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index eb49b5f14215..c5c1c4ebf57f 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -2,8 +2,6 @@
/* $KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index 7f125522825c..f186fe2f7a56 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -1,8 +1,6 @@
/* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index bbbee390d41c..0b8dbd6fcbc9 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -2,8 +2,6 @@
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 98241934a949..3c878da7e907 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 5c073c4fad0b..64db006487f6 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 421674196c25..8c37a5e3186b 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index e646c1257fa1..1051016a84e8 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 03276b6d8448..65f7d83ca3e8 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Stephen Deering.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c
index f0c2d4bfd708..399c88bdbb52 100644
--- a/sys/netinet/ip_options.c
+++ b/sys/netinet/ip_options.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
* Copyright (c) 2005 Andre Oppermann, Internet Business Solutions AG.
diff --git a/sys/netinet/ip_options.h b/sys/netinet/ip_options.h
index 969e3d59ac60..4a6ea420e20e 100644
--- a/sys/netinet/ip_options.h
+++ b/sys/netinet/ip_options.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
* Copyright (c) 2005 Andre Oppermann, Internet Business Solutions AG.
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 97b9dc308549..da56300b1e31 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index b92730747154..847704fd1d7f 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index ec140cb3d675..7878f7972fb6 100644
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996-2000
* University of Southern California/Information Sciences Institute.
* All rights reserved.
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index e6398a4dfa95..ae876c948fc7 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998-2000
* University of Southern California/Information Sciences Institute.
* All rights reserved.
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index f2e08c9a745f..b79bbd03777c 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet/sctp.h b/sys/netinet/sctp.h
index d4b1384c8939..ec42cffaf661 100644
--- a/sys/netinet/sctp.h
+++ b/sys/netinet/sctp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 2d63c3c23533..32efe29edef4 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_asconf.h b/sys/netinet/sctp_asconf.h
index 578f2e9315b3..c8d670e59bc5 100644
--- a/sys/netinet/sctp_asconf.h
+++ b/sys/netinet/sctp_asconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c
index ca4d724f7f2a..959675d6f914 100644
--- a/sys/netinet/sctp_auth.c
+++ b/sys/netinet/sctp_auth.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h
index 66990c309338..04fd6464dc49 100644
--- a/sys/netinet/sctp_auth.h
+++ b/sys/netinet/sctp_auth.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c
index f8b9822e6f48..448d79181a43 100644
--- a/sys/netinet/sctp_bsd_addr.c
+++ b/sys/netinet/sctp_bsd_addr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_bsd_addr.h b/sys/netinet/sctp_bsd_addr.h
index f2191a9bcacb..8c0383a5d8a1 100644
--- a/sys/netinet/sctp_bsd_addr.h
+++ b/sys/netinet/sctp_bsd_addr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
index fe881e037668..954a79977f35 100644
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index ac9279396d84..dca34cc59ffa 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_crc32.c b/sys/netinet/sctp_crc32.c
index d30bc50197f0..93d26ea3585d 100644
--- a/sys/netinet/sctp_crc32.c
+++ b/sys/netinet/sctp_crc32.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_crc32.h b/sys/netinet/sctp_crc32.h
index adc38afc3678..7fe02f5cbff9 100644
--- a/sys/netinet/sctp_crc32.h
+++ b/sys/netinet/sctp_crc32.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_dtrace_declare.h b/sys/netinet/sctp_dtrace_declare.h
index e4dc97fce7aa..c5c8f9ce1618 100644
--- a/sys/netinet/sctp_dtrace_declare.h
+++ b/sys/netinet/sctp_dtrace_declare.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
*
diff --git a/sys/netinet/sctp_dtrace_define.h b/sys/netinet/sctp_dtrace_define.h
index 53451d201a87..19f44da482e2 100644
--- a/sys/netinet/sctp_dtrace_define.h
+++ b/sys/netinet/sctp_dtrace_define.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
*
diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h
index 685ed78ac63d..b650d930a842 100644
--- a/sys/netinet/sctp_header.h
+++ b/sys/netinet/sctp_header.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index c384b24a3253..1e6ebd934828 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_indata.h b/sys/netinet/sctp_indata.h
index 10b18d0bc8ed..badd269d6ebe 100644
--- a/sys/netinet/sctp_indata.h
+++ b/sys/netinet/sctp_indata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 8f5ffbf1a5bc..360013c889b2 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_input.h b/sys/netinet/sctp_input.h
index ff0916e747b6..25df0f3ba13e 100644
--- a/sys/netinet/sctp_input.h
+++ b/sys/netinet/sctp_input.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h
index a92d5f2bd39c..96e35214594a 100644
--- a/sys/netinet/sctp_lock_bsd.h
+++ b/sys/netinet/sctp_lock_bsd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_os.h b/sys/netinet/sctp_os.h
index 57ab6d79f6c0..dc6049b6487a 100644
--- a/sys/netinet/sctp_os.h
+++ b/sys/netinet/sctp_os.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index 55c0220998c6..b439b593af30 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 3e8dcca11825..e04486ce8c0e 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_output.h b/sys/netinet/sctp_output.h
index a2e975879d6d..cd90b7d7e074 100644
--- a/sys/netinet/sctp_output.h
+++ b/sys/netinet/sctp_output.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index b1fd247e7501..562401f817d2 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index 7d714c327d80..86fae1f4adac 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_peeloff.c b/sys/netinet/sctp_peeloff.c
index 1bcca671d69b..b7024765a7c3 100644
--- a/sys/netinet/sctp_peeloff.c
+++ b/sys/netinet/sctp_peeloff.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_peeloff.h b/sys/netinet/sctp_peeloff.h
index 478b1995f7ed..00b870312365 100644
--- a/sys/netinet/sctp_peeloff.h
+++ b/sys/netinet/sctp_peeloff.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index 2bc1b9107216..f7371748f554 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 561904f6f778..149419971b8e 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 8187ae9edc95..959bd1e45a99 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 364caa6f9ee1..4c87ee683f84 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_timer.h b/sys/netinet/sctp_timer.h
index d58fbaa94f1d..6d409cdc8486 100644
--- a/sys/netinet/sctp_timer.h
+++ b/sys/netinet/sctp_timer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h
index f54c94882c7d..d6055163abba 100644
--- a/sys/netinet/sctp_uio.h
+++ b/sys/netinet/sctp_uio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index fe1201138f3b..75d817559bc1 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h
index 84cbfc884306..9e149e681386 100644
--- a/sys/netinet/sctp_var.h
+++ b/sys/netinet/sctp_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 36337575ba04..1dd3c3e2f0c8 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h
index 0de11d6307ab..50118b7a5ed0 100644
--- a/sys/netinet/sctputil.h
+++ b/sys/netinet/sctputil.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 2ca8e9274237..470381040705 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index fd86ecae2a9d..d8dda289f1fe 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index d66b9c3087f2..c4d38da9eff0 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 027ff0e48e0d..5423e1f19267 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index bfe4483a3ab4..5f7fcc887ad4 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2007-2008,2010
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 2dd9ef953326..5e86c0b982e8 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index d6b64d18ca88..a22fb3081d6d 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index f8de8d902114..d96e19ea1e1a 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California.
* All rights reserved.
@@ -13,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 5050f95625fe..cfa8fff82dca 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 6a5548cacf04..ebad3007de35 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index 315d649e5ed2..fe17da6ddb4a 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 9a281dfd3ba6..099c952a5439 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 451c8e674fe0..185368de6fce 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 3ae9546a0ea9..124ba1562d10 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 1d036a36dba3..c1e4820acf10 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
* Copyright (c) 2006-2007 Robert N. M. Watson
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 5608e522ce14..09bbe40cf701 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 566dceb1f138..3a89d5d5bd30 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index ce989f7e8237..d84757204b3a 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index bd9a9c81d216..c771201ae770 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California.
* Copyright (c) 2008 Robert N. M. Watson
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index d60b44d47d1b..9564da291a3d 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index c5e75413a5f6..2b95fd9d0118 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 0d243f923a96..980d2541b96f 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 35ee6f5cad82..53a228c29ba3 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 2f6a50e1c58d..a04a39695eaa 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index fc6bee2e649e..140cd307fcec 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index c0b3a798120e..ce1961a60082 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index e67d64eaf131..e6901ba27b32 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 9f6c8a8bbb63..c20588bfad1e 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index 1e038fa8319c..a34530dbef2b 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 6731f89f6569..dcbf8c779775 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 52cf2d7abc64..e758dacea3b8 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index f0ee4cea7a2c..44ea1af01c2f 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 728e53ef4645..102ad506de78 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 1c7b1110275d..59d0cb947e43 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 5680697f78f3..d7c1038417ed 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index dade65732071..27d3f34dbd17 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 15cc656cf098..bf1f66e4248e 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index e4d0337b2768..4c85278d3e0c 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -30,8 +30,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright 1998 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index c33309c5af4e..0b2812c6fec2 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 9c17f48be150..206cebf1f9d0 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 40a857707dee..51e1d496af6c 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 3fc93135e1ff..551f1747b75d 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 15ebb1caa455..5d229ab427dd 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index e7bd2dd57a84..9e80a698f46a 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 8140ae9729dd..c7ad5a2e33b3 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Bruce Simpson.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 40b1a3160601..aba2d57cab9d 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 30990637cc21..243e9548041a 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index c90a8b879f25..31199a225913 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 8f6c4209256f..e8044f7cd978 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 45346e89f4f2..dec84cf2e625 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 7afe89b9f844..7f9262bbc75d 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 3d1347583820..81df75ba5598 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index e2dcac36da6c..5eec5fffd821 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index fe31b710fa5b..5f224375e57d 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index cc8e25e509b8..e5da367fe7a7 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index a2a9137dad37..e38d77a91b5e 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index be42079d8141..054b4c1b06a5 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h
index e3c4359a1480..a24ceba7ee15 100644
--- a/sys/netinet6/sctp6_var.h
+++ b/sys/netinet6/sctp6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
* Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 950709837948..5cb04f99daf8 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index c9015abfb926..56faf5a85159 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* Copyright (c) 2014 Kevin Lo
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index 805e3b0e5e6c..cdab98b0d016 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ah.h b/sys/netipsec/ah.h
index 8c76dbc4479a..1ffeacdc3977 100644
--- a/sys/netipsec/ah.h
+++ b/sys/netipsec/ah.h
@@ -2,8 +2,6 @@
/* $KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h
index 94612b878514..8eb096302ca7 100644
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -2,8 +2,6 @@
/* $KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ipcomp.h b/sys/netipsec/ipcomp.h
index f1ffdc9b7204..47e9305ef6be 100644
--- a/sys/netipsec/ipcomp.h
+++ b/sys/netipsec/ipcomp.h
@@ -2,8 +2,6 @@
/* $KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ipcomp_var.h b/sys/netipsec/ipcomp_var.h
index 34bfb767943a..5062c9dddf5a 100644
--- a/sys/netipsec/ipcomp_var.h
+++ b/sys/netipsec/ipcomp_var.h
@@ -2,8 +2,6 @@
/* $KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 67bad0f635f2..7c29905166d6 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -2,8 +2,6 @@
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index 596824274fb4..452365fa8caf 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -2,8 +2,6 @@
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h
index 6d44f9891928..33aa30f3ff88 100644
--- a/sys/netipsec/ipsec6.h
+++ b/sys/netipsec/ipsec6.h
@@ -2,8 +2,6 @@
/* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index fe571bb7f61b..eed1b776dfc3 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -2,8 +2,6 @@
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h
index 6c3e05c039e8..a646832e01f4 100644
--- a/sys/netipsec/key.h
+++ b/sys/netipsec/key.h
@@ -2,8 +2,6 @@
/* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c
index ab595c2428cb..0251d961e8c4 100644
--- a/sys/netipsec/key_debug.c
+++ b/sys/netipsec/key_debug.c
@@ -2,8 +2,6 @@
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/key_debug.h b/sys/netipsec/key_debug.h
index a2dd57edd6fd..afb11cb1c357 100644
--- a/sys/netipsec/key_debug.h
+++ b/sys/netipsec/key_debug.h
@@ -2,8 +2,6 @@
/* $KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h
index bd68645e0985..ecef2360c2bf 100644
--- a/sys/netipsec/key_var.h
+++ b/sys/netipsec/key_var.h
@@ -2,8 +2,6 @@
/* $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h
index ccc213e7499f..ffbbe3325502 100644
--- a/sys/netipsec/keydb.h
+++ b/sys/netipsec/keydb.h
@@ -2,8 +2,6 @@
/* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 7f8b0e51c59e..84a449d320ab 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -2,8 +2,6 @@
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netipsec/keysock.h b/sys/netipsec/keysock.h
index 484c65361e5e..7373038b7fc3 100644
--- a/sys/netipsec/keysock.h
+++ b/sys/netipsec/keysock.h
@@ -2,8 +2,6 @@
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netpfil/pf/in4_cksum.c b/sys/netpfil/pf/in4_cksum.c
index 92ebea1b24ea..bf25baf97a0a 100644
--- a/sys/netpfil/pf/in4_cksum.c
+++ b/sys/netpfil/pf/in4_cksum.c
@@ -4,8 +4,6 @@
/* $NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index 394b026523a9..b647afd09ae8 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2000-2001, Boris Popov
* All rights reserved.
*
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 74bee40d5846..51c76e767755 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Gordon Ross, Adam Glass
* Copyright (c) 1992 Regents of the University of California.
* All rights reserved.
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index 21e8e3ad44d0..7ec8332d2781 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,8 +1,6 @@
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Gordon Ross, Adam Glass
* Copyright (c) 1992 Regents of the University of California.
* All rights reserved.
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 3fce6cb39426..c3420b32d366 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfs/nfs_diskless.c b/sys/nfs/nfs_diskless.c
index 7c565af9a0dd..e765c2eb138a 100644
--- a/sys/nfs/nfs_diskless.c
+++ b/sys/nfs/nfs_diskless.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/nfs/nfs_nfssvc.c b/sys/nfs/nfs_nfssvc.c
index 50a0ad5e3510..d8809e2e7c5f 100644
--- a/sys/nfs/nfs_nfssvc.c
+++ b/sys/nfs/nfs_nfssvc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index 30df871e2e2b..aa2bc043c924 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index da16fad041c4..aa2057c244d4 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfs/nfssvc.h b/sys/nfs/nfssvc.h
index 88650b1cb7f3..b742cd2a3cba 100644
--- a/sys/nfs/nfssvc.h
+++ b/sys/nfs/nfssvc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index b6e8ffb087d2..67546718282a 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 7758b2a43420..a085da165b76 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 46b40d4fd6ac..10e0cfb0fe4d 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index c493718e022a..25467cc7bfc2 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index edcae06c0de2..09ea5cf67b82 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index fc12dcd17673..c6fa73e76058 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 5f707ccb7b6f..8028429fc927 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 2140842bef20..3d019232dbd8 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 023d1693e40b..5bf4ca97b206 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index f50c95d9083d..d4e31b1b08cd 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index db330b967c63..d149e52c2df9 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
index 28874090d312..ace705cb2226 100644
--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -1,6 +1,5 @@
+
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2004 The FreeBSD Foundation. All rights reserved.
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index ab9fc5be4d66..827088ae34be 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index f305648edbf6..c9af9db561fb 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2015 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/aim/mmu_oea64.h b/sys/powerpc/aim/mmu_oea64.h
index 068cefc73d06..3d9235d63032 100644
--- a/sys/powerpc/aim/mmu_oea64.h
+++ b/sys/powerpc/aim/mmu_oea64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c
index 0589019a47ef..b2ca5ae37a67 100644
--- a/sys/powerpc/aim/moea64_native.c
+++ b/sys/powerpc/aim/moea64_native.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND 4-Clause-BSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index dc71a4201727..cedf53bdaae2 100644
--- a/sys/powerpc/aim/mp_cpudep.c
+++ b/sys/powerpc/aim/mp_cpudep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c
index 5a725f4860d3..caf6f4f75dd2 100644
--- a/sys/powerpc/aim/slb.c
+++ b/sys/powerpc/aim/slb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/booke/machdep_e500.c b/sys/powerpc/booke/machdep_e500.c
index 10dcf993e0e2..e0e60952942c 100644
--- a/sys/powerpc/booke/machdep_e500.c
+++ b/sys/powerpc/booke/machdep_e500.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/powerpc/booke/machdep_ppc4xx.c b/sys/powerpc/booke/machdep_ppc4xx.c
index 316a213b100e..69a1e2e7a97d 100644
--- a/sys/powerpc/booke/machdep_ppc4xx.c
+++ b/sys/powerpc/booke/machdep_ppc4xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/powerpc/booke/mp_cpudep.c b/sys/powerpc/booke/mp_cpudep.c
index 7502dcdd4003..5f6becead6eb 100644
--- a/sys/powerpc/booke/mp_cpudep.c
+++ b/sys/powerpc/booke/mp_cpudep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Semihalf, Rafal Jaworowski
* All rights reserved.
*
diff --git a/sys/powerpc/booke/platform_bare.c b/sys/powerpc/booke/platform_bare.c
index b2354eaed4e8..c11620a3ae71 100644
--- a/sys/powerpc/booke/platform_bare.c
+++ b/sys/powerpc/booke/platform_bare.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 8562086d39ca..04481299f2c8 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2007-2009 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
* All rights reserved.
diff --git a/sys/powerpc/cpufreq/dfs.c b/sys/powerpc/cpufreq/dfs.c
index 070e2841881e..fce9fc32bc78 100644
--- a/sys/powerpc/cpufreq/dfs.c
+++ b/sys/powerpc/cpufreq/dfs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/cpufreq/pcr.c b/sys/powerpc/cpufreq/pcr.c
index b4f2d8107c71..ff4d20d2e939 100644
--- a/sys/powerpc/cpufreq/pcr.c
+++ b/sys/powerpc/cpufreq/pcr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/cpufreq/pmufreq.c b/sys/powerpc/cpufreq/pmufreq.c
index b902e04ac03b..2fbeef3b1ccf 100644
--- a/sys/powerpc/cpufreq/pmufreq.c
+++ b/sys/powerpc/cpufreq/pmufreq.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Justin Hibbits
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/fpu/fpu_add.c b/sys/powerpc/fpu/fpu_add.c
index 6dd594ca0ec9..97b9d255051f 100644
--- a/sys/powerpc/fpu/fpu_add.c
+++ b/sys/powerpc/fpu/fpu_add.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_add.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_arith.h b/sys/powerpc/fpu/fpu_arith.h
index e70256927baf..f74ac6688ccc 100644
--- a/sys/powerpc/fpu/fpu_arith.h
+++ b/sys/powerpc/fpu/fpu_arith.h
@@ -1,9 +1,7 @@
/* $NetBSD: fpu_arith.h,v 1.4 2005/12/24 20:07:28 perry Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_compare.c b/sys/powerpc/fpu/fpu_compare.c
index 48d7c488ce8a..898fb4f061b6 100644
--- a/sys/powerpc/fpu/fpu_compare.c
+++ b/sys/powerpc/fpu/fpu_compare.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_compare.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_div.c b/sys/powerpc/fpu/fpu_div.c
index 5b625f640f13..a206bf3c70b2 100644
--- a/sys/powerpc/fpu/fpu_div.c
+++ b/sys/powerpc/fpu/fpu_div.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_div.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_emu.c b/sys/powerpc/fpu/fpu_emu.c
index 75f44c7b786a..6d4e20cd7a82 100644
--- a/sys/powerpc/fpu/fpu_emu.c
+++ b/sys/powerpc/fpu/fpu_emu.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_emu.c,v 1.14 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_emu.h b/sys/powerpc/fpu/fpu_emu.h
index 18e318ade49a..30e617e474ec 100644
--- a/sys/powerpc/fpu/fpu_emu.h
+++ b/sys/powerpc/fpu/fpu_emu.h
@@ -1,9 +1,7 @@
/* $NetBSD: fpu_emu.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_explode.c b/sys/powerpc/fpu/fpu_explode.c
index 010c4e3dd67f..84073a4edb26 100644
--- a/sys/powerpc/fpu/fpu_explode.c
+++ b/sys/powerpc/fpu/fpu_explode.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_explode.c,v 1.6 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_extern.h b/sys/powerpc/fpu/fpu_extern.h
index 02caa2312b96..9f4b0132dc18 100644
--- a/sys/powerpc/fpu/fpu_extern.h
+++ b/sys/powerpc/fpu/fpu_extern.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_implode.c b/sys/powerpc/fpu/fpu_implode.c
index e05747631661..b57ba2d56656 100644
--- a/sys/powerpc/fpu/fpu_implode.c
+++ b/sys/powerpc/fpu/fpu_implode.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_implode.c,v 1.6 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_instr.h b/sys/powerpc/fpu/fpu_instr.h
index eb2d09989a53..15801ef3c251 100644
--- a/sys/powerpc/fpu/fpu_instr.h
+++ b/sys/powerpc/fpu/fpu_instr.h
@@ -1,9 +1,7 @@
/* $NetBSD: instr.h,v 1.4 2005/12/11 12:18:43 christos Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_mul.c b/sys/powerpc/fpu/fpu_mul.c
index 609b261492a4..6fe7851eb528 100644
--- a/sys/powerpc/fpu/fpu_mul.c
+++ b/sys/powerpc/fpu/fpu_mul.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_mul.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_sqrt.c b/sys/powerpc/fpu/fpu_sqrt.c
index 7fbbfb9593b6..59cb3abc83a2 100644
--- a/sys/powerpc/fpu/fpu_sqrt.c
+++ b/sys/powerpc/fpu/fpu_sqrt.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_sqrt.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/fpu/fpu_subr.c b/sys/powerpc/fpu/fpu_subr.c
index fc817a7ee587..dc8921650189 100644
--- a/sys/powerpc/fpu/fpu_subr.c
+++ b/sys/powerpc/fpu/fpu_subr.c
@@ -1,8 +1,6 @@
/* $NetBSD: fpu_subr.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/include/_align.h b/sys/powerpc/include/_align.h
index 9b425b6ee1e1..6eb8be28777d 100644
--- a/sys/powerpc/include/_align.h
+++ b/sys/powerpc/include/_align.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h
index d39fb003f27a..728b84fc114b 100644
--- a/sys/powerpc/include/_bus.h
+++ b/sys/powerpc/include/_bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h
index 8cfdcd727f1b..e96c4c56eb23 100644
--- a/sys/powerpc/include/_inttypes.h
+++ b/sys/powerpc/include/_inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 4688eac2b281..e231d335e863 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h
index 0eafe6937cf3..9928a1a0196e 100644
--- a/sys/powerpc/include/_stdint.h
+++ b/sys/powerpc/include/_stdint.h
@@ -1,6 +1,4 @@
/*-
- * 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.
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index 8b44088e28af..fc2285fecfec 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h
index fa666a988d41..0b2444553f06 100644
--- a/sys/powerpc/include/altivec.h
+++ b/sys/powerpc/include/altivec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h
index e91ce6cae149..08aab9854c62 100644
--- a/sys/powerpc/include/asm.h
+++ b/sys/powerpc/include/asm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h
index 2fd5bcf5c965..eb992e08296c 100644
--- a/sys/powerpc/include/atomic.h
+++ b/sys/powerpc/include/atomic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2001 Benno Rice
* Copyright (c) 2001 David E. O'Brien
diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h
index 517ebd4a45c6..ca032812b534 100644
--- a/sys/powerpc/include/bat.h
+++ b/sys/powerpc/include/bat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index f45678f68d7e..cb6dc77e13c5 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -1,8 +1,6 @@
/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/include/bus_dma.h b/sys/powerpc/include/bus_dma.h
index efa9ca7dee77..e070a9423815 100644
--- a/sys/powerpc/include/bus_dma.h
+++ b/sys/powerpc/include/bus_dma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
diff --git a/sys/powerpc/include/counter.h b/sys/powerpc/include/counter.h
index 94e9a012ee7a..a38ff336770b 100644
--- a/sys/powerpc/include/counter.h
+++ b/sys/powerpc/include/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012, 2013 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 88e07fbb3222..fffb2b4267ae 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995-1997 Wolfgang Solfrank.
* Copyright (C) 1995-1997 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index 10a581ae1677..378274b67e36 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/powerpc/include/dbdma.h b/sys/powerpc/include/dbdma.h
index 9827876af68f..22e4b0c72f7f 100644
--- a/sys/powerpc/include/dbdma.h
+++ b/sys/powerpc/include/dbdma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h
index 370adfa4f89b..aa36caff65fd 100644
--- a/sys/powerpc/include/elf.h
+++ b/sys/powerpc/include/elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h
index 5a27c685d3c0..1ce1d31f4e43 100644
--- a/sys/powerpc/include/endian.h
+++ b/sys/powerpc/include/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/include/exec.h b/sys/powerpc/include/exec.h
index be6bc6f8677b..f5a2bb26f61f 100644
--- a/sys/powerpc/include/exec.h
+++ b/sys/powerpc/include/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* All rights reserved.
*
diff --git a/sys/powerpc/include/float.h b/sys/powerpc/include/float.h
index 575b50fbbd05..4eea0bda5870 100644
--- a/sys/powerpc/include/float.h
+++ b/sys/powerpc/include/float.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/powerpc/include/floatingpoint.h b/sys/powerpc/include/floatingpoint.h
index ec603b281306..e62e47415a74 100644
--- a/sys/powerpc/include/floatingpoint.h
+++ b/sys/powerpc/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Suleiman Souhlal <refugee@segfaulted.com>
* All rights reserved.
*
diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h
index 9d10b116cfbd..17eec0b48b64 100644
--- a/sys/powerpc/include/fpu.h
+++ b/sys/powerpc/include/fpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h
index 7a395d7b6196..667b58c4b447 100644
--- a/sys/powerpc/include/frame.h
+++ b/sys/powerpc/include/frame.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/gdb_machdep.h b/sys/powerpc/include/gdb_machdep.h
index a1929ff57f05..0b81db549e10 100644
--- a/sys/powerpc/include/gdb_machdep.h
+++ b/sys/powerpc/include/gdb_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/include/hid.h b/sys/powerpc/include/hid.h
index 1e3e97003a2e..63123903835a 100644
--- a/sys/powerpc/include/hid.h
+++ b/sys/powerpc/include/hid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/include/ieee.h b/sys/powerpc/include/ieee.h
index 7aacfccc5bcd..793012de4435 100644
--- a/sys/powerpc/include/ieee.h
+++ b/sys/powerpc/include/ieee.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/include/in_cksum.h b/sys/powerpc/include/in_cksum.h
index fd34e13d3822..37bfb20034ae 100644
--- a/sys/powerpc/include/in_cksum.h
+++ b/sys/powerpc/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index 124d730425e2..5fbf9ee07ae9 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/include/kdb.h b/sys/powerpc/include/kdb.h
index 13496e507cbd..ea279f1050f1 100644
--- a/sys/powerpc/include/kdb.h
+++ b/sys/powerpc/include/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index 8d437add22d2..35eea1f619de 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/powerpc/include/machdep.h b/sys/powerpc/include/machdep.h
index 9a05d25467f3..401a4a1bccdb 100644
--- a/sys/powerpc/include/machdep.h
+++ b/sys/powerpc/include/machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2012 Semihalf
* All rights reserved.
*
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index b3e8e0cae199..f9d4ef155e8e 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/powerpc/include/memdev.h b/sys/powerpc/include/memdev.h
index 41e34da79264..649b5576f306 100644
--- a/sys/powerpc/include/memdev.h
+++ b/sys/powerpc/include/memdev.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
diff --git a/sys/powerpc/include/metadata.h b/sys/powerpc/include/metadata.h
index 5002b02615d5..8c15e6a734ef 100644
--- a/sys/powerpc/include/metadata.h
+++ b/sys/powerpc/include/metadata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/powerpc/include/mmuvar.h b/sys/powerpc/include/mmuvar.h
index d262e96dfb36..821a49774d56 100644
--- a/sys/powerpc/include/mmuvar.h
+++ b/sys/powerpc/include/mmuvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
*
diff --git a/sys/powerpc/include/ofw_machdep.h b/sys/powerpc/include/ofw_machdep.h
index 0fe659f7e170..8376e1aa0e07 100644
--- a/sys/powerpc/include/ofw_machdep.h
+++ b/sys/powerpc/include/ofw_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h
index 2471de06505c..3c4382421acf 100644
--- a/sys/powerpc/include/openpicreg.h
+++ b/sys/powerpc/include/openpicreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
index b675b01210e5..2ff68b710755 100644
--- a/sys/powerpc/include/openpicvar.h
+++ b/sys/powerpc/include/openpicvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 173e5752da47..453915cba4df 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index ecddc3fddb23..094949ed948d 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 8a9ae9523ac2..2c79cd696e72 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
diff --git a/sys/powerpc/include/pio.h b/sys/powerpc/include/pio.h
index a4d9b327fa86..b09e68a43e81 100644
--- a/sys/powerpc/include/pio.h
+++ b/sys/powerpc/include/pio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/include/platform.h b/sys/powerpc/include/platform.h
index 459fd1f2c069..8c92e26221ae 100644
--- a/sys/powerpc/include/platform.h
+++ b/sys/powerpc/include/platform.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/platformvar.h b/sys/powerpc/include/platformvar.h
index d5928e727f82..21a1d047cb0e 100644
--- a/sys/powerpc/include/platformvar.h
+++ b/sys/powerpc/include/platformvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
*
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index 086b65448c30..ea06c083ca2a 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-4-Clause
- *
* Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
* All rights reserved.
*
diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h
index 2245c4292534..d11cf8812952 100644
--- a/sys/powerpc/include/proc.h
+++ b/sys/powerpc/include/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/psl.h b/sys/powerpc/include/psl.h
index b0834f03a06f..f0a0fa4c97ce 100644
--- a/sys/powerpc/include/psl.h
+++ b/sys/powerpc/include/psl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h
index aded477d9f8c..8cbd70b591f5 100644
--- a/sys/powerpc/include/pte.h
+++ b/sys/powerpc/include/pte.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index 2d2f9ebdc533..c622dedd8938 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2014 Justin Hibbits
* All rights reserved.
*
diff --git a/sys/powerpc/include/reloc.h b/sys/powerpc/include/reloc.h
index d99dc8b05d60..0e4155dac4cf 100644
--- a/sys/powerpc/include/reloc.h
+++ b/sys/powerpc/include/reloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/powerpc/include/rtas.h b/sys/powerpc/include/rtas.h
index 4ae04270f398..5b18632ce13a 100644
--- a/sys/powerpc/include/rtas.h
+++ b/sys/powerpc/include/rtas.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/include/runq.h b/sys/powerpc/include/runq.h
index 84da6dcd8afa..b179e3160071 100644
--- a/sys/powerpc/include/runq.h
+++ b/sys/powerpc/include/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/powerpc/include/sc_machdep.h b/sys/powerpc/include/sc_machdep.h
index 61a2a86f702d..4f3526fabcf0 100644
--- a/sys/powerpc/include/sc_machdep.h
+++ b/sys/powerpc/include/sc_machdep.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/powerpc/include/sigframe.h b/sys/powerpc/include/sigframe.h
index 914e00d8a65c..d0e886e9bc90 100644
--- a/sys/powerpc/include/sigframe.h
+++ b/sys/powerpc/include/sigframe.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index 4302ad234730..ba0bee2b7797 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/slb.h b/sys/powerpc/include/slb.h
index 222e281afdb9..32425908ed40 100644
--- a/sys/powerpc/include/slb.h
+++ b/sys/powerpc/include/slb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2009 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/include/smp.h b/sys/powerpc/include/smp.h
index ab748022d3d1..32fcfb4b8f60 100644
--- a/sys/powerpc/include/smp.h
+++ b/sys/powerpc/include/smp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index a8045fd10f35..512889eb8180 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/include/sr.h b/sys/powerpc/include/sr.h
index 27bf9d6620fd..ae66314de6d5 100644
--- a/sys/powerpc/include/sr.h
+++ b/sys/powerpc/include/sr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/include/stdarg.h b/sys/powerpc/include/stdarg.h
index 41d5d238b34f..e81aab30b5c0 100644
--- a/sys/powerpc/include/stdarg.h
+++ b/sys/powerpc/include/stdarg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
*
diff --git a/sys/powerpc/include/sysarch.h b/sys/powerpc/include/sysarch.h
index a18451e9e09a..c46d100beea5 100644
--- a/sys/powerpc/include/sysarch.h
+++ b/sys/powerpc/include/sysarch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/powerpc/include/tlb.h b/sys/powerpc/include/tlb.h
index 8d8d8504191a..83bcf5c17930 100644
--- a/sys/powerpc/include/tlb.h
+++ b/sys/powerpc/include/tlb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 2006-2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h
index 507d28742209..07c70faa3959 100644
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/ucontext.h b/sys/powerpc/include/ucontext.h
index 89be2b462aaf..42c39e1d66c9 100644
--- a/sys/powerpc/include/ucontext.h
+++ b/sys/powerpc/include/ucontext.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/include/varargs.h b/sys/powerpc/include/varargs.h
index d37e040a4a8c..fed04c9463ed 100644
--- a/sys/powerpc/include/varargs.h
+++ b/sys/powerpc/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
*
diff --git a/sys/powerpc/include/vdso.h b/sys/powerpc/include/vdso.h
index c403b4142dba..0bdafd98283a 100644
--- a/sys/powerpc/include/vdso.h
+++ b/sys/powerpc/include/vdso.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
diff --git a/sys/powerpc/include/vm.h b/sys/powerpc/include/vm.h
index 3af863509908..ed7757e706ce 100644
--- a/sys/powerpc/include/vm.h
+++ b/sys/powerpc/include/vm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 2a5fd4b53225..d7368ecb283c 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/mambo/mambo.c b/sys/powerpc/mambo/mambo.c
index 65e4bcb8a663..2c54476f4708 100644
--- a/sys/powerpc/mambo/mambo.c
+++ b/sys/powerpc/mambo/mambo.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mambo/mambo_console.c b/sys/powerpc/mambo/mambo_console.c
index 00a501ec9cbe..133458114291 100644
--- a/sys/powerpc/mambo/mambo_console.c
+++ b/sys/powerpc/mambo/mambo_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mambo/mambo_disk.c b/sys/powerpc/mambo/mambo_disk.c
index 3a9a53a581b6..6077d35899ca 100644
--- a/sys/powerpc/mambo/mambo_disk.c
+++ b/sys/powerpc/mambo/mambo_disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mambo/mambocall.h b/sys/powerpc/mambo/mambocall.h
index a77ba0a8959d..c570be2d2826 100644
--- a/sys/powerpc/mambo/mambocall.h
+++ b/sys/powerpc/mambo/mambocall.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c
index bb56b709aac2..ef7ab8855613 100644
--- a/sys/powerpc/mpc85xx/atpic.c
+++ b/sys/powerpc/mpc85xx/atpic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Marcel Moolenaar
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
index 18c3e7a70ee4..ffbbee195fdf 100644
--- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
+++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/ds1553_core.c b/sys/powerpc/mpc85xx/ds1553_core.c
index 39ff8d8cd4ae..75640e06e3d7 100644
--- a/sys/powerpc/mpc85xx/ds1553_core.c
+++ b/sys/powerpc/mpc85xx/ds1553_core.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/ds1553_reg.h b/sys/powerpc/mpc85xx/ds1553_reg.h
index 125212f5e818..efe4264c35fd 100644
--- a/sys/powerpc/mpc85xx/ds1553_reg.h
+++ b/sys/powerpc/mpc85xx/ds1553_reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c
index e3d48b36fa8a..89c91a288cbd 100644
--- a/sys/powerpc/mpc85xx/i2c.c
+++ b/sys/powerpc/mpc85xx/i2c.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/isa.c b/sys/powerpc/mpc85xx/isa.c
index b6b3ea69d494..e25a75cc4d16 100644
--- a/sys/powerpc/mpc85xx/isa.c
+++ b/sys/powerpc/mpc85xx/isa.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Marcel Moolenaar
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c
index 365158a62858..576fe8202d6e 100644
--- a/sys/powerpc/mpc85xx/lbc.c
+++ b/sys/powerpc/mpc85xx/lbc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006-2008, Juniper Networks, Inc.
* Copyright (c) 2008 Semihalf, Rafal Czubak
* Copyright (c) 2009 The FreeBSD Foundation
diff --git a/sys/powerpc/mpc85xx/lbc.h b/sys/powerpc/mpc85xx/lbc.h
index 5d26399d2fca..9b3ad9185cc6 100644
--- a/sys/powerpc/mpc85xx/lbc.h
+++ b/sys/powerpc/mpc85xx/lbc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c
index 3ab3478fa517..c107681a124d 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.c
+++ b/sys/powerpc/mpc85xx/mpc85xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/mpc85xx.h b/sys/powerpc/mpc85xx/mpc85xx.h
index a4e603a6c642..e81e12546933 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.h
+++ b/sys/powerpc/mpc85xx/mpc85xx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* Copyright 2006 by Juniper Networks.
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c
index 7a339cc1e301..f8a6aee89048 100644
--- a/sys/powerpc/mpc85xx/pci_mpc85xx.c
+++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2006-2007 by Juniper Networks.
* Copyright 2008 Semihalf.
* Copyright 2010 The FreeBSD Foundation
diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c
index 20847ac3e0cb..00d6f5318ad3 100644
--- a/sys/powerpc/mpc85xx/platform_mpc85xx.c
+++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c
index e5f3bdf6e727..ebb837773359 100644
--- a/sys/powerpc/ofw/ofw_machdep.c
+++ b/sys/powerpc/ofw/ofw_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index 44739d2a9e9e..8a5c81f5d805 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c
index 023a6c51b2d7..92022b504167 100644
--- a/sys/powerpc/ofw/ofw_pcibus.c
+++ b/sys/powerpc/ofw/ofw_pcibus.c
@@ -1,6 +1,4 @@
/*-
- * 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
diff --git a/sys/powerpc/ofw/ofw_pcibus.h b/sys/powerpc/ofw/ofw_pcibus.h
index 82e8b42d4e67..c7b82d7ebdd2 100644
--- a/sys/powerpc/ofw/ofw_pcibus.h
+++ b/sys/powerpc/ofw/ofw_pcibus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c
index 87ad0a6a606b..9196618ff3da 100644
--- a/sys/powerpc/ofw/ofw_real.c
+++ b/sys/powerpc/ofw/ofw_real.c
@@ -1,8 +1,6 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
- * SPDX-License-Identifier:BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index 863d6e7c2efb..b766485ed17d 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
*
diff --git a/sys/powerpc/ofw/ofw_syscons.h b/sys/powerpc/ofw/ofw_syscons.h
index 6ce7173a1a46..f907f93f344f 100644
--- a/sys/powerpc/ofw/ofw_syscons.h
+++ b/sys/powerpc/ofw/ofw_syscons.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
*
diff --git a/sys/powerpc/ofw/openpic_ofw.c b/sys/powerpc/ofw/openpic_ofw.c
index ecb71ce32503..b0cf020f4c15 100644
--- a/sys/powerpc/ofw/openpic_ofw.c
+++ b/sys/powerpc/ofw/openpic_ofw.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c
index 99f51fd8cf12..6767c0084814 100644
--- a/sys/powerpc/ofw/rtas.c
+++ b/sys/powerpc/ofw/rtas.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c
index 8bfc8ad7a3ea..0e3fbde1fe06 100644
--- a/sys/powerpc/powermac/ata_dbdma.c
+++ b/sys/powerpc/powermac/ata_dbdma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/ata_dbdma.h b/sys/powerpc/powermac/ata_dbdma.h
index ec3a842f1e4c..61d068776359 100644
--- a/sys/powerpc/powermac/ata_dbdma.h
+++ b/sys/powerpc/powermac/ata_dbdma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index ffe8cea3a77f..33b6434dc26c 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2004 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index 67facef72d34..78fa60d89465 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/atibl.c b/sys/powerpc/powermac/atibl.c
index e1b195149fca..3982bdf828a1 100644
--- a/sys/powerpc/powermac/atibl.c
+++ b/sys/powerpc/powermac/atibl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c
index 3b5650d043cb..3145689f3c41 100644
--- a/sys/powerpc/powermac/cpcht.c
+++ b/sys/powerpc/powermac/cpcht.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008-2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c
index 711f7438b21b..362a3fe713b1 100644
--- a/sys/powerpc/powermac/cuda.c
+++ b/sys/powerpc/powermac/cuda.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Michael Lorenz
* Copyright 2008 by Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/cudavar.h b/sys/powerpc/powermac/cudavar.h
index 2d1bd606716c..225446494cd3 100644
--- a/sys/powerpc/powermac/cudavar.h
+++ b/sys/powerpc/powermac/cudavar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Michael Lorenz
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/dbdma.c b/sys/powerpc/powermac/dbdma.c
index 4dec076b47fe..8e8c582dc8c6 100644
--- a/sys/powerpc/powermac/dbdma.c
+++ b/sys/powerpc/powermac/dbdma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
diff --git a/sys/powerpc/powermac/dbdmavar.h b/sys/powerpc/powermac/dbdmavar.h
index e4855257b5f9..0b89618bafbf 100644
--- a/sys/powerpc/powermac/dbdmavar.h
+++ b/sys/powerpc/powermac/dbdmavar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
diff --git a/sys/powerpc/powermac/fcu.c b/sys/powerpc/powermac/fcu.c
index a1841a57ffe1..324fd1fbb826 100644
--- a/sys/powerpc/powermac/fcu.c
+++ b/sys/powerpc/powermac/fcu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index a77d80351b62..3d35fea1d69d 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/gracklevar.h b/sys/powerpc/powermac/gracklevar.h
index 77e25c3b057d..184f7e95c62d 100644
--- a/sys/powerpc/powermac/gracklevar.h
+++ b/sys/powerpc/powermac/gracklevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index 1df23b982e82..6b9e3dc33ceb 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/hrowpicvar.h b/sys/powerpc/powermac/hrowpicvar.h
index 6a558e0a6e42..ac643f574d48 100644
--- a/sys/powerpc/powermac/hrowpicvar.h
+++ b/sys/powerpc/powermac/hrowpicvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/kiic.c b/sys/powerpc/powermac/kiic.c
index 49574f2f810a..58da0b3307fd 100644
--- a/sys/powerpc/powermac/kiic.c
+++ b/sys/powerpc/powermac/kiic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Tsubai Masanari. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c
index 4ba24a6dbfae..c72f8d709e0a 100644
--- a/sys/powerpc/powermac/macgpio.c
+++ b/sys/powerpc/powermac/macgpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/macgpiovar.h b/sys/powerpc/powermac/macgpiovar.h
index cae0be206865..2719e44ed313 100644
--- a/sys/powerpc/powermac/macgpiovar.h
+++ b/sys/powerpc/powermac/macgpiovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index b8e52f52edb0..7a15b854feb0 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/maciovar.h b/sys/powerpc/powermac/maciovar.h
index f8f7b9f275cf..ed9c15d092d7 100644
--- a/sys/powerpc/powermac/maciovar.h
+++ b/sys/powerpc/powermac/maciovar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c
index d5112385e74e..fc7a3a9fb89f 100644
--- a/sys/powerpc/powermac/nvbl.c
+++ b/sys/powerpc/powermac/nvbl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/platform_powermac.c b/sys/powerpc/powermac/platform_powermac.c
index ed49289f7011..34aacea9b373 100644
--- a/sys/powerpc/powermac/platform_powermac.c
+++ b/sys/powerpc/powermac/platform_powermac.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
index a487aedd9376..8080c212ee1f 100644
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Michael Lorenz
* Copyright 2008 by Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/pmuvar.h b/sys/powerpc/powermac/pmuvar.h
index 16c56fb6a3c3..21c56160b62d 100644
--- a/sys/powerpc/powermac/pmuvar.h
+++ b/sys/powerpc/powermac/pmuvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Michael Lorenz
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c
index 1a5db378daf8..250c9f0922ac 100644
--- a/sys/powerpc/powermac/powermac_thermal.c
+++ b/sys/powerpc/powermac/powermac_thermal.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/powermac_thermal.h b/sys/powerpc/powermac/powermac_thermal.h
index 1f396c5ddcbb..723106636f8e 100644
--- a/sys/powerpc/powermac/powermac_thermal.h
+++ b/sys/powerpc/powermac/powermac_thermal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c
index 48033585a19d..c437392d45e9 100644
--- a/sys/powerpc/powermac/pswitch.c
+++ b/sys/powerpc/powermac/pswitch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c
index 23349098abcb..54f30ad3c424 100644
--- a/sys/powerpc/powermac/smu.c
+++ b/sys/powerpc/powermac/smu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/smusat.c b/sys/powerpc/powermac/smusat.c
index 9572016c250c..f8556ee6c506 100644
--- a/sys/powerpc/powermac/smusat.c
+++ b/sys/powerpc/powermac/smusat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index 490277bebd8c..2d32a495cfe2 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c
index c49598a27c91..6149af5254cd 100644
--- a/sys/powerpc/powermac/uninorthpci.c
+++ b/sys/powerpc/powermac/uninorthpci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h
index 86a697c52227..e570da045464 100644
--- a/sys/powerpc/powermac/uninorthvar.h
+++ b/sys/powerpc/powermac/uninorthvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/vcoregpio.c b/sys/powerpc/powermac/vcoregpio.c
index 3c387e5c6716..463e8cd9af8c 100644
--- a/sys/powerpc/powermac/vcoregpio.c
+++ b/sys/powerpc/powermac/vcoregpio.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powermac/viareg.h b/sys/powerpc/powermac/viareg.h
index 8af804de962d..2f519b2a777f 100644
--- a/sys/powerpc/powermac/viareg.h
+++ b/sys/powerpc/powermac/viareg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/altivec.c b/sys/powerpc/powerpc/altivec.c
index 4cbc2fdf8ba8..d1d6f1ba9c93 100644
--- a/sys/powerpc/powerpc/altivec.c
+++ b/sys/powerpc/powerpc/altivec.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index acb6ef77c9c6..18c8bdc8a74a 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/bcopy.c b/sys/powerpc/powerpc/bcopy.c
index 8052f25ba9c3..1bc49a83db87 100644
--- a/sys/powerpc/powerpc/bcopy.c
+++ b/sys/powerpc/powerpc/bcopy.c
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
* Copyright (c) 1990 The Regents of the University of California.
- *
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c
index 729c44d8f615..bde0219bebd5 100644
--- a/sys/powerpc/powerpc/bus_machdep.c
+++ b/sys/powerpc/powerpc/bus_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 13b7d36be915..1e57d9272ba7 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index f73a23bba505..7bd92e648217 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c
index 882671fabbee..29c4561ef417 100644
--- a/sys/powerpc/powerpc/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
* Copyright (C) 2002 Benno Rice
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/copystr.c b/sys/powerpc/powerpc/copystr.c
index 842ffa854142..1a159d87185b 100644
--- a/sys/powerpc/powerpc/copystr.c
+++ b/sys/powerpc/powerpc/copystr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995 Wolfgang Solfrank.
* Copyright (C) 1995 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index f3de7219358b..859ff4aece41 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Matt Thomas.
* Copyright (c) 2001 Tsubai Masanari.
* Copyright (c) 1998, 1999, 2001 Internet Research Institute, Inc.
diff --git a/sys/powerpc/powerpc/db_hwwatch.c b/sys/powerpc/powerpc/db_hwwatch.c
index 37b4a9148495..a5b0a69f5a91 100644
--- a/sys/powerpc/powerpc/db_hwwatch.c
+++ b/sys/powerpc/powerpc/db_hwwatch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/dump_machdep.c b/sys/powerpc/powerpc/dump_machdep.c
index f27cbf421b79..573ed1c1333a 100644
--- a/sys/powerpc/powerpc/dump_machdep.c
+++ b/sys/powerpc/powerpc/dump_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c
index 9d9363913bd7..9954a330f22a 100644
--- a/sys/powerpc/powerpc/elf32_machdep.c
+++ b/sys/powerpc/powerpc/elf32_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c
index 59312c384ff4..084200efae5c 100644
--- a/sys/powerpc/powerpc/elf64_machdep.c
+++ b/sys/powerpc/powerpc/elf64_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c
index bcbb23093fdd..c538e6b13f47 100644
--- a/sys/powerpc/powerpc/exec_machdep.c
+++ b/sys/powerpc/powerpc/exec_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c
index 5034ffce6b36..dfba1bc2103f 100644
--- a/sys/powerpc/powerpc/fpu.c
+++ b/sys/powerpc/powerpc/fpu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/fuswintr.c b/sys/powerpc/powerpc/fuswintr.c
index 5b75d7b81320..cb5abb7b9a18 100644
--- a/sys/powerpc/powerpc/fuswintr.c
+++ b/sys/powerpc/powerpc/fuswintr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994 Wolfgang Solfrank.
* Copyright (C) 1994 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/gdb_machdep.c b/sys/powerpc/powerpc/gdb_machdep.c
index 6248ce70e070..89c28a47c918 100644
--- a/sys/powerpc/powerpc/gdb_machdep.c
+++ b/sys/powerpc/powerpc/gdb_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 00b5910cfdf1..2200eea47d81 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/in_cksum.c b/sys/powerpc/powerpc/in_cksum.c
index ed0881d7520a..f4f5fff96d05 100644
--- a/sys/powerpc/powerpc/in_cksum.c
+++ b/sys/powerpc/powerpc/in_cksum.c
@@ -2,8 +2,6 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 5d441c5432c5..743c8a62b080 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c
index b5100258ed69..2bc89fd4b5af 100644
--- a/sys/powerpc/powerpc/mem.c
+++ b/sys/powerpc/powerpc/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index 6720683e1ce5..7d2dc9513d77 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index 4bf7f1e9612f..cc642a5f348d 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c
index c117f95ef90c..b29ad92eb629 100644
--- a/sys/powerpc/powerpc/platform.c
+++ b/sys/powerpc/powerpc/platform.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Grehan
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c
index 2838d33177a7..35f8d1eda77c 100644
--- a/sys/powerpc/powerpc/pmap_dispatch.c
+++ b/sys/powerpc/powerpc/pmap_dispatch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/sc_machdep.c b/sys/powerpc/powerpc/sc_machdep.c
index 8a77cef2fbce..a81ffddbb211 100644
--- a/sys/powerpc/powerpc/sc_machdep.c
+++ b/sys/powerpc/powerpc/sc_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/stack_machdep.c b/sys/powerpc/powerpc/stack_machdep.c
index 9658383df848..451e7bef71b8 100644
--- a/sys/powerpc/powerpc/stack_machdep.c
+++ b/sys/powerpc/powerpc/stack_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/suswintr.c b/sys/powerpc/powerpc/suswintr.c
index 77d69071b8bb..0252201e8a4b 100644
--- a/sys/powerpc/powerpc/suswintr.c
+++ b/sys/powerpc/powerpc/suswintr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1994 Wolfgang Solfrank.
* Copyright (C) 1994 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c
index 15ac490798d1..9346c902cd61 100644
--- a/sys/powerpc/powerpc/syncicache.c
+++ b/sys/powerpc/powerpc/syncicache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
* Copyright (C) 1995-1997, 1999 TooLs GmbH.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c
index 06421481217a..fca294d8c5e4 100644
--- a/sys/powerpc/powerpc/sys_machdep.c
+++ b/sys/powerpc/powerpc/sys_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Benno Rice.
* All rights reserved.
*
diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c
index 1c0b4f715f7c..f8d132baec46 100644
--- a/sys/powerpc/powerpc/uio_machdep.c
+++ b/sys/powerpc/powerpc/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index cc9eea85a378..858fb1453820 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/powerpc/ps3/ehci_ps3.c b/sys/powerpc/ps3/ehci_ps3.c
index de91347d8593..63c31a5de063 100644
--- a/sys/powerpc/ps3/ehci_ps3.c
+++ b/sys/powerpc/ps3/ehci_ps3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c
index 2ba0359f8762..3b13ac0898d4 100644
--- a/sys/powerpc/ps3/if_glc.c
+++ b/sys/powerpc/ps3/if_glc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/if_glcreg.h b/sys/powerpc/ps3/if_glcreg.h
index 2e8e577d2c13..c56363cf0eec 100644
--- a/sys/powerpc/ps3/if_glcreg.h
+++ b/sys/powerpc/ps3/if_glcreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/mmu_ps3.c b/sys/powerpc/ps3/mmu_ps3.c
index d570ed4d6d3e..64a44ddc08fe 100644
--- a/sys/powerpc/ps3/mmu_ps3.c
+++ b/sys/powerpc/ps3/mmu_ps3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/ohci_ps3.c b/sys/powerpc/ps3/ohci_ps3.c
index e39505664f11..8dc54dbd4dbe 100644
--- a/sys/powerpc/ps3/ohci_ps3.c
+++ b/sys/powerpc/ps3/ohci_ps3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c
index 564b48e99fd6..c36603d43605 100644
--- a/sys/powerpc/ps3/platform_ps3.c
+++ b/sys/powerpc/ps3/platform_ps3.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index cbdec3c5335d..597a3b62c7c8 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011-2014 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c
index 85aa431e2abd..37ea0b747e21 100644
--- a/sys/powerpc/ps3/ps3bus.c
+++ b/sys/powerpc/ps3/ps3bus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3bus.h b/sys/powerpc/ps3/ps3bus.h
index b93724250840..6725625314da 100644
--- a/sys/powerpc/ps3/ps3bus.h
+++ b/sys/powerpc/ps3/ps3bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/ps3cdrom.c b/sys/powerpc/ps3/ps3cdrom.c
index bc5bdd2e88cc..f420e0a823af 100644
--- a/sys/powerpc/ps3/ps3cdrom.c
+++ b/sys/powerpc/ps3/ps3cdrom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Nathan Whitehorn
* Copyright (C) 2011 glevand <geoffrey.levand@mail.ru>
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3disk.c b/sys/powerpc/ps3/ps3disk.c
index b583637c5382..d68caea471e5 100644
--- a/sys/powerpc/ps3/ps3disk.c
+++ b/sys/powerpc/ps3/ps3disk.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
* All rights reserved.
*
diff --git a/sys/powerpc/ps3/ps3pic.c b/sys/powerpc/ps3/ps3pic.c
index 3ae8c326ee85..374d96e074bc 100644
--- a/sys/powerpc/ps3/ps3pic.c
+++ b/sys/powerpc/ps3/ps3pic.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2010 Nathan Whitehorn
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c
index 5d92d570baf7..513dc8eb5ff7 100644
--- a/sys/powerpc/pseries/mmu_phyp.c
+++ b/sys/powerpc/pseries/mmu_phyp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (C) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/phyp-hvcall.h b/sys/powerpc/pseries/phyp-hvcall.h
index 15a2399ba926..c6b87836925f 100644
--- a/sys/powerpc/pseries/phyp-hvcall.h
+++ b/sys/powerpc/pseries/phyp-hvcall.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2010 Andreas Tobler
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c
index 879d715030ac..ede23870f076 100644
--- a/sys/powerpc/pseries/phyp_console.c
+++ b/sys/powerpc/pseries/phyp_console.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2011 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c
index 134d56622b16..e35124c26b41 100644
--- a/sys/powerpc/pseries/phyp_llan.c
+++ b/sys/powerpc/pseries/phyp_llan.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c
index 6c9c32f7bad9..6471aef35218 100644
--- a/sys/powerpc/pseries/phyp_vscsi.c
+++ b/sys/powerpc/pseries/phyp_vscsi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2013 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/platform_chrp.c b/sys/powerpc/pseries/platform_chrp.c
index 20defaa6231e..17916edfbb0b 100644
--- a/sys/powerpc/pseries/platform_chrp.c
+++ b/sys/powerpc/pseries/platform_chrp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c
index 9511332dd6bb..eab2ce26e421 100644
--- a/sys/powerpc/pseries/plpar_iommu.c
+++ b/sys/powerpc/pseries/plpar_iommu.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/plpar_iommu.h b/sys/powerpc/pseries/plpar_iommu.h
index 2814a4697527..cdd315abfb52 100644
--- a/sys/powerpc/pseries/plpar_iommu.h
+++ b/sys/powerpc/pseries/plpar_iommu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c
index 8bb4a51d1005..640212f53f1a 100644
--- a/sys/powerpc/pseries/plpar_pcibus.c
+++ b/sys/powerpc/pseries/plpar_pcibus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c
index 873bdc1e95cc..79d70e2fb30b 100644
--- a/sys/powerpc/pseries/rtas_dev.c
+++ b/sys/powerpc/pseries/rtas_dev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c
index 95221e759245..873168e2612a 100644
--- a/sys/powerpc/pseries/rtas_pci.c
+++ b/sys/powerpc/pseries/rtas_pci.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c
index 97a8ef156658..72b76c749231 100644
--- a/sys/powerpc/pseries/vdevice.c
+++ b/sys/powerpc/pseries/vdevice.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c
index e2893b6a4cdb..4ae7c9ed3a2b 100644
--- a/sys/powerpc/pseries/xics.c
+++ b/sys/powerpc/pseries/xics.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2011 Nathan Whitehorn
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c
index 30e850bfc604..bf059b7da185 100644
--- a/sys/powerpc/psim/ata_iobus.c
+++ b/sys/powerpc/psim/ata_iobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 320d3a880b6d..8b57d47a388a 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/psim/iobusvar.h b/sys/powerpc/psim/iobusvar.h
index 952437e635d9..1ab7f7eaed90 100644
--- a/sys/powerpc/psim/iobusvar.h
+++ b/sys/powerpc/psim/iobusvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/psim/openpic_iobus.c b/sys/powerpc/psim/openpic_iobus.c
index 0c248b45ca92..9a70b4e813e4 100644
--- a/sys/powerpc/psim/openpic_iobus.c
+++ b/sys/powerpc/psim/openpic_iobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/powerpc/psim/uart_iobus.c b/sys/powerpc/psim/uart_iobus.c
index a70a1b766811..1768338b9952 100644
--- a/sys/powerpc/psim/uart_iobus.c
+++ b/sys/powerpc/psim/uart_iobus.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/riscv/riscv/in_cksum.c b/sys/riscv/riscv/in_cksum.c
index 30e90f043cc3..ae02e91d9203 100644
--- a/sys/riscv/riscv/in_cksum.c
+++ b/sys/riscv/riscv/in_cksum.c
@@ -1,8 +1,6 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index f9935481499b..9272c165896b 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h
index 21d6e114d81b..bd6b04bcbce7 100644
--- a/sys/rpc/auth.h
+++ b/sys/rpc/auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/auth_none.c b/sys/rpc/auth_none.c
index 236b4aa166ae..2996b78553e4 100644
--- a/sys/rpc/auth_none.c
+++ b/sys/rpc/auth_none.c
@@ -1,8 +1,6 @@
/* $NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/auth_unix.c b/sys/rpc/auth_unix.c
index 4a3df5f70e3a..3575c4460736 100644
--- a/sys/rpc/auth_unix.c
+++ b/sys/rpc/auth_unix.c
@@ -1,8 +1,6 @@
/* $NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/authunix_prot.c b/sys/rpc/authunix_prot.c
index b6cde0fbd0ff..3b167312bd61 100644
--- a/sys/rpc/authunix_prot.c
+++ b/sys/rpc/authunix_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/clnt.h b/sys/rpc/clnt.h
index 26a21cf13187..8f593b6135ba 100644
--- a/sys/rpc/clnt.h
+++ b/sys/rpc/clnt.h
@@ -1,8 +1,6 @@
/* $NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c
index 8ffa410d587b..c82d27077c58 100644
--- a/sys/rpc/clnt_dg.c
+++ b/sys/rpc/clnt_dg.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c
index 0231c303f089..a21c1df74a43 100644
--- a/sys/rpc/clnt_vc.c
+++ b/sys/rpc/clnt_vc.c
@@ -1,8 +1,6 @@
/* $NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/krpc.h b/sys/rpc/krpc.h
index 43fd742db71a..2e61b3cdf5ee 100644
--- a/sys/rpc/krpc.h
+++ b/sys/rpc/krpc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/nettype.h b/sys/rpc/nettype.h
index 0f63ac9530bc..5d00607c7a27 100644
--- a/sys/rpc/nettype.h
+++ b/sys/rpc/nettype.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/pmap_prot.h b/sys/rpc/pmap_prot.h
index 3e958860104b..9488f1aa5db3 100644
--- a/sys/rpc/pmap_prot.h
+++ b/sys/rpc/pmap_prot.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc.h b/sys/rpc/rpc.h
index 82cf3c022292..3e6417ff6e3f 100644
--- a/sys/rpc/rpc.h
+++ b/sys/rpc/rpc.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc_callmsg.c b/sys/rpc/rpc_callmsg.c
index ab0848d7930d..f30fcc600bf7 100644
--- a/sys/rpc/rpc_callmsg.c
+++ b/sys/rpc/rpc_callmsg.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc_com.h b/sys/rpc/rpc_com.h
index 70d4214f54e8..50cec752b2d7 100644
--- a/sys/rpc/rpc_com.h
+++ b/sys/rpc/rpc_com.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
index a4d6298b13bb..1b6a151b21ac 100644
--- a/sys/rpc/rpc_generic.c
+++ b/sys/rpc/rpc_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc_msg.h b/sys/rpc/rpc_msg.h
index dc0ccbd0e5bc..dd884d145a55 100644
--- a/sys/rpc/rpc_msg.h
+++ b/sys/rpc/rpc_msg.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpc_prot.c b/sys/rpc/rpc_prot.c
index 70a543d3f9c7..a83932dfa771 100644
--- a/sys/rpc/rpc_prot.c
+++ b/sys/rpc/rpc_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpcb_clnt.c b/sys/rpc/rpcb_clnt.c
index 8a95999baaf4..2429b3861f1a 100644
--- a/sys/rpc/rpcb_clnt.c
+++ b/sys/rpc/rpcb_clnt.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpcb_clnt.h b/sys/rpc/rpcb_clnt.h
index 6233952c484a..0a665e55e757 100644
--- a/sys/rpc/rpcb_clnt.h
+++ b/sys/rpc/rpcb_clnt.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpcb_prot.c b/sys/rpc/rpcb_prot.c
index a59dc501d9c3..4ebbe7174f40 100644
--- a/sys/rpc/rpcb_prot.c
+++ b/sys/rpc/rpcb_prot.c
@@ -1,8 +1,6 @@
/* $NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpcb_prot.h b/sys/rpc/rpcb_prot.h
index beb4a8e16786..6b42a3698d1f 100644
--- a/sys/rpc/rpcb_prot.h
+++ b/sys/rpc/rpcb_prot.h
@@ -13,8 +13,6 @@ extern "C" {
#endif
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/rpcm_subs.h b/sys/rpc/rpcm_subs.h
index 970b10afaf2f..e4fddb58334c 100644
--- a/sys/rpc/rpcm_subs.h
+++ b/sys/rpc/rpcm_subs.h
@@ -3,8 +3,6 @@
/* $NetBSD: nfsm_subs.h,v 1.10 1996/03/20 21:59:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* copyright (c) 2003
* the regents of the university of michigan
* all rights reserved
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss.c b/sys/rpc/rpcsec_gss/rpcsec_gss.c
index 2eef1544b61a..c8a84ebfe83c 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
index f0ea906a102c..4f38828b0ad6 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
@@ -1,8 +1,6 @@
/*
rpcsec_gss.h
- SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2000 The Regents of the University of Michigan.
All rights reserved.
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
index 45b1ff2533c6..90c6fe2a0988 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
@@ -1,8 +1,6 @@
/*
rpcsec_gss_prot.c
- SPDX-License-Identifier: BSD-3-Clause
-
Copyright (c) 2000 The Regents of the University of Michigan.
All rights reserved.
diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
index 0d7bd91a57a7..0879299143cd 100644
--- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
@@ -1,7 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 1990 The Regents of the University of California.
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c
index e4392e48f75f..5e5552dfe313 100644
--- a/sys/rpc/svc.c
+++ b/sys/rpc/svc.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h
index b60b85ef0f53..dacf5d1a8992 100644
--- a/sys/rpc/svc.h
+++ b/sys/rpc/svc.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_auth.c b/sys/rpc/svc_auth.c
index 5dbc64b74769..caba75cf0ce4 100644
--- a/sys/rpc/svc_auth.c
+++ b/sys/rpc/svc_auth.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_auth.h b/sys/rpc/svc_auth.h
index 71a39d5e300d..d6b31cdc9ce6 100644
--- a/sys/rpc/svc_auth.h
+++ b/sys/rpc/svc_auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_auth_unix.c b/sys/rpc/svc_auth_unix.c
index de46bf438f0e..793821dcd3ee 100644
--- a/sys/rpc/svc_auth_unix.c
+++ b/sys/rpc/svc_auth_unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_dg.c b/sys/rpc/svc_dg.c
index 2bdd0700c044..121d151cbcea 100644
--- a/sys/rpc/svc_dg.c
+++ b/sys/rpc/svc_dg.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_generic.c b/sys/rpc/svc_generic.c
index 54e9cd0bc808..2ce010db5bfe 100644
--- a/sys/rpc/svc_generic.c
+++ b/sys/rpc/svc_generic.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 christos Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c
index 76aa7832939c..731ba28ce9e3 100644
--- a/sys/rpc/svc_vc.c
+++ b/sys/rpc/svc_vc.c
@@ -1,8 +1,6 @@
/* $NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/types.h b/sys/rpc/types.h
index e5d728d6613b..62b5aca1022c 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -1,8 +1,6 @@
/* $NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h
index 24113db9c630..1c2e780618c5 100644
--- a/sys/rpc/xdr.h
+++ b/sys/rpc/xdr.h
@@ -1,8 +1,6 @@
/* $NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c
index 939dd6fd6f2d..399bec9b1374 100644
--- a/sys/security/audit/audit.c
+++ b/sys/security/audit/audit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2005 Apple Inc.
* Copyright (c) 2006-2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h
index bf6a005ec4b9..559d571cbc45 100644
--- a/sys/security/audit/audit.h
+++ b/sys/security/audit/audit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2005 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit_arg.c b/sys/security/audit/audit_arg.c
index 91b103e853b6..c006b90f049d 100644
--- a/sys/security/audit/audit_arg.c
+++ b/sys/security/audit/audit_arg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2005 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit_bsm.c b/sys/security/audit/audit_bsm.c
index 26c6d027a973..fed111ab6935 100644
--- a/sys/security/audit/audit_bsm.c
+++ b/sys/security/audit/audit_bsm.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index 7ccdd1e4e830..f44fac9d26a1 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999-2009 Apple Inc.
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h
index 9d5e7a56e973..b5c373ae53ec 100644
--- a/sys/security/audit/audit_private.h
+++ b/sys/security/audit/audit_private.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c
index fb502739bf1d..73411a474c6e 100644
--- a/sys/security/audit/audit_syscalls.c
+++ b/sys/security/audit/audit_syscalls.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c
index beae9d04886e..f526cd47b1bd 100644
--- a/sys/security/audit/audit_worker.c
+++ b/sys/security/audit/audit_worker.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999-2008 Apple Inc.
* Copyright (c) 2006-2008 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/security/audit/bsm_domain.c b/sys/security/audit/bsm_domain.c
index 1c381e3cc3a9..8119956f4fff 100644
--- a/sys/security/audit/bsm_domain.c
+++ b/sys/security/audit/bsm_domain.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c
index fc069a7568f8..95060251b91e 100644
--- a/sys/security/audit/bsm_errno.c
+++ b/sys/security/audit/bsm_errno.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/bsm_fcntl.c b/sys/security/audit/bsm_fcntl.c
index fec1e82b4c34..e29f11a056d8 100644
--- a/sys/security/audit/bsm_fcntl.c
+++ b/sys/security/audit/bsm_fcntl.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008-2009 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/bsm_socket_type.c b/sys/security/audit/bsm_socket_type.c
index 640a5120783c..afa8e6ce1a95 100644
--- a/sys/security/audit/bsm_socket_type.c
+++ b/sys/security/audit/bsm_socket_type.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
*
diff --git a/sys/security/audit/bsm_token.c b/sys/security/audit/bsm_token.c
index 05a1dcff93f7..84f4fce43001 100644
--- a/sys/security/audit/bsm_token.c
+++ b/sys/security/audit/bsm_token.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004-2009 Apple Inc.
* Copyright (c) 2005 SPARTA, Inc.
* All rights reserved.
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index 182ef312bcd0..70b85d9e361a 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h
index 02e154649071..69a53beccb92 100644
--- a/sys/sparc64/include/asm.h
+++ b/sys/sparc64/include/asm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/bus_common.h b/sys/sparc64/include/bus_common.h
index 3689b262385e..f04eb7f5b4cb 100644
--- a/sys/sparc64/include/bus_common.h
+++ b/sys/sparc64/include/bus_common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/cache.h b/sys/sparc64/include/cache.h
index a299f2e4974a..3d0ac4f17648 100644
--- a/sys/sparc64/include/cache.h
+++ b/sys/sparc64/include/cache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996
* The President and Fellows of Harvard College. All rights reserved.
* Copyright (c) 1992, 1993
diff --git a/sys/sparc64/include/cpu.h b/sys/sparc64/include/cpu.h
index 5307c5bc6ac0..401f39bfccc6 100644
--- a/sys/sparc64/include/cpu.h
+++ b/sys/sparc64/include/cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h
index 65669630bc27..38e7c3030707 100644
--- a/sys/sparc64/include/endian.h
+++ b/sys/sparc64/include/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/float.h b/sys/sparc64/include/float.h
index 104fc50fd79e..270336922f6d 100644
--- a/sys/sparc64/include/float.h
+++ b/sys/sparc64/include/float.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993, 2001
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/floatingpoint.h b/sys/sparc64/include/floatingpoint.h
index d91efcebeefd..d47756a00c6c 100644
--- a/sys/sparc64/include/floatingpoint.h
+++ b/sys/sparc64/include/floatingpoint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David O'Brien <obrien@FreeBSD.org>.
* All rights reserved.
*
diff --git a/sys/sparc64/include/ieee.h b/sys/sparc64/include/ieee.h
index a0a95a7d95e6..82ba9a1ae62f 100644
--- a/sys/sparc64/include/ieee.h
+++ b/sys/sparc64/include/ieee.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/in_cksum.h b/sys/sparc64/include/in_cksum.h
index 6f80d6996759..b13882e0820e 100644
--- a/sys/sparc64/include/in_cksum.h
+++ b/sys/sparc64/include/in_cksum.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/iommureg.h b/sys/sparc64/include/iommureg.h
index 3753016d405f..10a107d331f9 100644
--- a/sys/sparc64/include/iommureg.h
+++ b/sys/sparc64/include/iommureg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h
index 3a30b2355935..d3dbf99dd370 100644
--- a/sys/sparc64/include/md_var.h
+++ b/sys/sparc64/include/md_var.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Bruce D. Evans.
* All rights reserved.
*
diff --git a/sys/sparc64/include/pmap.h b/sys/sparc64/include/pmap.h
index 22e413a9e651..8e4f5a4aaf0e 100644
--- a/sys/sparc64/include/pmap.h
+++ b/sys/sparc64/include/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/proc.h b/sys/sparc64/include/proc.h
index 6e9f05efc8c1..8d1dec3bf035 100644
--- a/sys/sparc64/include/proc.h
+++ b/sys/sparc64/include/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/ptrace.h b/sys/sparc64/include/ptrace.h
index 9a32a7f853e1..49b1e1c0ee9a 100644
--- a/sys/sparc64/include/ptrace.h
+++ b/sys/sparc64/include/ptrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h
index 006839fc6e49..8a4dd2acb9e5 100644
--- a/sys/sparc64/include/reg.h
+++ b/sys/sparc64/include/reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/reloc.h b/sys/sparc64/include/reloc.h
index d99dc8b05d60..0e4155dac4cf 100644
--- a/sys/sparc64/include/reloc.h
+++ b/sys/sparc64/include/reloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/sparc64/include/setjmp.h b/sys/sparc64/include/setjmp.h
index 12035418cbbe..f58776dce61c 100644
--- a/sys/sparc64/include/setjmp.h
+++ b/sys/sparc64/include/setjmp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/sparc64/include/signal.h b/sys/sparc64/include/signal.h
index 2e14acba1c97..d96cef6dd6c8 100644
--- a/sys/sparc64/include/signal.h
+++ b/sys/sparc64/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sparc64/include/sysarch.h b/sys/sparc64/include/sysarch.h
index 9a7aab8d6f26..1f854df32253 100644
--- a/sys/sparc64/include/sysarch.h
+++ b/sys/sparc64/include/sysarch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/include/varargs.h b/sys/sparc64/include/varargs.h
index 67ad5611368d..bb58ce87f997 100644
--- a/sys/sparc64/include/varargs.h
+++ b/sys/sparc64/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index 72bbf1e90f8d..facec86790ee 100644
--- a/sys/sparc64/include/vmparam.h
+++ b/sys/sparc64/include/vmparam.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index 5d92a4286660..0dc3aa1662a1 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996
* The President and Fellows of Harvard College. All rights reserved.
* Copyright (c) 1992, 1993
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index fa385ea35eb7..9470bafeab54 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994 Gordon W. Ross
diff --git a/sys/sparc64/sparc64/in_cksum.c b/sys/sparc64/sparc64/in_cksum.c
index e1fab2a7d8bc..47e69cdc6086 100644
--- a/sys/sparc64/sparc64/in_cksum.c
+++ b/sys/sparc64/sparc64/in_cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index 100959692319..eab81fde6fbf 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index ff695e6a8335..48e891631b15 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Jake Burkholder.
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index a013cc0d5df6..12b035f534b3 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index b01392f07134..66dba16aed9d 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index ca2189e5552c..e77ccf77297a 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001, Jake Burkholder
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
diff --git a/sys/sparc64/sparc64/uio_machdep.c b/sys/sparc64/sparc64/uio_machdep.c
index e334d575d2c5..fecd3d1338ae 100644
--- a/sys/sparc64/sparc64/uio_machdep.c
+++ b/sys/sparc64/sparc64/uio_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index bb4cc8a8f5dc..10d1d36626ea 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h
index e45efdfdfdef..2f5301d58a5d 100644
--- a/sys/sys/_bitset.h
+++ b/sys/sys/_bitset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/_bus_dma.h b/sys/sys/_bus_dma.h
index c2a1730186c9..91318d01c21c 100644
--- a/sys/sys/_bus_dma.h
+++ b/sys/sys/_bus_dma.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2006 John-Mark Gurney.
* All rights reserved.
*
diff --git a/sys/sys/_callout.h b/sys/sys/_callout.h
index 41af14f2801b..a9134c8dfc4e 100644
--- a/sys/sys/_callout.h
+++ b/sys/sys/_callout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h
index cb3c0f9d586e..1ddafac2c7c2 100644
--- a/sys/sys/_cpuset.h
+++ b/sys/sys/_cpuset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/_ffcounter.h b/sys/sys/_ffcounter.h
index 511b0a598eb7..0d5864a7f34e 100644
--- a/sys/sys/_ffcounter.h
+++ b/sys/sys/_ffcounter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
*
diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h
index a522ed0e043c..bd7207332938 100644
--- a/sys/sys/_iovec.h
+++ b/sys/sys/_iovec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/_kstack_cache.h b/sys/sys/_kstack_cache.h
index d638ff7fa955..58b2f9087f49 100644
--- a/sys/sys/_kstack_cache.h
+++ b/sys/sys/_kstack_cache.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
index 6a9e4b018067..ff5828cdbaf1 100644
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/_lockmgr.h b/sys/sys/_lockmgr.h
index 62e50df1ac4e..0367ff1e7ba1 100644
--- a/sys/sys/_lockmgr.h
+++ b/sys/sys/_lockmgr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_mutex.h b/sys/sys/_mutex.h
index e37226cc8e5d..5da137a0de4b 100644
--- a/sys/sys/_mutex.h
+++ b/sys/sys/_mutex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/_null.h b/sys/sys/_null.h
index 8fa5e4246bf8..92706c6a037a 100644
--- a/sys/sys/_null.h
+++ b/sys/sys/_null.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/_pctrie.h b/sys/sys/_pctrie.h
index d9a98a78bfb2..c6d13baa992f 100644
--- a/sys/sys/_pctrie.h
+++ b/sys/sys/_pctrie.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
diff --git a/sys/sys/_pthreadtypes.h b/sys/sys/_pthreadtypes.h
index fdd0878ff94c..76049ee6d8df 100644
--- a/sys/sys/_pthreadtypes.h
+++ b/sys/sys/_pthreadtypes.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
* Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
* All rights reserved.
diff --git a/sys/sys/_rmlock.h b/sys/sys/_rmlock.h
index 89a25ee68798..8a3c871b4a67 100644
--- a/sys/sys/_rmlock.h
+++ b/sys/sys/_rmlock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Stephan Uphoff <ups@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_rwlock.h b/sys/sys/_rwlock.h
index 2e5583fcee9c..82c911389bff 100644
--- a/sys/sys/_rwlock.h
+++ b/sys/sys/_rwlock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_semaphore.h b/sys/sys/_semaphore.h
index e9991439340c..5266d044ff89 100644
--- a/sys/sys/_semaphore.h
+++ b/sys/sys/_semaphore.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index eec04b8842b4..06826701f740 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/_sockaddr_storage.h b/sys/sys/_sockaddr_storage.h
index 4cd65b666603..5c0048b56b77 100644
--- a/sys/sys/_sockaddr_storage.h
+++ b/sys/sys/_sockaddr_storage.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/_stack.h b/sys/sys/_stack.h
index a7d440440b45..96273d3c13d2 100644
--- a/sys/sys/_stack.h
+++ b/sys/sys/_stack.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
diff --git a/sys/sys/_stdint.h b/sys/sys/_stdint.h
index 248651535f35..a0fe0ad1fa5b 100644
--- a/sys/sys/_stdint.h
+++ b/sys/sys/_stdint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 David E. O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/_sx.h b/sys/sys/_sx.h
index 7e53200393b3..789720b61514 100644
--- a/sys/sys/_sx.h
+++ b/sys/sys/_sx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 8772c134d6d3..d3be7198dc2f 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h
index e0e9e7dec6b0..2a8b852a2b01 100644
--- a/sys/sys/_termios.h
+++ b/sys/sys/_termios.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
index 4a9e903246fe..d51559c2a41a 100644
--- a/sys/sys/_timespec.h
+++ b/sys/sys/_timespec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/_timeval.h b/sys/sys/_timeval.h
index 3da7a711eb19..a35d8a932513 100644
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 343002117668..8736651ba6f0 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/_umtx.h b/sys/sys/_umtx.h
index b9d10b756a0c..d94f86b0f566 100644
--- a/sys/sys/_umtx.h
+++ b/sys/sys/_umtx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/_unrhdr.h b/sys/sys/_unrhdr.h
index 65abe5789710..f3c25d165d80 100644
--- a/sys/sys/_unrhdr.h
+++ b/sys/sys/_unrhdr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/sys/aac_ioctl.h b/sys/sys/aac_ioctl.h
index 6b6e2dee756e..67cdc0ff3a2c 100644
--- a/sys/sys/aac_ioctl.h
+++ b/sys/sys/aac_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 Scott Long
* Copyright (c) 2000 BSDi
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 7f8e454a486a..7c118edea551 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/acl.h b/sys/sys/acl.h
index 196447a6d9cb..9806a54a3072 100644
--- a/sys/sys/acl.h
+++ b/sys/sys/acl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2001 Robert N. M. Watson
* Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/agpio.h b/sys/sys/agpio.h
index 69b91462f39b..78a2ade96d76 100644
--- a/sys/sys/agpio.h
+++ b/sys/sys/agpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 6ab8bdb7f296..83a7cf5e22c8 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/alq.h b/sys/sys/alq.h
index 536fa2077357..4a502d29684e 100644
--- a/sys/sys/alq.h
+++ b/sys/sys/alq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010, The FreeBSD Foundation
diff --git a/sys/sys/assym.h b/sys/sys/assym.h
index 0ef1286bccb6..9316a4e4996c 100644
--- a/sys/sys/assym.h
+++ b/sys/sys/assym.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 43be0a21bc2e..c5792a1955d6 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 6f52bcd007ad..01149dd64df9 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h
index febc18143c23..566d94484207 100644
--- a/sys/sys/bitset.h
+++ b/sys/sys/bitset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h
index 08fa4ba8c599..32465d11ab27 100644
--- a/sys/sys/bitstring.h
+++ b/sys/sys/bitstring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index 32c1cc480d26..4afefd693b76 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Matthew Dillon. All Rights Reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/sys/boot.h b/sys/sys/boot.h
index ef4270dac6f5..4a2fa930935e 100644
--- a/sys/sys/boot.h
+++ b/sys/sys/boot.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
*
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 2e217eeda3f6..b8938e323e35 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h
index 77320c3bd2f4..234e318ecf16 100644
--- a/sys/sys/buf_ring.h
+++ b/sys/sys/buf_ring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2009 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index a4b09f28127c..85c36ff56a8f 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 5f19a3696e44..4a48cb4de985 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 2ea07e0908bc..1a2ecd6b54b0 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -1,8 +1,6 @@
/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/sys/busdma_bufalloc.h b/sys/sys/busdma_bufalloc.h
index 3cb29371d0c4..dfcb4b8c5ff0 100644
--- a/sys/sys/busdma_bufalloc.h
+++ b/sys/sys/busdma_bufalloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
*
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index df4fc07ca4f7..27c37dc15a4c 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/capability.h b/sys/sys/capability.h
index fe5f8b4966eb..8b1c229f46bd 100644
--- a/sys/sys/capability.h
+++ b/sys/sys/capability.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/sys/caprights.h b/sys/sys/caprights.h
index 8698483ce22c..eb8e454f1de9 100644
--- a/sys/sys/caprights.h
+++ b/sys/sys/caprights.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 5cc2f0d99e2c..a1cad1d39691 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/cdrio.h b/sys/sys/cdrio.h
index f8af2fde5cb5..0f8677220503 100644
--- a/sys/sys/cdrio.h
+++ b/sys/sys/cdrio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/cfictl.h b/sys/sys/cfictl.h
index db5ecfe6a7c9..a5439e04fbe9 100644
--- a/sys/sys/cfictl.h
+++ b/sys/sys/cfictl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007, Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index 47a5a941d838..edf1ab7a0e4d 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
*
diff --git a/sys/sys/clock.h b/sys/sys/clock.h
index bfbd6efd2ad3..153d8b407a6f 100644
--- a/sys/sys/clock.h
+++ b/sys/sys/clock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h
index e1a890334afa..f940a7504a80 100644
--- a/sys/sys/condvar.h
+++ b/sys/sys/condvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
*
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 87df4b219ec5..92b230103b00 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2000
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index d1507ddc61c0..0085daa68289 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index 3f5f7e4b09c7..a2b035cada62 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991-1996 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 34653df0a622..e999cc273e76 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (C) 1992-2017 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2018 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,7 +34,7 @@
/* FreeBSD */
#define COPYRIGHT_FreeBSD \
- "Copyright (c) 1992-2017 The FreeBSD Project.\n"
+ "Copyright (c) 1992-2018 The FreeBSD Project.\n"
/* Foundation */
#define TRADEMARK_Foundation \
@@ -46,5 +44,14 @@
#define COPYRIGHT_UCB \
"Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994\n\tThe Regents of the University of California. All rights reserved.\n"
-char copyright[] = COPYRIGHT_Vendor COPYRIGHT_FreeBSD COPYRIGHT_UCB;
+/* a port of FreeBSD to the NEC PC98, Japan */
+#if defined(PC98)
+#define COPYRIGHT_PC98 \
+ "Copyright (c) 1994-2003 FreeBSD(98) porting team.\nCopyright (c) 1992 A.Kojima F.Ukai M.Ishii (KMC).\n"
+#else
+#define COPYRIGHT_PC98
+#endif
+
+char copyright[] = COPYRIGHT_Vendor COPYRIGHT_FreeBSD COPYRIGHT_PC98 \
+ COPYRIGHT_UCB;
char trademark[] = TRADEMARK_Foundation;
diff --git a/sys/sys/counter.h b/sys/sys/counter.h
index 11588945094f..2ce7134176f2 100644
--- a/sys/sys/counter.h
+++ b/sys/sys/counter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h
index b3b745ab7deb..f159e376bba1 100644
--- a/sys/sys/cpu.h
+++ b/sys/sys/cpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2007 Nate Lawson (SDG)
* All rights reserved.
*
diff --git a/sys/sys/cpuctl.h b/sys/sys/cpuctl.h
index 8c7fb65632f5..65556ec61218 100644
--- a/sys/sys/cpuctl.h
+++ b/sys/sys/cpuctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index 81e7a7b87d99..c459e7b05d2f 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/ctype.h b/sys/sys/ctype.h
index ed0802df5185..5022d40c15b2 100644
--- a/sys/sys/ctype.h
+++ b/sys/sys/ctype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 360c5b97c463..bce0570401ca 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sys/sys/digiio.h b/sys/sys/digiio.h
index 8477df8e8396..57824dcd19a5 100644
--- a/sys/sys/digiio.h
+++ b/sys/sys/digiio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Slawa Olhovchenkov
* John Prince <johnp@knight-trosoft.com>
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index 6f345a1be1a8..799ad9ed353c 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 78b6dbbd5230..efa653d5a548 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 452c29d71cd1..42c757aaf3a0 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index eaae8254f506..5f49eb9e8d06 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 16bb6762460e..a9bdf45d549e 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index a24be08db195..1817e7881c6f 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 577e27333b6a..09f69e7f31cc 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007-2008 John Birrell (jb@freebsd.org)
* All rights reserved.
*
diff --git a/sys/sys/dvdio.h b/sys/sys/dvdio.h
index 6d6f2f53bc1f..71e4d96c1d7f 100644
--- a/sys/sys/dvdio.h
+++ b/sys/sys/dvdio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999,2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/elf.h b/sys/sys/elf.h
index f9bc91b30640..b2d6b77c98e2 100644
--- a/sys/sys/elf.h
+++ b/sys/sys/elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
*
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index ad44b7cf970a..0aa3142ed119 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 880166a3e83a..a309dfc6843e 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index a25994afbbd2..9a564a2e48a3 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
* Copyright (c) 1998 John D. Polstra.
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index 301ee52cf7a1..5ff5242efcb2 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index 3cef6130cd15..d50110cabc5d 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 0b5e1eb37fd4..0292c6a17da2 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/eui64.h b/sys/sys/eui64.h
index 163a5bdd5198..33300a779d3b 100644
--- a/sys/sys/eui64.h
+++ b/sys/sys/eui64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2004 The Aerospace Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 6b851ade87a3..5c024ab449ed 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index eb6c76954079..2240a002ed6b 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index 0cf5c847c71e..ce79677f3be6 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999,2000 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index de78d77d7636..1ee150167580 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h
index f0f00ff92740..ce5619bef162 100644
--- a/sys/sys/extattr.h
+++ b/sys/sys/extattr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/sys/fail.h b/sys/sys/fail.h
index b9a14e56281a..bd2eab1d4aa2 100644
--- a/sys/sys/fail.h
+++ b/sys/sys/fail.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Isilon Inc http://www.isilon.com/
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index b61878936b0c..b0779061fa9c 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 029ff9b373ae..d4785121b9b4 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index 7530d21d2f6c..341bbd0e40eb 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
* All rights reserved.
*
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 45444d376981..948c19bcacaa 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 0985fedb6256..e684f74369f7 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 3d39b0ed2656..1710ba45e6c5 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/firmware.h b/sys/sys/firmware.h
index 8a9b2cf23bd7..ce02831a589f 100644
--- a/sys/sys/firmware.h
+++ b/sys/sys/firmware.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005, Sam Leffler <sam@errno.com>
* All rights reserved.
*
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index ce75e1f36caa..1fb850798b5e 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/gpio.h b/sys/sys/gpio.h
index 0d8c3eb5b1d1..dbe55872fe03 100644
--- a/sys/sys/gpio.h
+++ b/sys/sys/gpio.h
@@ -1,8 +1,6 @@
/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
/* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
- *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h
index 5ec1de2ffd77..3ef76b9bf3a2 100644
--- a/sys/sys/gpt.h
+++ b/sys/sys/gpt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/hash.h b/sys/sys/hash.h
index 35e76ec758cb..8abf17bb3683 100644
--- a/sys/sys/hash.h
+++ b/sys/sys/hash.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Tobias Weingartner
* All rights reserved.
*
diff --git a/sys/sys/hhook.h b/sys/sys/hhook.h
index 76c827e66939..1d60dd3b401e 100644
--- a/sys/sys/hhook.h
+++ b/sys/sys/hhook.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index ba9b0e9dd9c8..44a03e96144c 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index d5a4d0183893..8cefb65e93cc 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993, David Greenman
* All rights reserved.
*
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index c4c9f9351c33..3eaa8e75a6d1 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 0ce5b08845d3..40ad7c72ef3f 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995-1996 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 36d2732d4da7..c320e5fc8f12 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 86527adf22a7..5669088dc9c8 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 988b7e3a03a4..07d941481267 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index ff667bc60007..d12cd5a8862c 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index df3b9d8ef719..19f1d39b603e 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/sys/ipmi.h b/sys/sys/ipmi.h
index d4234b6c9ed8..b8e318a921bc 100644
--- a/sys/sys/ipmi.h
+++ b/sys/sys/ipmi.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index bfd41bea69cb..c736bb2dc747 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2009 James Gritton.
* All rights reserved.
diff --git a/sys/sys/joystick.h b/sys/sys/joystick.h
index 60a89dce38c3..6f2eb5bc2829 100644
--- a/sys/sys/joystick.h
+++ b/sys/sys/joystick.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1995 Jean-Marc Zucconi
* All rights reserved.
*
diff --git a/sys/sys/kdb.h b/sys/sys/kdb.h
index d84b8b9956ff..1e68c3982850 100644
--- a/sys/sys/kdb.h
+++ b/sys/sys/kdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/kenv.h b/sys/sys/kenv.h
index fd1ae31f6a95..0a30ddb35d16 100644
--- a/sys/sys/kenv.h
+++ b/sys/sys/kenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index ea3bf2620dab..6b6564668ae6 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Terrence R. Lambert
* All rights reserved.
*
diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h
index 788d2fc80e5d..fd010181eb1d 100644
--- a/sys/sys/kerneldump.h
+++ b/sys/sys/kerneldump.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/sys/khelp.h b/sys/sys/khelp.h
index 54c4791d3be9..f542b1487d4a 100644
--- a/sys/sys/khelp.h
+++ b/sys/sys/khelp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index 5f8b2bb07be3..862e79f0e238 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h
index e5b4285c3fbf..b337a2bfb6fb 100644
--- a/sys/sys/ksem.h
+++ b/sys/sys/ksem.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index e6f1fa41a988..b6304f52f1f0 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index d9bd2bf6e089..07d7c45b5c9f 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/ktr_class.h b/sys/sys/ktr_class.h
index 9190ce27bb8b..4bfc895b71a5 100644
--- a/sys/sys/ktr_class.h
+++ b/sys/sys/ktr_class.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 5bbb556fee3b..86cd23ab59b3 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index c912f5edf1e2..f1e59fb1ddcb 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
index b388b7e4f11a..c56a337debc0 100644
--- a/sys/sys/limits.h
+++ b/sys/sys/limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 2e4f3862c747..6695c268c842 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index bd544752bea8..c228f1d273d5 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 6f9f5c1e2222..349bfeb3369e 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index db5b3d1f3ac1..eaffcd143683 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 John D. Polstra
* Copyright (c) 1999,2001 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index dfb368afd12d..4c5d60b80e2f 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/lock_profile.h b/sys/sys/lock_profile.h
index 7c7edee4af0a..bf73ca14d62a 100644
--- a/sys/sys/lock_profile.h
+++ b/sys/sys/lock_profile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 Kip Macy kmacy@FreeBSD.org
* Copyright (c) 2006 Kris Kennaway kris@FreeBSD.org
* Copyright (c) 2006 Dag-Erling Smorgrav des@des.no
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 5d014936ef0a..1235bdba0c4f 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index debc74be062b..d36d6c8a77ff 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/lockstat.h b/sys/sys/lockstat.h
index 50747e89ccf4..64745052974b 100644
--- a/sys/sys/lockstat.h
+++ b/sys/sys/lockstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/loginclass.h b/sys/sys/loginclass.h
index 9bc14766cf26..6783123a56ba 100644
--- a/sys/sys/loginclass.h
+++ b/sys/sys/loginclass.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index bc12cb753083..0aa896087406 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999-2002 Robert N. M. Watson
* Copyright (c) 2001-2005 Networks Associates Technology, Inc.
* Copyright (c) 2005-2006 SPARTA, Inc.
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 720a57528b30..a6d9a6495990 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993
* The Regents of the University of California.
* Copyright (c) 2005, 2009 Robert N. M. Watson
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 818a9f839d8c..f2f3f79f12c0 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California.
* All rights reserved.
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 28391d749472..b89cbfdfffe4 100644
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000, 2001 Boris Popov
* All rights reserved.
*
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index c09530332a4f..acbfa4b2e9d6 100644
--- a/sys/sys/mdioctl.h
+++ b/sys/sys/mdioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h
index 8a128fd7f519..8e9f7dd66d5b 100644
--- a/sys/sys/memdesc.h
+++ b/sys/sys/memdesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
*
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index df4e34fd95e8..199b519294ea 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/module.h b/sys/sys/module.h
index bf509bc4ec73..07464fc6e1f6 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/module_khelp.h b/sys/sys/module_khelp.h
index a66440277a41..371e4c3170f8 100644
--- a/sys/sys/module_khelp.h
+++ b/sys/sys/module_khelp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 651b94313861..12d2e41b4ed9 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/mpt_ioctl.h b/sys/sys/mpt_ioctl.h
index 527334594faf..3f17433a2bfd 100644
--- a/sys/sys/mpt_ioctl.h
+++ b/sys/sys/mpt_ioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/sys/mqueue.h b/sys/sys/mqueue.h
index ca9fd13cca76..36e89fa21e34 100644
--- a/sys/sys/mqueue.h
+++ b/sys/sys/mqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index a9acc17f6afb..8f56c9482257 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -4,8 +4,6 @@
/*-
* SVID compatible msg.h file
*
- * SPDX-License-Identifier: MIT
- *
* Author: Daniel Boulet
*
* Copyright 1993 Daniel Boulet and RTMX Inc.
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 11f248bf3feb..996fa200ccaf 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1981, 1984, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index bcf433721984..0d2701b82f29 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 805df8adc40a..5e19407f85ca 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 2e33f1698a82..af79eb9eb9ef 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index 5a979c5fedde..cb3dd8591252 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/osd.h b/sys/sys/osd.h
index a9824184c579..c838e97d7ebd 100644
--- a/sys/sys/osd.h
+++ b/sys/sys/osd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 6495b1a97e4b..88500f815d0c 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index 80d2019b7967..d70bfbcf6fc8 100644
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
* Copyright (c) 1997, 1998, 1999, Kenneth D. Merry <ken@FreeBSD.ORG>
* All rights reserved.
diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h
index 49f25c18dca4..d6d1b3d82c7b 100644
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001 Wind River Systems, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h
index 88d5d2583e40..1fd0b34dceb6 100644
--- a/sys/sys/pctrie.h
+++ b/sys/sys/pctrie.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 1a0bf11f8794..93bdbeccd2f8 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 6ff07d4213d7..a03e50718ae8 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/pmckern.h b/sys/sys/pmckern.h
index 986fbb2b5cc2..dd197fd87481 100644
--- a/sys/sys/pmckern.h
+++ b/sys/sys/pmckern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/pmclog.h b/sys/sys/pmclog.h
index b2f89de3ae77..a6bbf0b98dc3 100644
--- a/sys/sys/pmclog.h
+++ b/sys/sys/pmclog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index 6805704ca39f..ca3ce12873c6 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index 3019c6d5ccf8..8dcf36dec335 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -1,8 +1,6 @@
#ifndef _P1003_1B_P1003_1B_H_
#define _P1003_1B_P1003_1B_H_
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997, 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/sys/power.h b/sys/sys/power.h
index 3fcc2c387d61..62784b2e49d3 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
diff --git a/sys/sys/priority.h b/sys/sys/priority.h
index 60327cf20293..a2cd3b7248e2 100644
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994, Henrik Vestergaard Draboel
* All rights reserved.
*
diff --git a/sys/sys/priv.h b/sys/sys/priv.h
index 3dc54d91e7cb..828c19f25efb 100644
--- a/sys/sys/priv.h
+++ b/sys/sys/priv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 nCircle Network Security, Inc.
* All rights reserved.
*
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 825e2de498a1..02efbb913120 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/procctl.h b/sys/sys/procctl.h
index 17144e9f0c68..8c938c5d70aa 100644
--- a/sys/sys/procctl.h
+++ b/sys/sys/procctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Hudson River Trading LLC
* Copyright (c) 2014, 2016 The FreeBSD Foundation
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h
index b307917c5479..a9bad27361b2 100644
--- a/sys/sys/procdesc.h
+++ b/sys/sys/procdesc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index 85e718b20c35..5f857ef66713 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
*
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index b40c0d1d03a7..896ec253243a 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1c5aad22197b..1292280528d3 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 974c4d233358..fdbda29eb8d1 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1984, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 7353c75885d4..f26c492af1c7 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/racct.h b/sys/sys/racct.h
index ec3322bdfdf9..9b8143f2a7cb 100644
--- a/sys/sys/racct.h
+++ b/sys/sys/racct.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 9e03e5ef6527..edad83bcc3d9 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -1,7 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2000-2015, 2017 Mark R. V. Murray
+ * Copyright (c) 2000-2015 Mark R. V. Murray
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,9 +58,9 @@ read_random(void *a __unused, u_int b __unused)
#endif
/*
- * Note: if you add or remove members of random_entropy_source, remember to
- * also update the strings in the static array random_source_descr[] in
- * random_harvestq.c.
+ * Note: if you add or remove members of random_entropy_source, remember to also update the
+ * KASSERT regarding what valid members are in random_harvest_internal(), and remember the
+ * strings in the static array random_source_descr[] in random_harvestq.c.
*
* NOTE: complain loudly to markm@ or on the lists if this enum gets more than 32
* distinct values (0-31)! ENTROPYSOURCE may be == 32, but not > 32.
@@ -83,8 +81,7 @@ enum random_entropy_source {
RANDOM_UMA, /* Special!! UMA/SLAB Allocator */
RANDOM_ENVIRONMENTAL_END = RANDOM_UMA,
/* Fast hardware random-number sources from here on. */
- RANDOM_PURE_START,
- RANDOM_PURE_OCTEON = RANDOM_PURE_START,
+ RANDOM_PURE_OCTEON,
RANDOM_PURE_SAFE,
RANDOM_PURE_GLXSB,
RANDOM_PURE_UBSEC,
@@ -93,29 +90,19 @@ enum random_entropy_source {
RANDOM_PURE_NEHEMIAH,
RANDOM_PURE_RNDTEST,
RANDOM_PURE_VIRTIO,
- RANDOM_PURE_BROADCOM,
ENTROPYSOURCE
};
#define RANDOM_HARVEST_EVERYTHING_MASK ((1 << (RANDOM_ENVIRONMENTAL_END + 1)) - 1)
-#define RANDOM_HARVEST_PURE_MASK (((1 << ENTROPYSOURCE) - 1) & (-1UL << RANDOM_PURE_START))
-
-#define RANDOM_LEGACY_BOOT_ENTROPY_MODULE "/boot/entropy"
-#define RANDOM_CACHED_BOOT_ENTROPY_MODULE "boot_entropy_cache"
-#define RANDOM_CACHED_SKIP_START 256
#if defined(DEV_RANDOM)
void random_harvest_queue(const void *, u_int, u_int, enum random_entropy_source);
void random_harvest_fast(const void *, u_int, u_int, enum random_entropy_source);
void random_harvest_direct(const void *, u_int, u_int, enum random_entropy_source);
-void random_harvest_register_source(enum random_entropy_source);
-void random_harvest_deregister_source(enum random_entropy_source);
#else
#define random_harvest_queue(a, b, c, d) do {} while (0)
#define random_harvest_fast(a, b, c, d) do {} while (0)
#define random_harvest_direct(a, b, c, d) do {} while (0)
-#define random_harvest_register_source(a) do {} while (0)
-#define random_harvest_deregister_source(a) do {} while (0)
#endif
#if defined(RANDOM_ENABLE_UMA)
diff --git a/sys/sys/rangelock.h b/sys/sys/rangelock.h
index 732bd9406d48..2a904c098d82 100644
--- a/sys/sys/rangelock.h
+++ b/sys/sys/rangelock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/rctl.h b/sys/sys/rctl.h
index 5d01ff03e7d9..b9e6cd6d17f7 100644
--- a/sys/sys/rctl.h
+++ b/sys/sys/rctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 820ce6ff3fed..ebe688e869f2 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h
index b63e40609b66..7e6e977a969c 100644
--- a/sys/sys/refcount.h
+++ b/sys/sys/refcount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/regression.h b/sys/sys/regression.h
index 1ce711faa35f..8ee757ed170a 100644
--- a/sys/sys/regression.h
+++ b/sys/sys/regression.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 1d889a9a4df1..8e445e65d01c 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 808046d87a58..a81cafd03e0a 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/rmlock.h b/sys/sys/rmlock.h
index da5d7274e780..9f9733806761 100644
--- a/sys/sys/rmlock.h
+++ b/sys/sys/rmlock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Stephan Uphoff <ups@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 529156030742..7ffdb732b61a 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994, Henrik Vestergaard Draboel
* All rights reserved.
*
diff --git a/sys/sys/runq.h b/sys/sys/runq.h
index 0e3113b1102f..50c00eb69442 100644
--- a/sys/sys/runq.h
+++ b/sys/sys/runq.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h
index 43bbc68cf131..2bf31ec6d021 100644
--- a/sys/sys/rwlock.h
+++ b/sys/sys/rwlock.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 400db8aa353d..c05bafd1e598 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000-2008 Poul-Henning Kamp
* Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index 812434eba18b..576c8b1fc2b1 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index 424a0e3a0ded..6771bf9f1177 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 70df41c0f3cf..8a899acb6836 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index 9cf8563651cf..590d184ad17c 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/sema.h b/sys/sys/sema.h
index 3b91c921c46a..cdce5982311c 100644
--- a/sys/sys/sema.h
+++ b/sys/sys/sema.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 3293ebdab931..1a149a96252f 100644
--- a/sys/sys/serial.h
+++ b/sys/sys/serial.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index 721122768493..b5970d95fd82 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 2003-2004 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/sys/sglist.h b/sys/sys/sglist.h
index d522222f7b9c..1c0985803ebd 100644
--- a/sys/sys/sglist.h
+++ b/sys/sys/sglist.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 4b1cc0c8a3e4..62016d051063 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -2,8 +2,6 @@
/* $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 Adam Glass
* All rights reserved.
*
diff --git a/sys/sys/sigio.h b/sys/sys/sigio.h
index 603ce99d3f78..62ece6d4c28a 100644
--- a/sys/sys/sigio.h
+++ b/sys/sys/sigio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 51c77a93099a..d4d5fbd6c8d1 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index c01c527dfb1d..181d479dea0d 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index 07530e3bd789..30a18933d60b 100644
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/slicer.h b/sys/sys/slicer.h
index 1565ecceb36d..53f680d84ced 100644
--- a/sys/sys/slicer.h
+++ b/sys/sys/slicer.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Semihalf.
* All rights reserved.
*
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index 483cccf43b34..b25aa494ff8e 100644
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: MIT
- *
* Copyright (c) 1995 Ugen J.S.Antsilevich
*
* Redistribution and use in source forms, with and without modification,
diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h
index 8f8f509be719..c0148b4d8ec0 100644
--- a/sys/sys/sockbuf.h
+++ b/sys/sys/sockbuf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 7b021d764f11..d6459b158ba3 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 837c6a0977c4..7decd6318b00 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 636ad33d6a94..9e91133f611c 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/sockopt.h b/sys/sys/sockopt.h
index c71d0c18c6d5..69d6c6dc2e65 100644
--- a/sys/sys/sockopt.h
+++ b/sys/sys/sockopt.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/stack.h b/sys/sys/stack.h
index b7733a371c61..e26b535e12ab 100644
--- a/sys/sys/stack.h
+++ b/sys/sys/stack.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index c8fff54ade07..7a4370d64a27 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h
index 94b69befb7b8..0a6ae4677bdd 100644
--- a/sys/sys/stdatomic.h
+++ b/sys/sys/stdatomic.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* David Chisnall <theraven@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h
index eeff767bbf20..15817444aef4 100644
--- a/sys/sys/stddef.h
+++ b/sys/sys/stddef.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h
index e951ac3c5df8..e3d696bf5c23 100644
--- a/sys/sys/stdint.h
+++ b/sys/sys/stdint.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/sun_disklabel.h b/sys/sys/sun_disklabel.h
index f987231ef48b..ac85e19706a5 100644
--- a/sys/sys/sun_disklabel.h
+++ b/sys/sys/sun_disklabel.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2004,2005 Joerg Wunsch
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index 209905136d80..3550ce664af0 100644
--- a/sys/sys/sx.h
+++ b/sys/sys/sx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index ad0840df60b4..4dfac921c6b5 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Ian Dowse. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index d933b4674fb6..f07d0cf3b44a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 1c3bc156a008..0731a56b6202 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1988, 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index f70a5ba505f7..47f61a52b4f0 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index fc00e00ec32e..61bad21ccb2f 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index e86a66da465f..46ad6f0eb731 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 75960d33771f..dbef2e91d348 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
diff --git a/sys/sys/terminal.h b/sys/sys/terminal.h
index c69f00b05af1..6528558a8608 100644
--- a/sys/sys/terminal.h
+++ b/sys/sys/terminal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index c00b8b25a9f4..7ccc8724ffbb 100644
--- a/sys/sys/thr.h
+++ b/sys/sys/thr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index 9de9dd927587..442dceb012c0 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1999, 2000 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 6cc1238e5f46..a5155cfd2293 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 347b7c9bcfae..810c523d7cb1 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/timeet.h b/sys/sys/timeet.h
index dc43337d176a..3d50e51dafc2 100644
--- a/sys/sys/timeet.h
+++ b/sys/sys/timeet.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/timeffc.h b/sys/sys/timeffc.h
index 493a212b3f96..3bda5d40b72d 100644
--- a/sys/sys/timeffc.h
+++ b/sys/sys/timeffc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
*
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 01956bd3caaa..3ef079c7318a 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.
diff --git a/sys/sys/times.h b/sys/sys/times.h
index ecd2784a53e7..b6b1e1dba1ea 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/timespec.h b/sys/sys/timespec.h
index 5097f68b0d04..2505cef893e5 100644
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 539afb42b90d..c9df686fbb13 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -3,8 +3,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 9fd92ba26a75..09e04195ae55 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index f5ebd25f7ed3..8d7547f5795a 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 8b80f3e65040..82929f945d2e 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/ttydevsw.h b/sys/sys/ttydevsw.h
index b189335c5e9d..98bebca724dd 100644
--- a/sys/sys/ttydevsw.h
+++ b/sys/sys/ttydevsw.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/ttydisc.h b/sys/sys/ttydisc.h
index 2ab0c05c91b2..74a1a0ed927e 100644
--- a/sys/sys/ttydisc.h
+++ b/sys/sys/ttydisc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/ttyhook.h b/sys/sys/ttyhook.h
index 0697a4886843..2a6d0887acb8 100644
--- a/sys/sys/ttyhook.h
+++ b/sys/sys/ttyhook.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/ttyqueue.h b/sys/sys/ttyqueue.h
index c1ddaa42b41b..c8d85d6280d5 100644
--- a/sys/sys/ttyqueue.h
+++ b/sys/sys/ttyqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/turnstile.h b/sys/sys/turnstile.h
index 5d29fd9bc8b2..072561d44e92 100644
--- a/sys/sys/turnstile.h
+++ b/sys/sys/turnstile.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/sys/types.h b/sys/sys/types.h
index a9f1cebc52cc..4945e81e7c97 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index 1a1f7b7ccbdb..260c15751d2d 100644
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 78c0e36409c7..8dbf2fef74fe 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index d0be69561924..ff21b096ac71 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index a99b1b83c4bb..dfd6be54000c 100644
--- a/sys/sys/umtx.h
+++ b/sys/sys/umtx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 5be6d2f45e5c..7837e76ee709 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 18de7ae33463..0875509ad85a 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 72769177386f..2547fdcbac85 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/user.h b/sys/sys/user.h
index ead5306f4adb..5115b79880b6 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California.
* Copyright (c) 2007 Robert N. M. Watson
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index fad9cdc98fa7..410e06566b36 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/uuid.h b/sys/sys/uuid.h
index 6ffc0b74da53..0748f6114853 100644
--- a/sys/sys/uuid.h
+++ b/sys/sys/uuid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/sys/vdso.h b/sys/sys/vdso.h
index b645e5356c84..25c5e6695eea 100644
--- a/sys/sys/vdso.h
+++ b/sys/sys/vdso.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
diff --git a/sys/sys/vmem.h b/sys/sys/vmem.h
index ca8426733e3b..f6b960a58518 100644
--- a/sys/sys/vmem.h
+++ b/sys/sys/vmem.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c)2006 YAMAMOTO Takashi,
* All rights reserved.
*
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index bb302c3eb88c..a5c9dc6dfe78 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 194483d0867b..d6f5e1185e8e 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 024a7adf3694..338211649f60 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index 191456a4acf2..8e27a844bbe3 100644
--- a/sys/sys/watchdog.h
+++ b/sys/sys/watchdog.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 2013 iXsystems.com,
* author: Alfred Perlstein <alfred@freebsd.org>
diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk
index 471f746415a3..8ca99bb17db9 100644
--- a/sys/tools/makeobjops.awk
+++ b/sys/tools/makeobjops.awk
@@ -1,8 +1,6 @@
#!/usr/bin/awk -f
#-
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index 41ef155889db..5bb3971c4387 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -1,8 +1,6 @@
#!/usr/bin/awk -f
#-
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index b207f58efd77..3fa4ab012abe 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index d68df9526db0..b7d56dbf3b28 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index c6f47ad28441..56f5cd8e3efa 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 2fcc8cd34d57..f6f0eb1da7cd 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index a0fbe1c7ca7c..cabed2baea16 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index ec4830e21525..848d47805c31 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e4f90b635163..f085f18feb55 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index b2758d0772ac..1cbd36de452b 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 39fa22abc53b..35ee27039bd4 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 55bddd0848d4..574a32f9e7f3 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 0378fac60b69..e44cae59ee45 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 6ca782c414e5..f0e24f0041a1 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 4ddb55999f7a..f6a774a89fc4 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 41b94d94fb57..e64faf1888a8 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 210a84928e79..aeaa7c83267d 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1995
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 66a2bae2518d..ecbe09d687dd 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 68ad528f03e3..fe8a283c6661 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1990, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 923a8f31aa9c..5bb73ea0c81d 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index a7eb892e1af2..bd41127edc27 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 83d67c1ef7e5..e0212e0159f3 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index d719e1f10429..13348e34fc77 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index a0d56ca8d7ad..6033f37b12e4 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 9d9f84c92d66..d827256de128 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1998 Matthew Dillon,
* Copyright (c) 1994 John S. Dyson
* Copyright (c) 1990 University of Utah.
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index db10fb6df88d..1abded5710d5 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index c4638fe6aa03..0e523ea3da73 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 8398c12d7303..8e55273c0696 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index e92ae4caf4aa..e829bd7459f8 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index c134a1740b7c..14ec78acc74d 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index efa9ef1e6661..6db016496e76 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 54d12fc61c0d..d99db9a2d6c2 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index a48e268b905d..89059e63944f 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 6969900ce953..fd69c4e41684 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 4de79e6be306..fc0c0c745db3 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 49d80682d036..8c9351c080b1 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index b108802a73c9..d2dc45362284 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index f90a458f923d..252bb2763da8 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 482f83efefb0..17a885eb6d02 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 48d74595cd99..6629c2fa9b94 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1998 Matthew Dillon. All Rights Reserved.
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 3b52f5c6ddb0..acfb9f0ecf0c 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index fc7a9d007877..64ce68588860 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index bd5d97b701e9..74f8e29c52b5 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 7434dca3a254..3625b4188423 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 8fc6cfbedd95..0e7c4edc45cb 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 44d1757b135b..20dc14329cc2 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index ff9c18d7f0c6..201c13bf933e 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 55dc5a031960..000c3b561513 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 3310a6ed3508..80ad634f388d 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/x86/include/_align.h b/sys/x86/include/_align.h
index efb8d59bb70f..9f7b6b953236 100644
--- a/sys/x86/include/_align.h
+++ b/sys/x86/include/_align.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/_limits.h b/sys/x86/include/_limits.h
index 393d45ad6a0e..2f582e1237c6 100644
--- a/sys/x86/include/_limits.h
+++ b/sys/x86/include/_limits.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index c9a7787fcab6..8aa0e2ba01b7 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/x86/include/endian.h b/sys/x86/include/endian.h
index 37ee00d2022c..6ca6a6cf1cf9 100644
--- a/sys/x86/include/endian.h
+++ b/sys/x86/include/endian.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/include/float.h b/sys/x86/include/float.h
index 5d8c9737d298..32e338efb2c0 100644
--- a/sys/x86/include/float.h
+++ b/sys/x86/include/float.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h
index 94fbf2fa2252..74187360184e 100644
--- a/sys/x86/include/frame.h
+++ b/sys/x86/include/frame.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/psl.h b/sys/x86/include/psl.h
index 62f8b0c57a5a..47851e0bb0b1 100644
--- a/sys/x86/include/psl.h
+++ b/sys/x86/include/psl.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/include/ptrace.h b/sys/x86/include/ptrace.h
index 8549cb358d9f..40c76639d534 100644
--- a/sys/x86/include/ptrace.h
+++ b/sys/x86/include/ptrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/x86/include/reg.h b/sys/x86/include/reg.h
index 782916874e77..a1452ccf5717 100644
--- a/sys/x86/include/reg.h
+++ b/sys/x86/include/reg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/segments.h b/sys/x86/include/segments.h
index 18fc58d23992..65b5870d4a82 100644
--- a/sys/x86/include/segments.h
+++ b/sys/x86/include/segments.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1990 William F. Jolitz
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/setjmp.h b/sys/x86/include/setjmp.h
index c453f9b755aa..c33f9a5baed5 100644
--- a/sys/x86/include/setjmp.h
+++ b/sys/x86/include/setjmp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/x86/include/signal.h b/sys/x86/include/signal.h
index e023dbbbc840..dee908f82b90 100644
--- a/sys/x86/include/signal.h
+++ b/sys/x86/include/signal.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2003 Peter Wemm.
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index 12cc77bbacbe..9ca3d1a9a888 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/include/stdarg.h b/sys/x86/include/stdarg.h
index db8e4623a89c..95bd02a37bb3 100644
--- a/sys/x86/include/stdarg.h
+++ b/sys/x86/include/stdarg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h
index 97adc955c3e2..9c0b79692237 100644
--- a/sys/x86/include/sysarch.h
+++ b/sys/x86/include/sysarch.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/include/trap.h b/sys/x86/include/trap.h
index 71bb58cd6f20..c0d9e1619c1c 100644
--- a/sys/x86/include/trap.h
+++ b/sys/x86/include/trap.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c
index 04844e90c042..f0a9eec9dbea 100644
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/x86/isa/icu.h b/sys/x86/isa/icu.h
index 20efdcd62c07..74b21fd97e23 100644
--- a/sys/x86/isa/icu.h
+++ b/sys/x86/isa/icu.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/isa/isa_dma.c b/sys/x86/isa/isa_dma.c
index 8c2cd9bb882c..6b869cd1e534 100644
--- a/sys/x86/isa/isa_dma.c
+++ b/sys/x86/isa/isa_dma.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/isa/nmi.c b/sys/x86/isa/nmi.c
index 253513cbce07..db5550c63423 100644
--- a/sys/x86/isa/nmi.c
+++ b/sys/x86/isa/nmi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/x86/x86/delay.c b/sys/x86/x86/delay.c
index 7bce9f72704e..8cbe6012a96b 100644
--- a/sys/x86/x86/delay.c
+++ b/sys/x86/x86/delay.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990 The Regents of the University of California.
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
index 11e1639edd54..51115c04a4a3 100644
--- a/sys/x86/x86/msi.c
+++ b/sys/x86/x86/msi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2006 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/regression/aio/aiop/aiop.c b/tools/regression/aio/aiop/aiop.c
index 20e0a2c1a097..98a176e5b230 100644
--- a/tools/regression/aio/aiop/aiop.c
+++ b/tools/regression/aio/aiop/aiop.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002 Adrian Chadd <adrian@FreeBSD.org>.
* All rights reserved.
*
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index bf8fae0bb262..925e7c21368e 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996 - 2000
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/memlock.c b/tools/regression/p1003_1b/memlock.c
index 3033fbbacfd5..b55b4056dac8 100644
--- a/tools/regression/p1003_1b/memlock.c
+++ b/tools/regression/p1003_1b/memlock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996 - 1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/p26.c b/tools/regression/p1003_1b/p26.c
index ae869bffddf3..538deaf87863 100644
--- a/tools/regression/p1003_1b/p26.c
+++ b/tools/regression/p1003_1b/p26.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index ea6fcc7a461f..1814c79194e4 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index 479ce50ef886..a9b7badb3452 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/posixsem/posixsem.c b/tools/regression/posixsem/posixsem.c
index 693a923ab5e6..6401b5cb46b5 100644
--- a/tools/regression/posixsem/posixsem.c
+++ b/tools/regression/posixsem/posixsem.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/regression/posixsem/test.c b/tools/regression/posixsem/test.c
index bd309733c568..8583a0dbbac6 100644
--- a/tools/regression/posixsem/test.c
+++ b/tools/regression/posixsem/test.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/regression/posixsem/test.h b/tools/regression/posixsem/test.h
index 39f3c2ff74af..505679b1fdb0 100644
--- a/tools/regression/posixsem/test.h
+++ b/tools/regression/posixsem/test.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/test/hwpmc/pmctest.py b/tools/test/hwpmc/pmctest.py
index 51f58311a62b..9265dde61a2d 100755
--- a/tools/test/hwpmc/pmctest.py
+++ b/tools/test/hwpmc/pmctest.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 2012, Neville-Neil Consulting
# All rights reserved.
#
diff --git a/tools/tools/cxgbtool/cxgbtool.c b/tools/tools/cxgbtool/cxgbtool.c
index a78c7931eebd..8eaaf28e34bd 100644
--- a/tools/tools/cxgbtool/cxgbtool.c
+++ b/tools/tools/cxgbtool/cxgbtool.c
@@ -1,5 +1,4 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 2007-2010, Chelsio Inc.
All rights reserved.
diff --git a/tools/tools/pirtool/pirtable.h b/tools/tools/pirtool/pirtable.h
index 6435531a3937..86bed66652be 100644
--- a/tools/tools/pirtool/pirtable.h
+++ b/tools/tools/pirtool/pirtable.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002-2006 Bruce M. Simpson.
* All rights reserved.
*
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 3484eb5663cc..2b854ccbdca0 100644
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2002-2006 Bruce M. Simpson.
* All rights reserved
*
diff --git a/tools/tools/vxge/vxge_cmn.h b/tools/tools/vxge/vxge_cmn.h
index e6657e8e9bb9..bd34cf33cc4a 100644
--- a/tools/tools/vxge/vxge_cmn.h
+++ b/tools/tools/vxge/vxge_cmn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/tools/tools/vxge/vxge_info.c b/tools/tools/vxge/vxge_info.c
index 2eda5bf54769..d213d8727476 100644
--- a/tools/tools/vxge/vxge_info.c
+++ b/tools/tools/vxge/vxge_info.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/tools/tools/vxge/vxge_info.h b/tools/tools/vxge/vxge_info.h
index 85f080a23fa6..cffa95676957 100644
--- a/tools/tools/vxge/vxge_info.h
+++ b/tools/tools/vxge/vxge_info.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/tools/tools/vxge/vxge_log.c b/tools/tools/vxge/vxge_log.c
index 7af44fdf72a6..9430162536aa 100644
--- a/tools/tools/vxge/vxge_log.c
+++ b/tools/tools/vxge/vxge_log.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/tools/tools/vxge/vxge_log.h b/tools/tools/vxge/vxge_log.h
index 5063f225cc9b..b1b951b90f5f 100644
--- a/tools/tools/vxge/vxge_log.h
+++ b/tools/tools/vxge/vxge_log.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright(c) 2002-2011 Exar Corp.
* All rights reserved.
*
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 1d5587043ac5..c886660bf069 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index e902a8ff37cc..c1050aa4c95e 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
* Copyright (c) 2007 Joseph Koshy
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index fab8220c13be..a968c7f5ebc4 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index ae4fe3f21901..4c1023f0113d 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index e55415b79d66..0adda01fa46a 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index fd5479673cca..84d188071ea9 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 22f0881b98a4..1113c4a3a6b6 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 9d522783e666..dac6115be4b4 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index f4eda36d95a7..493488ddd8db 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/locale.c b/usr.bin/calendar/locale.c
index 4afeef220e7a..70184289d342 100644
--- a/usr.bin/calendar/locale.c
+++ b/usr.bin/calendar/locale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index abe541c88d22..e5507a110fcc 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 8c1f75646623..671763a76b73 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index e3f8440c7310..2f8bd96f16af 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index ab71872af6ab..9f9be5335a68 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index b655c5dd0b59..fd3a8390378e 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index fbe101592b3a..ce82f8ee4644 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 3b5129c085a1..eac5561a8dc2 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 7c6c6dd02f74..a4918b4955b3 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index bfece1d4ae10..baf160e8762e 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 857c515e9b65..05dc8bbd804b 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 65393f43405e..a76876a928d3 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index b5fc9b4326d2..84ec8d2cd153 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 1df4c420c3fd..912ffd66997d 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 5b669d26bb8d..60640a751147 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 1d00c60c64f7..540d9e54cfef 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index eb6abfffbe3d..f3ac7178ecad 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index d387c2503b6f..a35cc3d63938 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 09f59f7f178a..0e94ea5fca89 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index d872143695a8..7ed83c13c1be 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 2edf9352a3c0..edb641c8e7b4 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 0f5049ceb2b4..13df126e00ba 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 25a4048d8a75..c37a3ca232e3 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index c3e12072b1ac..eb8ca66e4b02 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 684fb62b8ee7..54763e1038f3 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 3e8209cc8648..87494e3369bf 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index e99fb054abc6..8ae3d7d42bba 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1986, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 8c16b362f2c4..22878488c3c9 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index d037eae9a628..28198406624e 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index 3b3ac10f6648..597723df59b8 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index c5d48224a062..66d4b54b00fe 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 397711483be0..0d0e2c2e9d1a 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 27f8c61eb18c..ca5b9deb41ba 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 96e5e91fe35b..b9b2c7a5e880 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index cd22509ded6a..5678da557e76 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 32d8c79ed0fd..e343e5ae3474 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 59c8eda9b8e4..c176995cc1c3 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 336967709a38..c1216998fcbc 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 931a7c6514c5..3dc152ad37a7 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index a22295f9a52f..1d8908903c87 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index cba9cb8bb6bc..99948bc3d054 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 206fa85551ae..b2e344acd7a8 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 240e28da4bd8..3e5d56b0217b 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index cf7fb9bbb9c5..53cb69ff2f77 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 9795aee11079..68372c768de3 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 4eb394d7ef5b..953c45657ca4 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 732efa4cd359..bcbeed56f600 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 4d5be8918526..df2e5025457c 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 8333a32c123c..b8a6fe4e12df 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index d73c44a6ba0c..4fc63b6c7562 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 4176afbfea94..cc2a203c3d04 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index f01dd2b6fb40..0a4e952ae748 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 2481558f46e3..2b705540164a 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 349b3c218af1..db902df6c5d4 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index a21f61a0ad28..db5f96dd8526 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 6725ecbb493d..afbab4e35a8d 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 07cf97c3df12..b7d0d2ad098f 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 662d372cbd43..1ce9b5eb3a92 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index d07f134ddbb4..226270359dc6 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 3d1349fa9144..1aeee67511dd 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index 0b4c352beeb4..cf8a44f0ff27 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 72d058e16a94..e036c91f2461 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/amd64.h
index ee87a87db39d..58b92c577283 100644
--- a/usr.bin/gprof/amd64.h
+++ b/usr.bin/gprof/amd64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index f7350fdc7048..7907d466df68 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 6cb471632d91..4bea6c67186b 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/arm.h b/usr.bin/gprof/arm.h
index ee87a87db39d..58b92c577283 100644
--- a/usr.bin/gprof/arm.h
+++ b/usr.bin/gprof/arm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index a5439fac069a..a49cd31d4687 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index 47bb5632000c..3d9c13680255 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 67009e1a9e07..879b0acb75ae 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index bd4cb357c5cf..c8140eb8dde6 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 5c4e8681fca9..9a8a2b1b1612 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index ee87a87db39d..58b92c577283 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 1db906f36a75..0ef1e0bb1e42 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/mips.h b/usr.bin/gprof/mips.h
index 0266a32ef4cf..e6a1c9caf0cf 100644
--- a/usr.bin/gprof/mips.h
+++ b/usr.bin/gprof/mips.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index 0df03686f8f4..f88bea03ee35 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/powerpc.h b/usr.bin/gprof/powerpc.h
index ee87a87db39d..58b92c577283 100644
--- a/usr.bin/gprof/powerpc.h
+++ b/usr.bin/gprof/powerpc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 1ac187d6f3ef..303365a9c0ef 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index 9e1bc49079bf..a8eb6b6fe236 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index ee87a87db39d..58b92c577283 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index b2f3e8d51bd3..d99e70f0e740 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -1,8 +1,6 @@
/* $NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1986, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index d558c762e68f..e1caa1fcee8a 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1987, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 72f7db1d6aac..5a04fc4ab702 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index a060c3b4cae5..3b33f4dd9089 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index bdc5c3277fec..d3c4bb51bac7 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 2fcc625774af..e34d3a011300 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 82f1d78b4e80..ac1971a4ca89 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index c37a0b430a55..ebcb7203db56 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index bf9f8fc5e6ab..1e0612028f86 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 023fe1fc3dbe..345e2a677f5b 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 00456e119c97..1ecdffe4f265 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 44399feaa81c..2652b2f8b509 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1980, 1993
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 369d0da58c2c..db5b325f7a63 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 95a89f132125..d2abe004337a 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 25e386749d07..f707e1624a33 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 7c6989c93f44..f16e2ff4e58f 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index c53b4447ac6d..f6590fd253c2 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 9710b7a8feff..00cb23a657c4 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 63dccb78f84a..723147ee6eeb 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 382b8a20e194..779a4b968dee 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index a5fdca5c0597..7db1a8b87943 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 245fc52b3668..f993d376bc14 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 4b22e4fdd989..f016516ed685 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 6ca29f17e611..eacd44c958f2 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index f4efb8f6a4d4..60d1c52e2805 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 32e5dcd4abc8..1db10b399dfa 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index fe0f600cb847..b2a0f0f3ffab 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index e00c8bebdf22..7415545b3d60 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 002cc23b4f93..29c89e5f84f8 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lex/initparse.c b/usr.bin/lex/initparse.c
index d5736cd00321..9bfd5cd91df0 100644
--- a/usr.bin/lex/initparse.c
+++ b/usr.bin/lex/initparse.c
@@ -17,8 +17,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
#define YYPURE 0
#line 35 "parse.y"
-/ * SPDX-License-Identifier: BSD-2-Clause */
-
/* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index fe0011ee1e5c..6fa2d3112928 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 18ee68c93527..9a87c16bb6e6 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index e2f6d74552ec..c15730ba5af4 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 7c62659497b6..3a87b14a0de7 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 7b4f672f7d80..c2f27fb33759 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 88e8a0585d11..9130e375454b 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 257a9619f428..8c1294656cc9 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index f81115988ff2..49360f4a050f 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index e99ee5efc2eb..525ccfcf672b 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technologies, Inc.
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index edb198df6a95..210f2d7fa0e5 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2005 Apple Computer, Inc.
* All rights reserved.
*
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 05750bf6cdfc..836725fe7f00 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 87dea2b881c0..8a251ae4b6d5 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 10fedbb2dc88..ada6e2595744 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index 6a16dbe74d3b..bd870e23abf0 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index bfa296b85932..4b6243cd3477 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1990, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 34d956e3aefe..f3d72b647e03 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,9 +1,7 @@
/* $OpenBSD: eval.c,v 1.74 2015/02/05 12:59:57 millert Exp $ */
/* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 165f57387bbb..6d410d8bed61 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -2,8 +2,6 @@
/* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index acda95996033..383fbc6f7fd2 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,8 +1,6 @@
/* $OpenBSD: look.c,v 1.24 2014/12/21 09:33:12 espie Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index c43dedda035c..92d1ea3d6adb 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -2,8 +2,6 @@
/* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index b15f2b5bce38..fc2d32a45219 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,9 +1,7 @@
/* $OpenBSD: mdef.h,v 1.33 2015/11/03 16:21:47 deraadt Exp $ */
/* $NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 5b7fb302ff07..aeafea98f35d 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,9 +1,7 @@
/* $OpenBSD: misc.c,v 1.46 2015/12/07 14:12:46 espie Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 742edc147722..668111c6b717 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,9 +1,7 @@
/* $OpenBSD: pathnames.h,v 1.6 2015/11/03 16:21:47 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 2ef1bb1f3bdf..85e6b00686b0 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -2,8 +2,6 @@
/* $NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 10c721035850..4782ec935ba4 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 20b25cf8c730..dd7f6ddcaa75 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index 1836a13c4851..11954d1d463c 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index d691859290aa..eb19bc456871 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 544e677edbd9..069eaaec1cfc 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index fb9ad23f5581..e637252f6a8b 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 8c733c37a2fd..f9e974da20f7 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index aeb06dc7cad2..2578d65b78c7 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 3638938f411f..d9d4ee1a24ab 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index b3db32ca623b..4f0635411707 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index e0ff38643599..a2eeea363a3e 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index f4c528f1fd68..d836ce4882de 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 47137e3a3fc7..4d799e71283a 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index e6af32a73ec7..3a5cc150efb1 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 0548ca11f2c9..0699a5572a12 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index e7e0ece96174..724d2018c077 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index cda00be7ad59..17dd106f16f0 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 85feb5db74ed..60a09360c9d2 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index e432c6031019..4b9bcda3a7ed 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 18481d9b90c9..0ee7f2d3d0e6 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 57e2f12b3f65..a19932318c19 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 54932284227d..ec9334e74d09 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 4b197b29722b..d274467b5aa3 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 821594889e87..f8635a212aaf 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 3c7a4e13523d..43a0a554820e 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 39c1773ff13f..0da7b3b30a68 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index 699fb800f0d2..f3c6659e3fb9 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index c59592b2830d..379fda866ba3 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 056e6e8f7ccc..796a047730c9 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index 0f0f636d53c7..ac976219448e 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index 72d431b7904f..852450838d26 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 4e4b581d8267..7c974bd8ad45 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index 6684cbba6e12..60268cc90851 100644
--- a/usr.bin/mklocale/extern.h
+++ b/usr.bin/mklocale/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index fe3944591bc0..392252f4bf4e 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 9f85e813b776..08fa54a4b176 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 28077bb0c2f2..01f9f493a663 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 79a223f2f218..2025effb98e4 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index e34e387762e6..832e86a5ff63 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index f38c11510a2a..541d510a2d0b 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index e44fe63313a5..985a04e625b2 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -1,6 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
+ * Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 16fc61e0a9f1..6fb8e63bc011 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2013 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 62c1d9dca6fb..24e2b8841e4a 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,7 +1,5 @@
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 040c62d3fde3..69ca6c91c90b 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,8 +1,6 @@
/* $KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 NTT Multimedia Communications Laboratories, Inc.
* All rights reserved.
*
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index b69b244d3e6c..da69afccfe37 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index bb3dce99b41c..8b95ddddd04b 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index afc5458e5e11..d4d60145f18e 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 6360fd6ed4ee..8f59c6b544cc 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 24d5fbe20c00..ee30d3a0529c 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 03ae82d72f44..e12181b3afa3 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -1,8 +1,6 @@
/* $NetBSD: inet.c,v 1.35.2.1 1999/04/29 14:57:08 perry Exp $ */
/* $KAME: ipsec.c,v 1.25 2001/03/12 09:04:39 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 824e91c32124..713934f7ef53 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 5f67e9157880..084e9ece7543 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Weongyo Jeong. All rights reserved.
* Copyright (c) 2011, by Michael Tuexen. All rights reserved.
*
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 3212ac0334a1..b8cddc8d54d6 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 6e71b460713b..9fab9e4d82f0 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 49b12b5647ad..beb1a35402f0 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 863b69b45eee..07b9b3a857c8 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 608d7256abb3..f03f78403041 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/patch/mkpath.c b/usr.bin/patch/mkpath.c
index 2214d4d42e43..04fd5379f499 100644
--- a/usr.bin/patch/mkpath.c
+++ b/usr.bin/patch/mkpath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 4c60204c10e0..22a093a61ba9 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index b44eb4187757..c39e18f89bfc 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index cc6d290ca4c2..0493aec0d0b7 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index 2c9e50f6b4fa..a4346c788dcc 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 3acef4b8be5f..27882ab91ce3 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 7f602bde97bf..8636cc13c1ef 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1989, 1993
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 838fa8cc2b99..c88f2aaefd8a 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index ed6c9cf9298b..8c8a26e29e2d 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 511aa87a12c8..a04842797c36 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index a4516d53e786..3f50868143a6 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 5f4f2b45e8bf..239b313ce811 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 4bd44912b1a7..2f791be733c6 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 381d935611b1..4d641dcd070f 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 2daa6a8b6ea7..c235ea72e560 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1993 Christopher G. Demetriou
* Copyright (c) 1988, 1990 Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index c5a6cc9e50d1..3fb0da5c3f95 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993 The Regents of the University of California.
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index e94fc6d5f980..01284632cc88 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, 2012 David E. O'Brien
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index ffce09ef5a45..3e790978e1e4 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 154abbfee006..fb336765d639 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 36c945f0f5f9..f2bd71bacfa4 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 4a756ae31695..230720538032 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 6a714b0e6356..f3b513784a6e 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 2d6ed64ec1a7..33eea13bac5f 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 4d8186059723..3573013df9cf 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1990, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index a0bcdc14b504..01c9e261c753 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index ca15db66000b..9a0b0ecbe1aa 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index b8e00a7ec77d..e27a4aade5cc 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002, 2005 Networks Associates Technologies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index 07da7ab57be4..f461f94b9a19 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 488310c3b66a..cb021e0c7759 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index d6ded465c35e..3c74fb7690e3 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index e8c37b999ed9..272eead74c01 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 8e53ffdfbbdd..d159e51c1e79 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 2be26a0b228c..6085a9062236 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 6c48ed68b38c..2a3bbb70289c 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 538be90ffac5..fa275ebbbf2a 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index b6343247a739..8e12a6a0b0b8 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index 72e8bc5b9427..5d2c2103cf45 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index d7a497526488..d6d793a0ab82 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index b074fb304747..74195f606aec 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 353b9bd14358..a91af38317af 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 8b8bd06ec2a4..90ddd2539c17 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 2b5d038776e5..d341f7db39b2 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index d3b7752a447b..799dff95c364 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index ed239578f512..ebd409e217ae 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 4e0f1880a4d9..c9e8e9ae1821 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 461c42915533..25f79d7e9308 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 6069ea52ca97..dfc63d07424e 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index e556fec6c53e..5eaae9828647 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index ed4629626e82..69443257f9c7 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index b440d1b71b2a..79c4fa504351 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 0353a42bd1c9..88c328a3aafb 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 57fcaf83a70e..e5566cb0a703 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 771f16fe7041..0704b289685e 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index c0b51c9dc814..687de1e736bc 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 8b4c190f2cea..0acf1ced7a81 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 7ff3ebd974be..b2af6855ddbd 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 5aafe9523d76..8da8e4acb133 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 1abd522557dc..47556c936c21 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 6c37dfb56c82..e48302ffb21e 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index a4b6e790501c..eb5df61646bb 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index aedd77e7f917..309f1be66cbe 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 214c6f211749..e36b37a5dac7 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index e1beb69b3593..9bd049f0905f 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 649c1b4b1b64..34ff870a1692 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index 541d1f380faf..e3e750b35fce 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 1abc257cb230..4fa0a3358e54 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 340f3ccb1060..302bb97e32ca 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 4176cb6863cb..188ce68db16b 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 2c5ec849b20a..eaf2a6fb35c9 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/tftp.h b/usr.bin/tftp/tftp.h
index 9632f74d80cd..4cdef25e5f2c 100644
--- a/usr.bin/tftp/tftp.h
+++ b/usr.bin/tftp/tftp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 57775ba371bc..678a2afb37bc 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 7e0a2acd8468..99b6fb08afeb 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -1,9 +1,7 @@
/* $OpenBSD: biz22.c,v 1.13 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index dc8f26af13ce..5bc00ae517ed 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -1,9 +1,7 @@
/* $OpenBSD: biz31.c,v 1.10 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index a0a9b5c0efff..b23c28ccabb7 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -1,9 +1,7 @@
/* $OpenBSD: courier.c,v 1.15 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index cef96080b1b0..03374e11678f 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -1,9 +1,7 @@
/* $OpenBSD: df.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 385ba8b61be1..a0b18ba18afc 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -1,9 +1,7 @@
/* $OpenBSD: dn11.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 12e8401bfd6e..fe52274901d7 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -1,9 +1,7 @@
/* $OpenBSD: hayes.c,v 1.13 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 861d8d04e007..a640ff3a2a13 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -1,9 +1,7 @@
/* $OpenBSD: t3000.c,v 1.14 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 3fe6c21b9b14..0de679e3a382 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -1,9 +1,7 @@
/* $OpenBSD: v3451.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 60666383700e..7adc3c67b15c 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -1,9 +1,7 @@
/* $OpenBSD: v831.c,v 1.11 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index df086625e9a6..399b5d8cc54e 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -1,9 +1,7 @@
/* $OpenBSD: ventel.c,v 1.12 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index d24e7f752926..5d2cda624c02 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -1,9 +1,7 @@
/* $OpenBSD: acu.c,v 1.12 2006/03/17 14:43:06 moritz Exp $ */
/* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 49f1b4a4a608..5f6496863677 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: acutab.c,v 1.5 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 6676ae34ac94..50cedc4d87d5 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cmds.c,v 1.26 2006/06/06 23:24:52 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index d8c1231fffa5..3666c12af671 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cmdtab.c,v 1.7 2006/03/17 14:43:06 moritz Exp $ */
/* $NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 6c888d1d6e63..d8d104d482e4 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cu.c,v 1.19 2006/05/25 08:41:52 jmc Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 2f6711d0b14d..0c104f1d5326 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -1,9 +1,7 @@
/* $OpenBSD: hunt.c,v 1.13 2006/03/17 19:39:46 deraadt Exp $ */
/* $NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index aeb324ad7ef8..8123795111a3 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -1,9 +1,7 @@
/* $OpenBSD: log.c,v 1.8 2006/03/16 19:32:46 deraadt Exp $ */
/* $NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index f2d6c313313e..05bb3294a7de 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index a42aed3f7368..66a453ddd65f 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -2,9 +2,7 @@
/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1fe03beb9c2b..d9993ae7d928 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -1,9 +1,7 @@
/* $OpenBSD: remote.c,v 1.16 2006/06/06 23:24:52 deraadt Exp $ */
/* $NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index a65ad616e8a2..066d679c87b2 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -1,9 +1,7 @@
/* $OpenBSD: tip.c,v 1.30 2006/08/18 03:06:18 jason Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 041ba8a073fe..7e7faa6bd905 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -2,9 +2,7 @@
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 8018229c02a9..db6afe4f42c1 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -1,9 +1,7 @@
/* $OpenBSD: tipout.c,v 1.18 2006/05/31 07:03:08 jason Exp $ */
/* $NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index da1601590dae..c82ea784b965 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -1,9 +1,7 @@
/* $OpenBSD: uucplock.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $ */
/* $NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index a4776b80d35d..b6cf5c2a4411 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -1,9 +1,7 @@
/* $OpenBSD: value.c,v 1.14 2006/03/17 22:02:58 moritz Exp $ */
/* $NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a412264295c6..a991bcc5b51a 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -1,9 +1,7 @@
/* $OpenBSD: vars.c,v 1.8 2006/08/18 03:06:18 jason Exp $ */
/* $NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 6db429b812a0..804af7ee6e82 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tput/clear.sh b/usr.bin/tput/clear.sh
index c441d6f49ec8..4b3531cb45af 100644
--- a/usr.bin/tput/clear.sh
+++ b/usr.bin/tput/clear.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1989, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 8cd27e4088c3..0c66d62d8df6 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 81f9e8074e2e..8b68f4417b9e 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index a8b2fd625cd4..333ca5c49831 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index f80fb7f2fce2..d54e74c19319 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 1a93713d7f30..a557f58095e9 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/truss/amd64-freebsd.c b/usr.bin/truss/amd64-freebsd.c
index e83e916d1bc0..7e2ed160a90d 100644
--- a/usr.bin/truss/amd64-freebsd.c
+++ b/usr.bin/truss/amd64-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-freebsd32.c b/usr.bin/truss/amd64-freebsd32.c
index ffb76e46b8ba..66ca417e9495 100644
--- a/usr.bin/truss/amd64-freebsd32.c
+++ b/usr.bin/truss/amd64-freebsd32.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux.c b/usr.bin/truss/amd64-linux.c
index ead388008a64..00eb06ff75f8 100644
--- a/usr.bin/truss/amd64-linux.c
+++ b/usr.bin/truss/amd64-linux.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 69344e9fce8f..70e201adfe91 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/arm-freebsd.c b/usr.bin/truss/arm-freebsd.c
index 683ece5d22c9..753829005946 100644
--- a/usr.bin/truss/arm-freebsd.c
+++ b/usr.bin/truss/arm-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index dd160a7d2cc2..f19a1cbb7c92 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-freebsd.c b/usr.bin/truss/i386-freebsd.c
index b222958df247..8103ca7beead 100644
--- a/usr.bin/truss/i386-freebsd.c
+++ b/usr.bin/truss/i386-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 77185d156b4e..e96db16c7a91 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 9ba7968828fc..052546a032c0 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/mips-freebsd.c b/usr.bin/truss/mips-freebsd.c
index cade9d65d8f6..e3f2a04e97fb 100644
--- a/usr.bin/truss/mips-freebsd.c
+++ b/usr.bin/truss/mips-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1998 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 092188a4b60c..97dd9650189b 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/sparc64-freebsd.c b/usr.bin/truss/sparc64-freebsd.c
index d9a55973e358..d1ae89685de7 100644
--- a/usr.bin/truss/sparc64-freebsd.c
+++ b/usr.bin/truss/sparc64-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1998 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index eebcc320b93a..e5f858f0e76f 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index 597190d10851..f4a6514fbd3b 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index a6753ae19424..715f51471705 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 372e3248b5ae..52298e564d8b 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index adff6a670a67..c48a6e723ccc 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index b3998af0bd9e..106c98f22d35 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index e69d3fa49e17..0196a2db5743 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 231189beb8a5..77751fa30a21 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 961ef3560693..1511b36c0289 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index a0c3be16d175..450722a66984 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 14b1d87905d2..e6df8804f6e2 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index c3bf57303b3c..cf616223275c 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2002 Juli Mallett.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 51d1128445eb..dcbd7fbcc646 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 1c9a314ad534..be0ff08b4627 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index fd82ddd09ff9..2be5078898a0 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 9c5a223ef671..e5af907c0bb8 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 4924e55246a5..812592f43359 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index 0eb6ec1912a8..825a06a405ab 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 5a9d9fa7396f..994cd2be08d3 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 05e3e9e07b34..ec0b4e042eb4 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index 1779bbd37e4d..c01f24dbe39f 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1980, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 80323b3aa4fe..33ce3ad334bb 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 366ee81c57c6..facc3e8ce695 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index e1bc3e3b9281..123f6c4d9780 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 1bf093e7b17c..0e73ba425a0d 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 70005fc88de4..20aca782392a 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 0b8383d26205..1317a4b0cb60 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 9c07dd160d53..b3a63dcbf20a 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index ec04d9446821..a6ca137d9856 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1987, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 66d7dbd6186b..c72e3fa116f5 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index d8541e7d5b9d..4f4062b7c7f1 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 33d1e79c9ca5..2008fd2d80fa 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index fb8ab103470c..25c604321a4b 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 5b90a83ddce9..955711c50f55 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 15fc2efdf3aa..16eba7768d89 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2012, 2013 SRI International
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index 3ee2af871095..63f633efdd82 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 135141896404..4aad8e66e74a 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 996581348896..ef98b4ded12d 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 275cd17efc69..33e66042e898 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 6d76f0770f4a..ba2419a7f90e 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 4e6967dd9ea0..1f82aacf4a7d 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1984, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index cf5397054028..457068a0f7bd 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index 459aa8df604d..9db0192dfe09 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 9478e5631de5..703d053771d9 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 16c328774e66..c7198a027bae 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -36,9 +36,7 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index f6ce2a999fe4..a13d1ebb3529 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 00e13e711f35..c87f3bbe9393 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 8387f480860c..fd7f1b3ac67d 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index d898105c93e6..582ca9e7964b 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 3e07f87eb9e8..8aca410c2dda 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 Peter Wemm
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh
index cb8f0e554145..14021d9d7199 100755
--- a/usr.sbin/crashinfo/crashinfo.sh
+++ b/usr.sbin/crashinfo/crashinfo.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 2008 Yahoo!, Inc.
# All rights reserved.
#
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index 6d4750585df6..dba568aac7de 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 417f1757651d..6a6c194f6ab9 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index 2e5978932a0d..53bfbfefeb96 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 48dfa4b94afc..36efea16030e 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2002
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index 2baf1c43c803..28c63f1192f3 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c
index 509d941021c8..ae9a52b9db57 100644
--- a/usr.sbin/fwcontrol/fwmpegts.c
+++ b/usr.sbin/fwcontrol/fwmpegts.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2005
* Petr Holub, Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 81befd3d6af1..bbcacc349c35 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -1,8 +1,6 @@
/* $KAME: ifmcstat.c,v 1.48 2006/11/15 05:13:59 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
diff --git a/usr.sbin/ifmcstat/printb.c b/usr.sbin/ifmcstat/printb.c
index a02f552dfb12..58249f60c81d 100644
--- a/usr.sbin/ifmcstat/printb.c
+++ b/usr.sbin/ifmcstat/printb.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 497ad526f7e3..569154a4cc09 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index 325692a2a1b5..06600f8292a7 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index 4993d4a225cf..d4fd81d12faa 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index e0ce53961c12..69882f15f5a6 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997, 1998, 2000, 2001 Kenneth D. Merry
* All rights reserved.
*
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c
index 06d527dac2ce..79388ff28532 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.c
+++ b/usr.sbin/ip6addrctl/ip6addrctl.c
@@ -1,8 +1,6 @@
/* $KAME: ip6addrctl.c,v 1.3 2003/12/16 08:14:28 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index bfec92f61a47..60c7507e647a 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index 7a3955bbf5ec..99f844b2ca47 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index ba9c37ea6474..9268b605a92d 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index b7a2c425872d..fa939721c3f3 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index b20855515adb..729e0c9d9887 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 7bacf1afe865..d987cfa4a15a 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index e18cbef231db..a6ae6073247e 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index e7ddd8fa2aff..79cc52ac879b 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 3954b2286dc6..c495bbbe93fb 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/pathnames.h b/usr.sbin/lpr/common_source/pathnames.h
index 79154b519671..0be302a10459 100644
--- a/usr.sbin/lpr/common_source/pathnames.h
+++ b/usr.sbin/lpr/common_source/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 2cf4de4a395a..707b7b824d9a 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index b22ef9115a67..700e3c2a1d57 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 7a0e806915a0..8e4f60a6e9db 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 2239b62065ee..f8ffe523a937 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 3068e2fe37a8..d85e8eab58b6 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index b7945b553b2d..1e8e4dacd214 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 856357c02f81..45844a573387 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index afd90d348791..2be4c84d619a 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 557b184d70a6..ee529036ad44 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 173dd058033f..90eb0be2e21d 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 8ba9d3a63a49..925d00fcc3de 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 9e1fa2757269..cb9f35512e84 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index f105240dc115..52f12295edb9 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index f4433cc90cfd..a2d61c3372d2 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 6ad26dd6e85d..c7ee4e949939 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 49b3b9bf9d35..f39c81bc117c 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 72ba2b3929f1..9a4382f12c5f 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 2acc82b0b5f2..35d88145adcc 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 762f06e36f8c..07c90d79343c 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index b93d6444ca21..5fdd54f14efc 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index fb46f48ed816..d50bd7b24cb1 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,8 +1,6 @@
/* $NetBSD: ffs.c,v 1.45 2011/10/09 22:49:26 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index c030d50f7b78..5147d04ba1aa 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,9 +1,7 @@
/* $NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 89bbec0dd16d..0ce4f756a3bc 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -1,9 +1,7 @@
/* $NetBSD: ffs_balloc.c,v 1.13 2004/06/20 22:20:18 jmc Exp $ */
/* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_extern.h b/usr.sbin/makefs/ffs/ffs_extern.h
index b4d4bbaef6e9..7755823c1703 100644
--- a/usr.sbin/makefs/ffs/ffs_extern.h
+++ b/usr.sbin/makefs/ffs/ffs_extern.h
@@ -2,8 +2,6 @@
/* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 0d5ac2a92598..b55174db0ba3 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -1,8 +1,6 @@
/* $NetBSD: ffs_subr.c,v 1.32 2003/12/30 12:33:24 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index e7b037e8f1e9..3cd854646fc3 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,8 +1,6 @@
/* $NetBSD: mkfs.c,v 1.22 2011/10/09 22:30:13 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index ac3869a7cb8d..b65b41636150 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -1,9 +1,7 @@
/* $NetBSD: ufs_bmap.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
/* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h
index d5023384774a..8286f867af56 100644
--- a/usr.sbin/makefs/ffs/ufs_inode.h
+++ b/usr.sbin/makefs/ffs/ufs_inode.h
@@ -1,9 +1,7 @@
/* $NetBSD: ufs_inode.h,v 1.3 2003/08/07 11:25:34 agc Exp $ */
/* From: NetBSD: inode.h,v 1.27 2001/12/18 10:57:23 fvdl Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 85ed845cd7e6..23e20870ab95 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-4-Clause
-#
# Copyright (c) 1994 Geoffrey M. Rehmet, Rhodes University
# All rights reserved.
#
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index dcdd15a9b0d0..a3c8342e5f50 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,8 +1,6 @@
/* $KAME: mld6.c,v 1.15 2003/04/02 11:29:54 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index d4790a3e07c3..1e35cc55a9c7 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 6deae6d9db8d..2b7397799ee4 100644
--- a/usr.sbin/mountd/pathnames.h
+++ b/usr.sbin/mountd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c
index 56b923bfec0e..264cb476f396 100644
--- a/usr.sbin/mptutil/mpt_cam.c
+++ b/usr.sbin/mptutil/mpt_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c
index 79422c12dd89..8104fc9b4653 100644
--- a/usr.sbin/mptutil/mpt_cmd.c
+++ b/usr.sbin/mptutil/mpt_cmd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c
index 6dc5d196840f..17b9945a6624 100644
--- a/usr.sbin/mptutil/mpt_config.c
+++ b/usr.sbin/mptutil/mpt_config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c
index c71896d33b79..049ce7178c94 100644
--- a/usr.sbin/mptutil/mpt_drive.c
+++ b/usr.sbin/mptutil/mpt_drive.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c
index 9fb41d50b4dc..9ccdebd424fb 100644
--- a/usr.sbin/mptutil/mpt_evt.c
+++ b/usr.sbin/mptutil/mpt_evt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c
index 313f985f4926..153d73e0097f 100644
--- a/usr.sbin/mptutil/mpt_show.c
+++ b/usr.sbin/mptutil/mpt_show.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c
index 0e437ed03de6..2b273c73cf0e 100644
--- a/usr.sbin/mptutil/mpt_volume.c
+++ b/usr.sbin/mptutil/mpt_volume.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c
index 81487664f1ce..63e8efadd4b9 100644
--- a/usr.sbin/mptutil/mptutil.c
+++ b/usr.sbin/mptutil/mptutil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mptutil.h b/usr.sbin/mptutil/mptutil.h
index 191c8d2dfda2..395123593343 100644
--- a/usr.sbin/mptutil/mptutil.h
+++ b/usr.sbin/mptutil/mptutil.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/nandsim/nandsim_rcfile.c b/usr.sbin/nandsim/nandsim_rcfile.c
index 8e9cca17f37b..0f99e7b001e2 100644
--- a/usr.sbin/nandsim/nandsim_rcfile.c
+++ b/usr.sbin/nandsim/nandsim_rcfile.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/nandsim/nandsim_rcfile.h b/usr.sbin/nandsim/nandsim_rcfile.h
index d92ae870f0fc..f5c3ce9ac8c0 100644
--- a/usr.sbin/nandsim/nandsim_rcfile.h
+++ b/usr.sbin/nandsim/nandsim_rcfile.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 740aba5e87d1..2a8876d2eb5d 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -1,7 +1,5 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index 56359263074e..3e2a1278d530 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -1,7 +1,5 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index eb1015083dbb..4b30da0a3024 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 09f7faeb3068..7636c4c75059 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index c5a0dbd4fc46..1674ea105c7a 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-4-Clause
-#
# Copyright (c) 2005
# Bill Paul <wpaul@windriver.com>. All rights reserved.
#
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 8aaa23835cba..46a0e8384415 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index cf609a1a24ff..95ee8657bcdd 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 96e01ba271de..c9b8f77d7233 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/pciconf/cap.c b/usr.sbin/pciconf/cap.c
index 03490e42324f..130b58b91df4 100644
--- a/usr.sbin/pciconf/cap.c
+++ b/usr.sbin/pciconf/cap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/pciconf/pciconf.h b/usr.sbin/pciconf/pciconf.h
index 4b31372cd963..734007eba920 100644
--- a/usr.sbin/pciconf/pciconf.h
+++ b/usr.sbin/pciconf/pciconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index adfdcd6da796..48928c77fc2a 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 9694d3ace21d..9c415cb25fa8 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -1,8 +1,6 @@
-/*-
+/*
* Definitions for tcp compression routines.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 418679d8d69c..b5ceb2e7c3d3 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technologies, Inc.
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 648bf5f79be2..0b4df5e120a9 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 326897b24619..740df39c0a03 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 0c48292f2d30..4ffc2e68dd95 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index b3d745965965..a35c75097415 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,8 +1,6 @@
/* $KAME: rip6query.c,v 1.11 2001/05/08 04:36:37 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index d11aa3747d47..57c8439a70f5 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/route6d/misc/cksum.c b/usr.sbin/route6d/misc/cksum.c
index 200eecceef7d..bff7e2d5f7f4 100644
--- a/usr.sbin/route6d/misc/cksum.c
+++ b/usr.sbin/route6d/misc/cksum.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 5b049b9e3a24..41f8fe315d87 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index d556799c7177..49a7d5a93760 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: route6d.h,v 1.8 2003/05/28 09:11:13 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 160e1844e5a8..3b040e5f14a0 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,8 +1,6 @@
/* $NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index a208fdbf3352..6ac4962c078d 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,9 +1,7 @@
/* $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 23cb19fd79c6..0a8e2e60b616 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,9 +1,7 @@
/* $NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 594d01f7e1ec..59a312df3a66 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,8 +1,6 @@
/* $NetBSD: lockd_lock.c,v 1.5 2000/11/21 03:47:41 enami Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2001 Andrew P. Lentvorski, Jr.
* Copyright (c) 2000 Manuel Bouyer.
*
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index c2207c73aebf..beef0e4db904 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 517c3f62414e..f6067e7acb70 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index b789f8149106..1a79ac2b7ed4 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h
index ede159039ada..a82d760f96f2 100644
--- a/usr.sbin/rpc.statd/statd.h
+++ b/usr.sbin/rpc.statd/statd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index 563d47c2205f..db15be228a6d 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 349f1cd59e17..38719c4a5c1a 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 8845d0d10f9b..ae5ca5964053 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 7ef145867391..0552aab9d3ea 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 84bacb905ac3..3481a6b2b3c4 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 96bf4460a251..92d8374a7162 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index 67fa05eceee5..c4e163a50919 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 165b144f2c45..5aba934a6ec4 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 62420a48c0a9..8fa3e2205b43 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index ca8a2a3c4fe4..5f60712e9fef 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index becd20122440..b08979d61ebf 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index 991a28d680fb..d20f18f88f8c 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index 65bd1645c5f8..12aab64a058a 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -3,8 +3,6 @@
* $FreeBSD$
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index 9ae41965b97b..7aa5393ac424 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index 9bb48beed3e2..852abaff6c2a 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -4,8 +4,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 7c72041b4a6c..d5beb13f7461 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index bac11a9b205a..9d5a608b9849 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index f78b2eecc34b..309bc0ba77da 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 74ad91231e3d..473b6f7e9579 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 31ca4b2a86b6..47656e86d2b1 100644
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -1,8 +1,6 @@
/* $KAME: lexer.l,v 1.7 2000/11/08 02:40:53 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index 96f37ae11eb4..6436df709b2e 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -1,8 +1,6 @@
/* $KAME: parser.y,v 1.8 2000/11/08 03:03:34 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index dd08396b6421..68f68473a909 100644
--- a/usr.sbin/rrenumd/rrenumd.c
+++ b/usr.sbin/rrenumd/rrenumd.c
@@ -1,8 +1,6 @@
/* $KAME: rrenumd.c,v 1.20 2000/11/08 02:40:53 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index 2e9390d023fd..df0280b2591e 100644
--- a/usr.sbin/rrenumd/rrenumd.h
+++ b/usr.sbin/rrenumd/rrenumd.h
@@ -1,8 +1,6 @@
/* $KAME: rrenumd.h,v 1.2 2000/07/03 02:54:09 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 8416359f5906..542e06649f92 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 1c4f83820916..db16e333febf 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: config.c,v 1.84 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 24e6f493bdbc..219390bb1512 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: config.h,v 1.8 2003/06/17 08:26:22 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 20a509946d13..72ea36a8f64f 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 42b4be795859..6efdd562fb44 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 7e3bac286cc3..eede4b6d00aa 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rrenum.c,v 1.12 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 93cd96b6d189..2b20d595dda7 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index d46185876444..9976c784c99e 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rtadvd.c,v 1.82 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 005a42c2038a..e7ed87fece02 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rtadvd.h,v 1.26 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 94c5dcd91f70..452add49c4c9 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 74ac7d41d8fe..4498aaff073a 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/timer_subr.c b/usr.sbin/rtadvd/timer_subr.c
index 7a7a23cd98f7..0ddf0a433f96 100644
--- a/usr.sbin/rtadvd/timer_subr.c
+++ b/usr.sbin/rtadvd/timer_subr.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/timer_subr.h b/usr.sbin/rtadvd/timer_subr.h
index 36e8b3bdc192..32e1bb163afb 100644
--- a/usr.sbin/rtadvd/timer_subr.h
+++ b/usr.sbin/rtadvd/timer_subr.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 282b71d049d5..a0bf2c2744c8 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -1,8 +1,6 @@
/* $KAME: dump.c,v 1.13 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index e1e9a00b5998..0d500622b7a6 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,8 +1,6 @@
/* $KAME: if.c,v 1.27 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 2a5ddfcad06e..3aa5303a6603 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -1,8 +1,6 @@
/* $KAME: probe.c,v 1.17 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 6e57eaf9bc8a..702ffe13f695 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -1,9 +1,7 @@
/* $KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index 04a92de35620..cff283160e89 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -1,8 +1,6 @@
/* $KAME: rtsol.c,v 1.27 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato
* All rights reserved.
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index a8e5b23f0917..9cfe5c304349 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,8 +1,6 @@
/* $KAME: rtsold.c,v 1.67 2003/05/17 18:16:15 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 7af0441d2d64..f19fb3ccd93b 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,8 +1,6 @@
/* $KAME: rtsold.h,v 1.19 2003/04/16 09:48:15 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 4e6fc43d7add..9a9dad811ad7 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993 The Regents of the University of California.
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/setfib/setfib.c b/usr.sbin/setfib/setfib.c
index 0f5305b2a43a..f4b6c3dc2b4c 100644
--- a/usr.sbin/setfib/setfib.c
+++ b/usr.sbin/setfib/setfib.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2008 Cisco Systems, All rights reserved
diff --git a/usr.sbin/syslogd/pathnames.h b/usr.sbin/syslogd/pathnames.h
index b1ed9070f02c..00631e0e4bf2 100644
--- a/usr.sbin/syslogd/pathnames.h
+++ b/usr.sbin/syslogd/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index cf90d1da8b1b..ac7a1679b935 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 6543c6034bd8..dca3a68b8a26 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 1e45e4d47eaf..abacbd6805fc 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 0f013a4d4771..c92ae70a7515 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 227e03bb4e11..7fa0a5e80d8d 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 1cb412f67d44..8a5b464595c2 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/extern.h b/usr.sbin/timed/timed/extern.h
index 6994cb104bc6..c4cb642712e8 100644
--- a/usr.sbin/timed/timed/extern.h
+++ b/usr.sbin/timed/timed/extern.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h
index 2a56fec12b37..0492d79b2d73 100644
--- a/usr.sbin/timed/timed/globals.h
+++ b/usr.sbin/timed/timed/globals.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 9879b2603d74..24b1de0e829b 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index a382124514df..8fe43b5e3911 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index 3f8dad46f34b..bf2a35389d5f 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/pathnames.h b/usr.sbin/timed/timed/pathnames.h
index 49e29398b45e..a2396e129976 100644
--- a/usr.sbin/timed/timed/pathnames.h
+++ b/usr.sbin/timed/timed/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 2e0c306a9ada..e63791230880 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index fcac7b368e1a..0ec10da22826 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 8bafc7ae2ae6..a8efd6dbe66c 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 9cc7e8c951a3..1eb6a75f75d4 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index d5a697ca3b6c..62c01da03233 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/extern.h b/usr.sbin/timed/timedc/extern.h
index 705e92f90cfa..bbbd83ec16ba 100644
--- a/usr.sbin/timed/timedc/extern.h
+++ b/usr.sbin/timed/timedc/extern.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 3f74468e9015..4124661e6268 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/timedc.h b/usr.sbin/timed/timedc/timedc.h
index 04f7e0b15cc2..bfeef2851060 100644
--- a/usr.sbin/timed/timedc/timedc.h
+++ b/usr.sbin/timed/timedc/timedc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index ab2a19eb83ee..62dfc6a05f05 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,8 +1,6 @@
/* $KAME: traceroute6.c,v 1.68 2004/01/25 11:16:12 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index a18bba1965ee..d85d41d42275 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index ba0d47b6d47d..4a0a70080dca 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index cfd971af8ea1..b61fd0a297ab 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 3f852b722080..8e7da035af95 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
index c96553afc8a1..e0598e70d4fd 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index c8c545306e18..290e40500de6 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index d65c5eb695e2..2efc7a2d0617 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index e5e852280095..5a712e5a41b0 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index bee8dd4231dd..dddde7405bba 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 291daba0da09..ecd90522f7ad 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index b33b80c2e82c..6534967cfa98 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index 9bc287280c76..a5b12902d0d1 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 4a1c6b3528dc..2e574b6c3bfe 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index d0fff1eb1e8d..8c538ca8ca46 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 828957788b2b..304fd50efe34 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index c865c01d9b7e..33d058ef9b87 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*