The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=84d12f887c91fc2e2859edfeb0673fe7f953bd87
commit 84d12f887c91fc2e2859edfeb0673fe7f953bd87
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2023-10-06 09:13:27 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2023-10-10 09:48:22 +0000
Add a COMPAT_FREEBSD14 kernel option
Use it wherever COMPAT_FREEBSD13 is currently specified.
Reviewed by: brooks, zlei
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D42100
---
sys/amd64/conf/FIRECRACKER | 1 +
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/kern/syscalls.master | 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 +
17 files changed, 19 insertions(+)
diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER
index b9cf11543245..590a3059beac 100644
--- a/sys/amd64/conf/FIRECRACKER
+++ b/sys/amd64/conf/FIRECRACKER
@@ -66,6 +66,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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/GENERIC b/sys/amd64/conf/GENERIC
index 8d513fdc5f4c..1c1fde99ba8e 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -67,6 +67,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 c3eca5221890..11f0d5d10c78 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -57,6 +57,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 f60520d7dd2a..b4b83d66809a 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -51,6 +51,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
# DTrace support
options KDTRACE_HOOKS # Kernel DTrace hooks
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
index 5c1e63af1bad..80b4e898bfdc 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -51,6 +51,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
# DTrace support
options KDTRACE_HOOKS # Kernel DTrace hooks
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index a19e7a95ef98..eb4a0238ecdd 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -43,6 +43,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 088bd7426a77..a5ed60792a1f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -365,6 +365,9 @@ options COMPAT_FREEBSD12
# Enable FreeBSD13 compatibility syscalls
options COMPAT_FREEBSD13
+# Enable FreeBSD14 compatibility syscalls
+options COMPAT_FREEBSD14
+
# Enable Linux Kernel Programming Interface
options COMPAT_LINUXKPI
diff --git a/sys/conf/options b/sys/conf/options
index 840f6a9dfffc..2f5aa8ae55c1 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -99,6 +99,7 @@ COMPAT_FREEBSD10 opt_global.h
COMPAT_FREEBSD11 opt_global.h
COMPAT_FREEBSD12 opt_global.h
COMPAT_FREEBSD13 opt_global.h
+COMPAT_FREEBSD14 opt_global.h
COMPAT_LINUXKPI opt_dontuse.h
COMPILING_LINT opt_global.h
CY_PCI_FASTINTR
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 00932195efcd..948c44114d7d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -62,6 +62,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 3d97f84058a9..d8c43d37fbce 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -62,6 +62,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index f7c235ced26c..6692495f0d2d 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -34,6 +34,7 @@
; COMPAT11 included on COMPAT_FREEBSD11 #ifdef (FreeBSD 11 compat)
; COMPAT12 included on COMPAT_FREEBSD12 #ifdef (FreeBSD 12 compat)
; COMPAT13 included on COMPAT_FREEBSD13 #ifdef (FreeBSD 13 compat)
+; COMPAT14 included on COMPAT_FREEBSD14 #ifdef (FreeBSD 14 compat)
; OBSOL obsolete, not included in system, only specifies name
; RESERVED reserved for local or vendor use (not for FreeBSD)
; UNIMPL not implemented, placeholder only
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index b01a88d34138..47c84956facd 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -67,6 +67,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 45897555791a..ac041c420ee0 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -76,6 +76,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 2cd53b860126..d90018802d37 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -71,6 +71,7 @@ options GEOM_LABEL # Provides labelization
options COMPAT_FREEBSD11 # Compatible with FreeBSD11 (required
by ports)
options COMPAT_FREEBSD12 # Compatible with FreeBSD12 (required
by ports)
options COMPAT_FREEBSD13 # Compatible with FreeBSD13
+options COMPAT_FREEBSD14 # Compatible with FreeBSD14
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) syscall trace support
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index e44a35377355..c31f892a4208 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -63,6 +63,7 @@ options COMPAT_FREEBSD10
options COMPAT_FREEBSD11
options COMPAT_FREEBSD12
options COMPAT_FREEBSD13
+options COMPAT_FREEBSD14 # Compatible with FreeBSD14
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 3665da656ed1..8ebc4a41bcb2 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -69,6 +69,7 @@ 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 COMPAT_FREEBSD14 # Compatible with FreeBSD14
options HWPMC_HOOKS
options KDTRACE_HOOKS # Kernel DTrace hooks
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 60b96c52f661..fd871315b27e 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -54,6 +54,7 @@ options GEOM_RAID # Soft RAID
functionality.
options GEOM_LABEL # Provides labelization
options COMPAT_FREEBSD12 # Compatible with FreeBSD12
options COMPAT_FREEBSD13 # Compatible with FreeBSD13
+options COMPAT_FREEBSD14 # Compatible with FreeBSD14
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support
