The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e85b6489045e05112a141a4b2585613bb5fed09
commit 4e85b6489045e05112a141a4b2585613bb5fed09 Author: Kristof Provost <[email protected]> AuthorDate: 2021-11-15 21:01:34 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2021-11-17 02:08:40 +0000 Add a COMPAT_FREEBSD13 kernel option Use it wherever COMPAT_FREEBSD11 is currently specified. Reviewed by: jhb (previous version) Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33005 --- sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/MINIMAL | 1 + sys/arm/conf/std.armv6 | 1 + sys/arm/conf/std.armv7 | 1 + sys/arm64/conf/std.arm64 | 1 + sys/conf/NOTES | 3 +++ sys/conf/options | 1 + sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 1 + sys/mips/conf/JZ4780 | 1 + sys/mips/conf/X1000 | 1 + sys/mips/conf/std.BERI | 1 + sys/powerpc/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/GENERIC64LE | 1 + sys/powerpc/conf/MPC85XX | 1 + sys/powerpc/conf/MPC85XXSPE | 1 + sys/riscv/conf/GENERIC | 1 + 18 files changed, 20 insertions(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f47b995beb2c..589d81e06dde 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -67,6 +67,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index f724cbd2e3f1..14c07c0f04b6 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -61,6 +61,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index cdfb755eb9c2..47724f176f4a 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -52,6 +52,7 @@ options MAC # Support for Mandatory Access Control (MAC) options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options COMPAT_FREEBSD13 # Compatible with FreeBSD13 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 7512bbaa2939..88c963643a25 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -52,6 +52,7 @@ options MAC # Support for Mandatory Access Control (MAC) options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options COMPAT_FREEBSD13 # Compatible with FreeBSD13 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 599fd2aebeff..e5ed1d7db996 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -43,6 +43,7 @@ options EFIRT # EFI Runtime Services support options COMPAT_FREEBSD32 # Compatible with FreeBSD/arm options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a1f466a7a8b5..79fa149ad33f 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -365,6 +365,9 @@ options COMPAT_FREEBSD11 # Enable FreeBSD12 compatibility syscalls options COMPAT_FREEBSD12 +# Enable FreeBSD13 compatibility syscalls +options COMPAT_FREEBSD13 + # Enable Linux Kernel Programming Interface options COMPAT_LINUXKPI diff --git a/sys/conf/options b/sys/conf/options index a103ab85c1b9..58cb6458b656 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -100,6 +100,7 @@ COMPAT_FREEBSD9 opt_global.h COMPAT_FREEBSD10 opt_global.h COMPAT_FREEBSD11 opt_global.h COMPAT_FREEBSD12 opt_global.h +COMPAT_FREEBSD13 opt_global.h COMPAT_LINUXKPI opt_dontuse.h _COMPAT_LINUX32 opt_compat.h # XXX: make sure opt_compat.h exists COMPILING_LINT opt_global.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 5447c452c4f7..3b5a24a647c0 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -62,6 +62,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 9d735dbb0580..0aa6dff54b50 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -61,6 +61,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/mips/conf/JZ4780 b/sys/mips/conf/JZ4780 index 962334eeffda..df15d55b1d82 100644 --- a/sys/mips/conf/JZ4780 +++ b/sys/mips/conf/JZ4780 @@ -32,6 +32,7 @@ options BREAK_TO_DEBUGGER options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 +options COMPAT_FREEBSD13 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking diff --git a/sys/mips/conf/X1000 b/sys/mips/conf/X1000 index 1b4ab45ce1e2..83bafd71ca4c 100644 --- a/sys/mips/conf/X1000 +++ b/sys/mips/conf/X1000 @@ -30,6 +30,7 @@ options BREAK_TO_DEBUGGER options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 +options COMPAT_FREEBSD13 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking diff --git a/sys/mips/conf/std.BERI b/sys/mips/conf/std.BERI index 965754546d1a..4497d19eb391 100644 --- a/sys/mips/conf/std.BERI +++ b/sys/mips/conf/std.BERI @@ -32,6 +32,7 @@ options CAPABILITIES options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 +options COMPAT_FREEBSD13 options INTRNG options SCHED_ULE diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index cdf1266ec5a6..4897cfb6ae6c 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -69,6 +69,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options STACK #stack(9) support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 93a130e07dc6..c6c8fc2eb00c 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -76,6 +76,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 COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options STACK #stack(9) support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 6bd0c8154673..699ac9f16060 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -68,6 +68,7 @@ options GEOM_LABEL #Provides labelization #options COMPAT_FREEBSD32 #Compatible with FreeBSD/powerpcle binaries options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options STACK #stack(9) support diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index f68f3e6f5f75..0e806aed76a9 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -61,6 +61,7 @@ options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 +options COMPAT_FREEBSD13 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE index 553a616bb707..6445112af1d7 100644 --- a/sys/powerpc/conf/MPC85XXSPE +++ b/sys/powerpc/conf/MPC85XXSPE @@ -62,6 +62,7 @@ options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 +options COMPAT_FREEBSD13 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 28eb77ad4bc1..055574920bb5 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -53,6 +53,7 @@ options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support
