Index: head/sys/amd64/conf/GENERIC =================================================================== --- head/sys/amd64/conf/GENERIC +++ head/sys/amd64/conf/GENERIC @@ -63,6 +63,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/amd64/conf/MINIMAL =================================================================== --- head/sys/amd64/conf/MINIMAL +++ head/sys/amd64/conf/MINIMAL @@ -60,6 +60,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/arm/conf/std.arm =================================================================== --- head/sys/arm/conf/std.arm +++ head/sys/arm/conf/std.arm @@ -4,6 +4,7 @@ options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 # Debugging support. Always need this: makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols Index: head/sys/arm/conf/std.armv6 =================================================================== --- head/sys/arm/conf/std.armv6 +++ head/sys/arm/conf/std.armv6 @@ -49,6 +49,7 @@ options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks Index: head/sys/arm/conf/std.armv7 =================================================================== --- head/sys/arm/conf/std.armv7 +++ head/sys/arm/conf/std.armv7 @@ -49,6 +49,7 @@ options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks Index: head/sys/arm64/conf/GENERIC =================================================================== --- head/sys/arm64/conf/GENERIC +++ head/sys/arm64/conf/GENERIC @@ -54,6 +54,7 @@ options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD32 # Compatible with FreeBSD/arm options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/conf/NOTES =================================================================== --- head/sys/conf/NOTES +++ head/sys/conf/NOTES @@ -376,6 +376,9 @@ # Enable FreeBSD11 compatibility syscalls options COMPAT_FREEBSD11 +# Enable FreeBSD12 compatibility syscalls +options COMPAT_FREEBSD12 + # Enable Linux Kernel Programming Interface options COMPAT_LINUXKPI Index: head/sys/conf/options =================================================================== --- head/sys/conf/options +++ head/sys/conf/options @@ -88,6 +88,7 @@ COMPAT_FREEBSD9 opt_global.h COMPAT_FREEBSD10 opt_global.h COMPAT_FREEBSD11 opt_global.h +COMPAT_FREEBSD12 opt_global.h COMPAT_CLOUDABI32 opt_dontuse.h COMPAT_CLOUDABI64 opt_dontuse.h COMPAT_LINUXKPI opt_dontuse.h Index: head/sys/i386/conf/GENERIC =================================================================== --- head/sys/i386/conf/GENERIC +++ head/sys/i386/conf/GENERIC @@ -60,6 +60,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/i386/conf/MINIMAL =================================================================== --- head/sys/i386/conf/MINIMAL +++ head/sys/i386/conf/MINIMAL @@ -60,6 +60,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/mips/conf/ERL =================================================================== --- head/sys/mips/conf/ERL +++ head/sys/mips/conf/ERL @@ -75,6 +75,7 @@ options COMPAT_FREEBSD32 # Compatible with o32 binaries options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support Index: head/sys/mips/conf/JZ4780 =================================================================== --- head/sys/mips/conf/JZ4780 +++ head/sys/mips/conf/JZ4780 @@ -31,6 +31,7 @@ options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 +options COMPAT_FREEBSD12 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking Index: head/sys/mips/conf/X1000 =================================================================== --- head/sys/mips/conf/X1000 +++ head/sys/mips/conf/X1000 @@ -29,6 +29,7 @@ options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 +options COMPAT_FREEBSD12 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking Index: head/sys/mips/conf/std.BERI =================================================================== --- head/sys/mips/conf/std.BERI +++ head/sys/mips/conf/std.BERI @@ -33,6 +33,7 @@ options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 +options COMPAT_FREEBSD12 options INTRNG options SCHED_ULE Index: head/sys/powerpc/conf/GENERIC =================================================================== --- head/sys/powerpc/conf/GENERIC +++ head/sys/powerpc/conf/GENERIC @@ -68,6 +68,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options STACK #stack(9) support Index: head/sys/powerpc/conf/GENERIC64 =================================================================== --- head/sys/powerpc/conf/GENERIC64 +++ head/sys/powerpc/conf/GENERIC64 @@ -72,6 +72,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options STACK #stack(9) support Index: head/sys/powerpc/conf/MPC85XX =================================================================== --- head/sys/powerpc/conf/MPC85XX +++ head/sys/powerpc/conf/MPC85XX @@ -61,6 +61,7 @@ options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 +options COMPAT_FREEBSD12 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data Index: head/sys/powerpc/conf/MPC85XXSPE =================================================================== --- head/sys/powerpc/conf/MPC85XXSPE +++ head/sys/powerpc/conf/MPC85XXSPE @@ -62,6 +62,7 @@ options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 +options COMPAT_FREEBSD12 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data Index: head/sys/sparc64/conf/GENERIC =================================================================== --- head/sys/sparc64/conf/GENERIC +++ head/sys/sparc64/conf/GENERIC @@ -58,6 +58,7 @@ options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support