diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2018-04-06 17:35:35 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2018-04-06 17:35:35 +0000 |
| commit | 6469bdcdb6a5968dc7edfcfb495d427b4bfdb3dd (patch) | |
| tree | 91aa218d5c7ba678789e2d491820dfe1e29122b4 /sys/kern | |
| parent | d9b41671bfa3cde03ac3795ef8320e718de20086 (diff) | |
| download | src-6469bdcdb6a5968dc7edfcfb495d427b4bfdb3dd.tar.gz src-6469bdcdb6a5968dc7edfcfb495d427b4bfdb3dd.zip | |
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
Notes
Notes:
svn path=/head/; revision=332122
Diffstat (limited to 'sys/kern')
40 files changed, 0 insertions, 53 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index ce07aaab2092..83c9886bee67 100644 --- 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> diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 870a9d401cf2..91a3ff497e29 100644 --- 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> diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index d7ddea6b7346..7dde45285cd4 100644 --- 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" diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 84ae66b75554..9d7740d0e793 100644 --- 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" diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ca1b9798d6c4..21b25e0148c3 100644 --- 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" diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 07b5a1eb611f..f672a2c73581 100644 --- 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> diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index eb6517d01a55..0c0ef218106b 100644 --- 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" diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index aca186ef5df0..ef1cdc334518 100644 --- 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" diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 546a57a5d8c2..5cab5c0d991b 100644 --- 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$"); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index f124767756e4..bcc07d0325fc 100644 --- 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" diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 754880bfcefd..68bd541163d4 100644 --- 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" diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 7f2f3d87b4ea..bed34bf4a7fe 100644 --- 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> diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 913019ca7fbf..caca1e9adf21 100644 --- 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> diff --git a/sys/kern/kern_sharedpage.c b/sys/kern/kern_sharedpage.c index ced0bf8ac8a2..2b1fe70ad333 100644 --- 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> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fb604c41e252..6e2f57deebe0 100644 --- 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> diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index b29eefc15de0..0676db592fee 100644 --- 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> diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index d291bc78fad3..e0b7a03f7510 100644 --- 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" diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 29523d9a0fa4..c9dd0450876a 100644 --- 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> diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index b7b4f70b104a..44bd63ad1bd3 100644 --- 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> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index db66d3ffc540..9db3b439589a 100644 --- 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> diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index 2b3d69808168..5ff5f3d81d4c 100644 --- 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 diff --git a/sys/kern/subr_dummy_vdso_tc.c b/sys/kern/subr_dummy_vdso_tc.c index 79052abad594..d1ce053e0429 100644 --- 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> diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 6e615aca5221..9ab1b07dbf3e 100644 --- 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> diff --git a/sys/kern/sys_getrandom.c b/sys/kern/sys_getrandom.c index f2d51b4c0d92..67881a342a7b 100644 --- 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> diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 469f5243635d..6b852c540794 100644 --- 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$"); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 1e054c0c8a6d..d693200e1150 100644 --- 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> diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index 7e58608d6166..91f69c43e5a9 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_sysvipc.h" #include <sys/param.h> diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index ddc534bc1a03..d9b577a7e16a 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -58,7 +58,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_sysvipc.h" #include <sys/param.h> diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 309d1aa57f1c..8578c311bb82 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -47,7 +47,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_sysvipc.h" #include <sys/param.h> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 24fe9d741bd7..0d9b561d03b5 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -71,7 +71,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_sysvipc.h" #include <sys/param.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 1c37a2034175..26ce6124bf86 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include <sys/param.h> #include <sys/capsicum.h> diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index b61e05859f93..b4bf5e95b524 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -34,8 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - /* * mapping routines for old line discipline (yuck) */ diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 0cc7339b4486..ab07d80b0f1a 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 6133666bc4ea..f2a03f2581b0 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -41,7 +41,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_posix.h" #include <sys/param.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index d920f0f6e5e6..416de462c5b5 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -107,7 +107,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_compat.h" #include "opt_sctp.h" #include <sys/param.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 40df23c9bd0a..4f1e362155e7 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 4b7c4be1be93..ced17ca908b7 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -23,8 +23,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 2022289767b2..df48efba4838 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -86,7 +86,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_map.h> #include <vm/swap_pager.h> -#include "opt_compat.h" #include "opt_swap.h" static MALLOC_DEFINE(M_BIOBUF, "biobuf", "BIO buffer"); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9cd55ac47713..fe958cfbfea2 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -43,7 +43,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_compat.h" #include "opt_ddb.h" #include "opt_watchdog.h" diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index d28c588ebfd9..861a7033b880 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> |