Date: Fri, 6 Apr 2018 17:35:36 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332122 - in head/sys: amd64/amd64 amd64/ia32 amd64/linux amd64/linux32 arm/arm arm64/arm64 cam/scsi compat/freebsd32 compat/ia32 compat/linux conf dev/aac dev/aacraid dev/acpica dev/at... Message-ID: <201804061735.w36HZaOD071891@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Apr 6 17:35:35 2018 New Revision: 332122 URL: https://svnweb.freebsd.org/changeset/base/332122 Log: 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 Modified: head/sys/amd64/amd64/db_trace.c head/sys/amd64/amd64/exception.S head/sys/amd64/amd64/genassym.c head/sys/amd64/amd64/machdep.c head/sys/amd64/amd64/ptrace_machdep.c head/sys/amd64/amd64/vm_machdep.c head/sys/amd64/ia32/ia32_misc.c head/sys/amd64/ia32/ia32_reg.c head/sys/amd64/ia32/ia32_signal.c head/sys/amd64/ia32/ia32_sigtramp.S head/sys/amd64/ia32/ia32_syscall.c head/sys/amd64/linux/linux_dummy.c head/sys/amd64/linux/linux_sysvec.c head/sys/amd64/linux32/linux32_dummy.c head/sys/amd64/linux32/linux32_machdep.c head/sys/amd64/linux32/linux32_sysent.c head/sys/amd64/linux32/linux32_sysvec.c head/sys/amd64/linux32/syscalls.master head/sys/arm/arm/machdep.c head/sys/arm/arm/vm_machdep.c head/sys/arm64/arm64/machdep.c head/sys/cam/scsi/scsi_enc.c head/sys/cam/scsi/scsi_pass.c head/sys/compat/freebsd32/freebsd32_ioctl.c head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/ia32/ia32_genassym.c head/sys/compat/ia32/ia32_sysvec.c head/sys/compat/linux/linux_util.c head/sys/conf/options head/sys/conf/options.amd64 head/sys/conf/options.arm64 head/sys/conf/options.mips head/sys/conf/options.powerpc head/sys/dev/aac/aac.c head/sys/dev/aacraid/aacraid.c head/sys/dev/acpica/acpi_hpet.c head/sys/dev/atkbdc/atkbd.c head/sys/dev/cy/cy.c head/sys/dev/drm2/drmP.h head/sys/dev/drm2/drm_ioc32.c head/sys/dev/drm2/i915/i915_ioc32.c head/sys/dev/drm2/radeon/radeon_ioc32.c head/sys/dev/filemon/filemon.c head/sys/dev/filemon/filemon_wrapper.c head/sys/dev/kbdmux/kbdmux.c head/sys/dev/md/md.c head/sys/dev/mfi/mfi.c head/sys/dev/mpr/mpr_user.c head/sys/dev/mps/mps_user.c head/sys/dev/mrsas/mrsas_linux.c head/sys/dev/null/null.c head/sys/dev/pci/pci_user.c head/sys/dev/rp/rp.c head/sys/dev/sio/sio.c head/sys/dev/syscons/scvidctl.c head/sys/dev/syscons/syscons.c head/sys/dev/uart/uart_kbd_sun.c head/sys/dev/usb/input/ukbd.c head/sys/dev/vkbd/vkbd.c head/sys/dev/vt/vt_core.c head/sys/fs/cuse/cuse.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/procfs/procfs_dbregs.c head/sys/fs/procfs/procfs_fpregs.c head/sys/fs/procfs/procfs_ioctl.c head/sys/fs/procfs/procfs_map.c head/sys/fs/procfs/procfs_regs.c head/sys/geom/geom_dev.c head/sys/i386/i386/genassym.c head/sys/i386/i386/locore.s head/sys/i386/i386/machdep.c head/sys/i386/i386/sigtramp.s head/sys/i386/linux/linux_dummy.c head/sys/kern/imgact_elf.c head/sys/kern/init_sysent.c head/sys/kern/kern_descrip.c head/sys/kern/kern_event.c head/sys/kern/kern_exec.c head/sys/kern/kern_exit.c head/sys/kern/kern_jail.c head/sys/kern/kern_mib.c head/sys/kern/kern_module.c head/sys/kern/kern_proc.c head/sys/kern/kern_prot.c head/sys/kern/kern_resource.c head/sys/kern/kern_sendfile.c head/sys/kern/kern_sharedpage.c head/sys/kern/kern_sig.c head/sys/kern/kern_sysctl.c head/sys/kern/kern_tc.c head/sys/kern/kern_thr.c head/sys/kern/kern_umtx.c head/sys/kern/kern_xxx.c head/sys/kern/makesyscalls.sh head/sys/kern/subr_dummy_vdso_tc.c head/sys/kern/sys_generic.c head/sys/kern/sys_getrandom.c head/sys/kern/sys_pipe.c head/sys/kern/sys_process.c head/sys/kern/sysv_ipc.c head/sys/kern/sysv_msg.c head/sys/kern/sysv_sem.c head/sys/kern/sysv_shm.c head/sys/kern/tty.c head/sys/kern/tty_compat.c head/sys/kern/uipc_mqueue.c head/sys/kern/uipc_sem.c head/sys/kern/uipc_socket.c head/sys/kern/uipc_syscalls.c head/sys/kern/vfs_aio.c head/sys/kern/vfs_bio.c head/sys/kern/vfs_subr.c head/sys/kern/vfs_syscalls.c head/sys/mips/include/reg.h head/sys/mips/include/sigframe.h head/sys/mips/include/tls.h head/sys/mips/include/ucontext.h head/sys/mips/mips/freebsd32_machdep.c head/sys/mips/mips/pm_machdep.c head/sys/mips/mips/swtch.S head/sys/mips/mips/trap.c head/sys/mips/mips/vm_machdep.c head/sys/modules/aac/Makefile head/sys/modules/aacraid/Makefile head/sys/modules/cam/Makefile head/sys/modules/cryptodev/Makefile head/sys/modules/cuse/Makefile head/sys/modules/drm2/drm2/Makefile head/sys/modules/drm2/i915kms/Makefile head/sys/modules/drm2/radeonkms/Makefile head/sys/modules/dtrace/dtrace/Makefile head/sys/modules/dtrace/dtraceall/Makefile head/sys/modules/dtrace/dtraceall/dtraceall.c head/sys/modules/dtrace/fasttrap/Makefile head/sys/modules/filemon/Makefile head/sys/modules/hyperv/vmbus/Makefile head/sys/modules/if_tap/Makefile head/sys/modules/isp/Makefile head/sys/modules/kbdmux/Makefile head/sys/modules/linux/Makefile head/sys/modules/linux64/Makefile head/sys/modules/linux_common/Makefile head/sys/modules/mfi/Makefile head/sys/modules/mpr/Makefile head/sys/modules/mps/Makefile head/sys/modules/mqueue/Makefile head/sys/modules/procfs/Makefile head/sys/modules/rp/Makefile head/sys/modules/sem/Makefile head/sys/modules/sgx/Makefile head/sys/modules/sio/Makefile head/sys/modules/sysvipc/sysvmsg/Makefile head/sys/modules/sysvipc/sysvsem/Makefile head/sys/modules/sysvipc/sysvshm/Makefile head/sys/modules/usb/ukbd/Makefile head/sys/modules/vkbd/Makefile head/sys/net/bpf.c head/sys/net/if.c head/sys/net/if_tap.c head/sys/net/rtsock.c head/sys/netinet/in_jail.c head/sys/netinet/in_prot.c head/sys/netinet/sctp_os_bsd.h head/sys/netinet/sctp_syscalls.c head/sys/netinet/tcp_subr.c head/sys/netinet6/in6.c head/sys/netinet6/in6_jail.c head/sys/opencrypto/cryptodev.c head/sys/powerpc/aim/aim_machdep.c head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/booke/booke_machdep.c head/sys/powerpc/include/reg.h head/sys/powerpc/powerpc/exec_machdep.c head/sys/powerpc/powerpc/machdep.c head/sys/powerpc/powerpc/ptrace_machdep.c head/sys/powerpc/powerpc/sys_machdep.c head/sys/sparc64/sparc64/exception.S head/sys/sparc64/sparc64/machdep.c head/sys/vm/swap_pager.c head/sys/vm/vm_meter.c head/sys/vm/vm_mmap.c head/sys/vm/vm_unix.c head/sys/x86/x86/cpu_machdep.c head/sys/x86/x86/tsc.c Modified: head/sys/amd64/amd64/db_trace.c ============================================================================== --- head/sys/amd64/amd64/db_trace.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/db_trace.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/amd64/exception.S ============================================================================== --- head/sys/amd64/amd64/exception.S Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/exception.S Fri Apr 6 17:35:35 2018 (r332122) @@ -39,7 +39,6 @@ */ #include "opt_atpic.h" -#include "opt_compat.h" #include "opt_hwpmc_hooks.h" #include "assym.inc" Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/genassym.c Fri Apr 6 17:35:35 2018 (r332122) @@ -37,7 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- head/sys/amd64/amd64/ptrace_machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/ptrace_machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/amd64/vm_machdep.c ============================================================================== --- head/sys/amd64/amd64/vm_machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/amd64/vm_machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/ia32/ia32_misc.c ============================================================================== --- head/sys/amd64/ia32/ia32_misc.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/ia32/ia32_misc.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/ia32/ia32_reg.c ============================================================================== --- head/sys/amd64/ia32/ia32_reg.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/ia32/ia32_reg.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/ia32/ia32_signal.c ============================================================================== --- head/sys/amd64/ia32/ia32_signal.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/ia32/ia32_signal.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/ia32/ia32_sigtramp.S ============================================================================== --- head/sys/amd64/ia32/ia32_sigtramp.S Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/ia32/ia32_sigtramp.S Fri Apr 6 17:35:35 2018 (r332122) @@ -26,8 +26,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <machine/asmacros.h> #include <sys/syscall.h> Modified: head/sys/amd64/ia32/ia32_syscall.c ============================================================================== --- head/sys/amd64/ia32/ia32_syscall.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/ia32/ia32_syscall.c Fri Apr 6 17:35:35 2018 (r332122) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_clock.h" -#include "opt_compat.h" #include "opt_cpu.h" #include "opt_isa.h" Modified: head/sys/amd64/linux/linux_dummy.c ============================================================================== --- head/sys/amd64/linux/linux_dummy.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux/linux_dummy.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/linux/linux_sysvec.c ============================================================================== --- head/sys/amd64/linux/linux_sysvec.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux/linux_sysvec.c Fri Apr 6 17:35:35 2018 (r332122) @@ -34,8 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #define __ELF_WORD_SIZE 64 #include <sys/param.h> Modified: head/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- head/sys/amd64/linux32/linux32_dummy.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux32/linux32_dummy.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- head/sys/amd64/linux32/linux32_machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux32/linux32_machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysent.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux32/linux32_sysent.c Fri Apr 6 17:35:35 2018 (r332122) @@ -5,7 +5,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" #include <sys/param.h> #include <sys/sysent.h> #include <sys/sysproto.h> Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux32/linux32_sysvec.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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!" Modified: head/sys/amd64/linux32/syscalls.master ============================================================================== --- head/sys/amd64/linux32/syscalls.master Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/amd64/linux32/syscalls.master Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/arm/arm/machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/arm/arm/vm_machdep.c ============================================================================== --- head/sys/arm/arm/vm_machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/arm/arm/vm_machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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$"); Modified: head/sys/arm64/arm64/machdep.c ============================================================================== --- head/sys/arm64/arm64/machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/arm64/arm64/machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -26,7 +26,6 @@ */ #include "opt_acpi.h" -#include "opt_compat.h" #include "opt_platform.h" #include "opt_ddb.h" Modified: head/sys/cam/scsi/scsi_enc.c ============================================================================== --- head/sys/cam/scsi/scsi_enc.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/cam/scsi/scsi_enc.c Fri Apr 6 17:35:35 2018 (r332122) @@ -29,8 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include <sys/param.h> #include <sys/conf.h> Modified: head/sys/cam/scsi/scsi_pass.c ============================================================================== --- head/sys/cam/scsi/scsi_pass.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/cam/scsi/scsi_pass.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/compat/freebsd32/freebsd32_ioctl.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_ioctl.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/freebsd32/freebsd32_ioctl.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/freebsd32/freebsd32_misc.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Apr 6 17:35:35 2018 (r332122) @@ -5,8 +5,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/sysent.h> #include <sys/sysproto.h> Modified: head/sys/compat/ia32/ia32_genassym.c ============================================================================== --- head/sys/compat/ia32/ia32_genassym.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/ia32/ia32_genassym.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/compat/ia32/ia32_sysvec.c ============================================================================== --- head/sys/compat/ia32/ia32_sysvec.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/ia32/ia32_sysvec.c Fri Apr 6 17:35:35 2018 (r332122) @@ -30,8 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #define __ELF_WORD_SIZE 32 #include <sys/param.h> Modified: head/sys/compat/linux/linux_util.c ============================================================================== --- head/sys/compat/linux/linux_util.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/compat/linux/linux_util.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/conf/options Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/conf/options.amd64 ============================================================================== --- head/sys/conf/options.amd64 Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/conf/options.amd64 Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/conf/options.arm64 ============================================================================== --- head/sys/conf/options.arm64 Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/conf/options.arm64 Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/conf/options.mips ============================================================================== --- head/sys/conf/options.mips Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/conf/options.mips Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/conf/options.powerpc ============================================================================== --- head/sys/conf/options.powerpc Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/conf/options.powerpc Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/dev/aac/aac.c ============================================================================== --- head/sys/dev/aac/aac.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/aac/aac.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/aacraid/aacraid.c ============================================================================== --- head/sys/dev/aacraid/aacraid.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/aacraid/aacraid.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/acpica/acpi_hpet.c ============================================================================== --- head/sys/dev/acpica/acpi_hpet.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/acpica/acpi_hpet.c Fri Apr 6 17:35:35 2018 (r332122) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" -#include "opt_compat.h" #if defined(__amd64__) #define DEV_APIC Modified: head/sys/dev/atkbdc/atkbd.c ============================================================================== --- head/sys/dev/atkbdc/atkbd.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/atkbdc/atkbd.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/dev/cy/cy.c ============================================================================== --- head/sys/dev/cy/cy.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/cy/cy.c Fri Apr 6 17:35:35 2018 (r332122) @@ -33,8 +33,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - /* * TODO: * Atomic COR change. Modified: head/sys/dev/drm2/drmP.h ============================================================================== --- head/sys/dev/drm2/drmP.h Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/drm2/drmP.h Fri Apr 6 17:35:35 2018 (r332122) @@ -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 Modified: head/sys/dev/drm2/drm_ioc32.c ============================================================================== --- head/sys/dev/drm2/drm_ioc32.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/drm2/drm_ioc32.c Fri Apr 6 17:35:35 2018 (r332122) @@ -25,8 +25,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #ifdef COMPAT_FREEBSD32 #include <dev/drm2/drmP.h> Modified: head/sys/dev/drm2/i915/i915_ioc32.c ============================================================================== --- head/sys/dev/drm2/i915/i915_ioc32.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/drm2/i915/i915_ioc32.c Fri Apr 6 17:35:35 2018 (r332122) @@ -30,8 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #ifdef COMPAT_FREEBSD32 /** @file i915_ioc32.c Modified: head/sys/dev/drm2/radeon/radeon_ioc32.c ============================================================================== --- head/sys/dev/drm2/radeon/radeon_ioc32.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/drm2/radeon/radeon_ioc32.c Fri Apr 6 17:35:35 2018 (r332122) @@ -31,8 +31,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #ifdef COMPAT_FREEBSD32 #include <dev/drm2/drmP.h> Modified: head/sys/dev/filemon/filemon.c ============================================================================== --- head/sys/dev/filemon/filemon.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/filemon/filemon.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- head/sys/dev/filemon/filemon_wrapper.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/filemon/filemon_wrapper.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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; Modified: head/sys/dev/kbdmux/kbdmux.c ============================================================================== --- head/sys/dev/kbdmux/kbdmux.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/kbdmux/kbdmux.c Fri Apr 6 17:35:35 2018 (r332122) @@ -33,7 +33,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" #include "opt_evdev.h" #include "opt_kbd.h" #include "opt_kbdmux.h" Modified: head/sys/dev/md/md.c ============================================================================== --- head/sys/dev/md/md.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/md/md.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/dev/mfi/mfi.c ============================================================================== --- head/sys/dev/mfi/mfi.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/mfi/mfi.c Fri Apr 6 17:35:35 2018 (r332122) @@ -55,7 +55,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_mfi.h" #include <sys/param.h> Modified: head/sys/dev/mpr/mpr_user.c ============================================================================== --- head/sys/dev/mpr/mpr_user.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/mpr/mpr_user.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/mps/mps_user.c ============================================================================== --- head/sys/dev/mps/mps_user.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/mps/mps_user.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/mrsas/mrsas_linux.c ============================================================================== --- head/sys/dev/mrsas/mrsas_linux.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/mrsas/mrsas_linux.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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 */ Modified: head/sys/dev/null/null.c ============================================================================== --- head/sys/dev/null/null.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/null/null.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/pci/pci_user.c ============================================================================== --- head/sys/dev/pci/pci_user.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/pci/pci_user.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/rp/rp.c ============================================================================== --- head/sys/dev/rp/rp.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/rp/rp.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/dev/sio/sio.c ============================================================================== --- head/sys/dev/sio/sio.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/sio/sio.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/dev/syscons/scvidctl.c ============================================================================== --- head/sys/dev/syscons/scvidctl.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/syscons/scvidctl.c Fri Apr 6 17:35:35 2018 (r332122) @@ -32,7 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_syscons.h" #include <sys/param.h> Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/syscons/syscons.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/dev/uart/uart_kbd_sun.c ============================================================================== --- head/sys/dev/uart/uart_kbd_sun.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/uart/uart_kbd_sun.c Fri Apr 6 17:35:35 2018 (r332122) @@ -29,7 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_kbd.h" #include "opt_sunkbd.h" Modified: head/sys/dev/usb/input/ukbd.c ============================================================================== --- head/sys/dev/usb/input/ukbd.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/usb/input/ukbd.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/dev/vkbd/vkbd.c ============================================================================== --- head/sys/dev/vkbd/vkbd.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/vkbd/vkbd.c Fri Apr 6 17:35:35 2018 (r332122) @@ -33,7 +33,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" #include "opt_kbd.h" #include <sys/param.h> Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/dev/vt/vt_core.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/fs/cuse/cuse.c ============================================================================== --- head/sys/fs/cuse/cuse.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/cuse/cuse.c Fri Apr 6 17:35:35 2018 (r332122) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_compat.h" - #include <sys/stdint.h> #include <sys/stddef.h> #include <sys/param.h> Modified: head/sys/fs/devfs/devfs_devs.c ============================================================================== --- head/sys/fs/devfs/devfs_devs.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/devfs/devfs_devs.c Fri Apr 6 17:35:35 2018 (r332122) @@ -30,8 +30,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> Modified: head/sys/fs/procfs/procfs_dbregs.c ============================================================================== --- head/sys/fs/procfs/procfs_dbregs.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/procfs/procfs_dbregs.c Fri Apr 6 17:35:35 2018 (r332122) @@ -45,8 +45,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> Modified: head/sys/fs/procfs/procfs_fpregs.c ============================================================================== --- head/sys/fs/procfs/procfs_fpregs.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/procfs/procfs_fpregs.c Fri Apr 6 17:35:35 2018 (r332122) @@ -39,8 +39,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> Modified: head/sys/fs/procfs/procfs_ioctl.c ============================================================================== --- head/sys/fs/procfs/procfs_ioctl.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/procfs/procfs_ioctl.c Fri Apr 6 17:35:35 2018 (r332122) @@ -30,8 +30,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/lock.h> #include <sys/mutex.h> Modified: head/sys/fs/procfs/procfs_map.c ============================================================================== --- head/sys/fs/procfs/procfs_map.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/procfs/procfs_map.c Fri Apr 6 17:35:35 2018 (r332122) @@ -37,8 +37,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> Modified: head/sys/fs/procfs/procfs_regs.c ============================================================================== --- head/sys/fs/procfs/procfs_regs.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/fs/procfs/procfs_regs.c Fri Apr 6 17:35:35 2018 (r332122) @@ -39,8 +39,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> Modified: head/sys/geom/geom_dev.c ============================================================================== --- head/sys/geom/geom_dev.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/geom/geom_dev.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/i386/i386/genassym.c ============================================================================== --- head/sys/i386/i386/genassym.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/i386/i386/genassym.c Fri Apr 6 17:35:35 2018 (r332122) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_apic.h" -#include "opt_compat.h" #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" Modified: head/sys/i386/i386/locore.s ============================================================================== --- head/sys/i386/i386/locore.s Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/i386/i386/locore.s Fri Apr 6 17:35:35 2018 (r332122) @@ -40,7 +40,6 @@ */ #include "opt_bootp.h" -#include "opt_compat.h" #include "opt_nfsroot.h" #include "opt_pmap.h" Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/i386/i386/machdep.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/i386/i386/sigtramp.s ============================================================================== --- head/sys/i386/i386/sigtramp.s Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/i386/i386/sigtramp.s Fri Apr 6 17:35:35 2018 (r332122) @@ -39,8 +39,6 @@ * and many others. */ -#include "opt_compat.h" - #include <sys/syscall.h> #include <machine/asmacros.h> #include <machine/psl.h> Modified: head/sys/i386/linux/linux_dummy.c ============================================================================== --- head/sys/i386/linux/linux_dummy.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/i386/linux/linux_dummy.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/imgact_elf.c Fri Apr 6 17:35:35 2018 (r332122) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include <sys/param.h> #include <sys/capsicum.h> Modified: head/sys/kern/init_sysent.c ============================================================================== --- head/sys/kern/init_sysent.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/init_sysent.c Fri Apr 6 17:35:35 2018 (r332122) @@ -5,8 +5,6 @@ * $FreeBSD$ */ -#include "opt_compat.h" - #include <sys/param.h> #include <sys/sysent.h> #include <sys/sysproto.h> Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_descrip.c Fri Apr 6 17:35:35 2018 (r332122) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include "opt_ddb.h" #include "opt_ktrace.h" Modified: head/sys/kern/kern_event.c ============================================================================== --- head/sys/kern/kern_event.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_event.c Fri Apr 6 17:35:35 2018 (r332122) @@ -31,7 +31,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_ktrace.h" #include "opt_kqueue.h" Modified: head/sys/kern/kern_exec.c ============================================================================== --- head/sys/kern/kern_exec.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_exec.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_exit.c Fri Apr 6 17:35:35 2018 (r332122) @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_jail.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_mib.c Fri Apr 6 17:35:35 2018 (r332122) @@ -40,7 +40,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" Modified: head/sys/kern/kern_module.c ============================================================================== --- head/sys/kern/kern_module.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_module.c Fri Apr 6 17:35:35 2018 (r332122) @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_compat.h" - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: head/sys/kern/kern_proc.c ============================================================================== --- head/sys/kern/kern_proc.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_proc.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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" Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_prot.c Fri Apr 6 17:35:35 2018 (r332122) @@ -46,7 +46,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_inet.h" #include "opt_inet6.h" Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_resource.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/kern/kern_sendfile.c ============================================================================== --- head/sys/kern/kern_sendfile.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_sendfile.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/kern/kern_sharedpage.c ============================================================================== --- head/sys/kern/kern_sharedpage.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_sharedpage.c Fri Apr 6 17:35:35 2018 (r332122) @@ -33,7 +33,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_vm.h" #include <sys/param.h> Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_sig.c Fri Apr 6 17:35:35 2018 (r332122) @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_sysctl.c Fri Apr 6 17:35:35 2018 (r332122) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_tc.c Fri Apr 6 17:35:35 2018 (r332122) @@ -21,7 +21,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_ntp.h" #include "opt_ffclock.h" Modified: head/sys/kern/kern_thr.c ============================================================================== --- head/sys/kern/kern_thr.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_thr.c Fri Apr 6 17:35:35 2018 (r332122) @@ -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> Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_umtx.c Fri Apr 6 17:35:35 2018 (r332122) @@ -34,7 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_umtx_profiling.h" #include <sys/param.h> Modified: head/sys/kern/kern_xxx.c ============================================================================== --- head/sys/kern/kern_xxx.c Fri Apr 6 17:23:47 2018 (r332121) +++ head/sys/kern/kern_xxx.c Fri Apr 6 17:35:35 2018 (r332122) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804061735.w36HZaOD071891>