Move most of the contents of opt_compat.h to opt_global.h.

opt_compat.h is mentioned in nearly 180 files. In-progress network driver compabibility improvements may add over 100 more so this is closer to "just about everywhere" than "only some files" per the guidance in sys/conf/options. Keep COMPAT_LINUX32 in opt_compat.h as it is confined to a subset of sys/compat/linux/*.c. A fake _COMPAT_LINUX option ensure opt_compat.h is created on all architectures. Move COMPAT_LINUXKPI to opt_dontuse.h as it is only used to control the set of compiled files. Reviewed by: kib, cem, jhb, jtl Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D14941
2018-04-06 17:35:35 +00:00 · 2018-04-06 17:35:35 +00:00 · 6469bdcdb6
commit 6469bdcdb6
parent d9b41671bf
185 changed files with 44 additions and 307 deletions
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@ -39,7 +39,6 @@
 */

 #include "opt_atpic.h"
-#include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"

 #include "assym.inc"
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_kstack_pages.h"

--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@ -44,7 +44,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_atpic.h"
-#include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
--- a/sys/amd64/amd64/ptrace_machdep.c
+++ b/sys/amd64/amd64/ptrace_machdep.c
@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");

 #include "opt_isa.h"
 #include "opt_cpu.h"
-#include "opt_compat.h"

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
--- a/sys/amd64/ia32/ia32_reg.c
+++ b/sys/amd64/ia32/ia32_reg.c
@ -31,8 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/fcntl.h>
--- a/sys/amd64/ia32/ia32_signal.c
+++ b/sys/amd64/ia32/ia32_signal.c
@ -36,8 +36,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/fcntl.h>
--- a/sys/amd64/ia32/ia32_sigtramp.S
+++ b/sys/amd64/ia32/ia32_sigtramp.S
@ -26,8 +26,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <machine/asmacros.h>
 #include <sys/syscall.h>

--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 */

 #include "opt_clock.h"
-#include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_isa.h"

--- a/sys/amd64/linux/linux_dummy.c
+++ b/sys/amd64/linux/linux_dummy.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #define	__ELF_WORD_SIZE	64

 #include <sys/param.h>
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/clock.h>
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@ -5,7 +5,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@ -34,7 +34,6 @@

 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-#include "opt_compat.h"

 #ifndef COMPAT_FREEBSD32
 #error "Unable to compile Linux-emulator due to missing COMPAT_FREEBSD32 option!"
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@ -26,7 +26,6 @@
 ;		function prototype in sys/sysproto.h.  Does add a
 ;		definition to syscall.h besides adding a sysent.

-#include "opt_compat.h"
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@ -44,7 +44,6 @@
 * Updated	: 18/04/01 updated for new wscons
 */

-#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_kstack_pages.h"
 #include "opt_platform.h"
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@ -42,8 +42,6 @@
 *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
 */

-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@ -26,7 +26,6 @@
 */

 #include "opt_acpi.h"
-#include "opt_compat.h"
 #include "opt_platform.h"
 #include "opt_ddb.h"

--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>

 #include <sys/conf.h>
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/compat/freebsd32/freebsd32_ioctl.c
+++ b/sys/compat/freebsd32/freebsd32_ioctl.c
@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/cdio.h>
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ktrace.h"
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@ -5,8 +5,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
--- a/sys/compat/ia32/ia32_genassym.c
+++ b/sys/compat/ia32/ia32_genassym.c
@ -1,8 +1,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/assym.h>
 #include <sys/systm.h>
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #define __ELF_WORD_SIZE 32

 #include <sys/param.h>
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/fcntl.h>
--- a/sys/conf/options
+++ b/sys/conf/options
@ -80,18 +80,18 @@ BOOTVERBOSE	opt_global.h
 CALLOUT_PROFILING
 CAPABILITIES	opt_capsicum.h
 CAPABILITY_MODE	opt_capsicum.h
-COMPAT_43	opt_compat.h
-COMPAT_43TTY	opt_compat.h
-COMPAT_FREEBSD4	opt_compat.h
-COMPAT_FREEBSD5	opt_compat.h
-COMPAT_FREEBSD6	opt_compat.h
-COMPAT_FREEBSD7	opt_compat.h
-COMPAT_FREEBSD9	opt_compat.h
-COMPAT_FREEBSD10	opt_compat.h
-COMPAT_FREEBSD11	opt_compat.h
+COMPAT_43	opt_global.h
+COMPAT_43TTY	opt_global.h
+COMPAT_FREEBSD4	opt_global.h
+COMPAT_FREEBSD5	opt_global.h
+COMPAT_FREEBSD6	opt_global.h
+COMPAT_FREEBSD7	opt_global.h
+COMPAT_FREEBSD9	opt_global.h
+COMPAT_FREEBSD10	opt_global.h
+COMPAT_FREEBSD11	opt_global.h
 COMPAT_CLOUDABI32	opt_dontuse.h
 COMPAT_CLOUDABI64	opt_dontuse.h
-COMPAT_LINUXKPI	opt_compat.h
+COMPAT_LINUXKPI	opt_dontuse.h
 COMPILING_LINT	opt_global.h
 CY_PCI_FASTINTR
 DEADLKRES	opt_watchdog.h
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@ -14,7 +14,7 @@ PV_STATS		opt_pmap.h
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems
 # (see src/sys/conf/options), except for broken debugging options.
-COMPAT_FREEBSD32	opt_compat.h
+COMPAT_FREEBSD32	opt_global.h
 #IBCS2			opt_dontuse.h
 #COMPAT_LINUX		opt_dontuse.h
 COMPAT_LINUX32		opt_compat.h
--- a/sys/conf/options.arm64
+++ b/sys/conf/options.arm64
@ -8,7 +8,7 @@ THUNDERX_PASS_1_1_ERRATA	opt_global.h
 VFP				opt_global.h

 # Binary compatibility
-COMPAT_FREEBSD32		opt_compat.h
+COMPAT_FREEBSD32		opt_global.h

 # EFI Runtime services support
 EFIRT				opt_efirt.h
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@ -58,7 +58,7 @@ MIPS64EL
 MIPS64ELHF
 MIPSN32

-COMPAT_FREEBSD32	opt_compat.h
+COMPAT_FREEBSD32	opt_global.h

 YAMON		opt_global.h
 CFE		opt_global.h
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@ -13,7 +13,7 @@ POWERPCSPE

 FPU_EMU

-COMPAT_FREEBSD32	opt_compat.h
+COMPAT_FREEBSD32	opt_global.h

 GFB_DEBUG		opt_gfb.h
 GFB_NO_FONT_LOADING	opt_gfb.h
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #define AAC_DRIVERNAME			"aac"

 #include "opt_aac.h"
-#include "opt_compat.h"

 /* #include <stddef.h> */
 #include <sys/param.h>
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #define AAC_DRIVERNAME			"aacraid"

 #include "opt_aacraid.h"
-#include "opt_compat.h"

 /* #include <stddef.h> */
 #include <sys/param.h>
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@ -29,7 +29,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_acpi.h"
-#include "opt_compat.h"

 #if defined(__amd64__)
 #define	DEV_APIC
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@ -30,7 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_kbd.h"
 #include "opt_atkbd.h"
 #include "opt_evdev.h"
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 /*
 * TODO:
 * Atomic COR change.
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@ -121,7 +121,6 @@ struct drm_device;
 #include <dev/drm2/drm_hashtab.h>
 #include <dev/drm2/drm_mm.h>

-#include "opt_compat.h"
 #include "opt_drm.h"
 #include "opt_syscons.h"
 #ifdef DRM_DEBUG
--- a/sys/dev/drm2/drm_ioc32.c
+++ b/sys/dev/drm2/drm_ioc32.c
@ -25,8 +25,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #ifdef COMPAT_FREEBSD32

 #include <dev/drm2/drmP.h>
--- a/sys/dev/drm2/i915/i915_ioc32.c
+++ b/sys/dev/drm2/i915/i915_ioc32.c
@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #ifdef COMPAT_FREEBSD32

 /** @file i915_ioc32.c
--- a/sys/dev/drm2/radeon/radeon_ioc32.c
+++ b/sys/dev/drm2/radeon/radeon_ioc32.c
@ -31,8 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #ifdef COMPAT_FREEBSD32

 #include <dev/drm2/drmP.h>
--- a/sys/dev/filemon/filemon.c
+++ b/sys/dev/filemon/filemon.c
@ -31,8 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/systm.h>
--- a/sys/dev/filemon/filemon_wrapper.c
+++ b/sys/dev/filemon/filemon_wrapper.c
@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysent.h>
 #include <sys/vnode.h>

-#include "opt_compat.h"
-
 static eventhandler_tag filemon_exec_tag;
 static eventhandler_tag filemon_exit_tag;
 static eventhandler_tag filemon_fork_tag;
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@ -33,7 +33,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
 #include "opt_evdev.h"
 #include "opt_kbd.h"
 #include "opt_kbdmux.h"
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@ -60,7 +60,6 @@
 * From: src/sys/dev/vn/vn.c,v 1.122 2000/12/16 16:06:03
 */

-#include "opt_compat.h"
 #include "opt_rootdevname.h"
 #include "opt_geom.h"
 #include "opt_md.h"
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@ -55,7 +55,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_mfi.h"

 #include <sys/param.h>
--- a/sys/dev/mpr/mpr_user.c
+++ b/sys/dev/mpr/mpr_user.c
@ -63,8 +63,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 /* TODO Move headers to mprvar */
 #include <sys/types.h>
 #include <sys/param.h>
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@ -65,8 +65,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 /* TODO Move headers to mpsvar */
 #include <sys/types.h>
 #include <sys/param.h>
--- a/sys/dev/mrsas/mrsas_linux.c
+++ b/sys/dev/mrsas/mrsas_linux.c
@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <compat/linux/linux_util.h>

 #include <dev/mrsas/mrsas.h>
+#undef COMPAT_FREEBSD32
 #include <dev/mrsas/mrsas_ioctl.h>

 /* There are multiple ioctl number ranges that need to be handled */
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_bus.h"	/* XXX trim includes */
-#include "opt_compat.h"

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
 * rp.c - for RocketPort FreeBSD
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_gdb.h"
 #include "opt_kdb.h"
 #include "opt_sio.h"
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_syscons.h"

 #include <sys/param.h>
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_syscons.h"
 #include "opt_splash.h"
 #include "opt_ddb.h"
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.c
@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_kbd.h"
 #include "opt_sunkbd.h"

--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
 */

-#include "opt_compat.h"
 #include "opt_kbd.h"
 #include "opt_ukbd.h"
 #include "opt_evdev.h"
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@ -33,7 +33,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
 #include "opt_kbd.h"

 #include <sys/param.h>
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/consio.h>
 #include <sys/eventhandler.h>
--- a/sys/fs/cuse/cuse.c
+++ b/sys/fs/cuse/cuse.c
@ -24,8 +24,6 @@
 * SUCH DAMAGE.
 */

-#include "opt_compat.h"
-
 #include <sys/stdint.h>
 #include <sys/stddef.h>
 #include <sys/param.h>
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@ -30,8 +30,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@ -45,8 +45,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@ -39,8 +39,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
--- a/sys/fs/procfs/procfs_ioctl.c
+++ b/sys/fs/procfs/procfs_ioctl.c
@ -30,8 +30,6 @@
 *      $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@ -37,8 +37,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@ -39,8 +39,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@ -38,8 +38,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_apic.h"
-#include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_kstack_pages.h"

--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@ -40,7 +40,6 @@
 */

 #include "opt_bootp.h"
-#include "opt_compat.h"
 #include "opt_nfsroot.h"
 #include "opt_pmap.h"

--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");

 #include "opt_apic.h"
 #include "opt_atpic.h"
-#include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
--- a/sys/i386/i386/sigtramp.s
+++ b/sys/i386/i386/sigtramp.s
@ -39,8 +39,6 @@
 *			and many others.
 */

-#include "opt_compat.h"
-
 #include <sys/syscall.h>
 #include <machine/asmacros.h>
 #include <machine/psl.h>
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@ -35,7 +35,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_capsicum.h"
-#include "opt_compat.h"

 #include <sys/param.h>
 #include <sys/capsicum.h>
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@ -5,8 +5,6 @@
 * $FreeBSD$
 */

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@ -40,7 +40,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_capsicum.h"
-#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"

--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ktrace.h"
 #include "opt_kqueue.h"

--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_capsicum.h"
-#include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 #include "opt_vm.h"
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ktrace.h"

 #include <sys/param.h>
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_posix.h"
 #include "opt_config.h"

--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@ -26,8 +26,6 @@
 * SUCH DAMAGE.
 */

-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@ -46,7 +46,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"

--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@ -39,8 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
--- a/sys/kern/kern_sendfile.c
+++ b/sys/kern/kern_sendfile.c
@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/capsicum.h>
--- a/sys/kern/kern_sharedpage.c
+++ b/sys/kern/kern_sharedpage.c
@ -33,7 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_vm.h"

 #include <sys/param.h>
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ktrace.h"

 #include <sys/param.h>
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@ -41,7 +41,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_capsicum.h"
-#include "opt_compat.h"
 #include "opt_ktrace.h"

 #include <sys/param.h>
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@ -21,7 +21,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_ntp.h"
 #include "opt_ffclock.h"

--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_posix.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
 #include "opt_umtx_profiling.h"

 #include <sys/param.h>
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@ -656,9 +656,6 @@ sed -e '
 	END {
 		printf "\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n" > sysinc

-		if (ncompat != 0 || ncompat4 != 0 || ncompat6 != 0 || ncompat7 != 0 || ncompat10 != 0 || ncompat11 != 0)
-			printf "#include \"opt_compat.h\"\n\n" > syssw
-
 		if (ncompat != 0) {
 			printf "\n#ifdef %s\n", compat > sysinc
 			printf "#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)\n" > sysinc
--- a/sys/kern/subr_dummy_vdso_tc.c
+++ b/sys/kern/subr_dummy_vdso_tc.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/vdso.h>

--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@ -40,7 +40,6 @@
 __FBSDID("$FreeBSD$");

 #include "opt_capsicum.h"
-#include "opt_compat.h"
 #include "opt_ktrace.h"

 #include <sys/param.h>
--- a/sys/kern/sys_getrandom.c
+++ b/sys/kern/sys_getrandom.c
@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/limits.h>
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@ -91,8 +91,6 @@
 * in the structure may have changed.
 */

-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
--- a/Show More
+++ b/Show More