From 7f68a896dc63c114ab083468664053d3bb9f71e6 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Fri, 9 Dec 2016 18:54:12 +0000 Subject: [PATCH] Add a COMPAT_FREEBSD11 kernel option. Use it wherever COMPAT_FREEBSD10 is currently specified. Reviewed by: glebius, imp, jhb Differential Revision: https://reviews.freebsd.org/D8736 --- sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/MINIMAL | 1 + sys/arm/conf/std.arm | 1 + sys/arm/conf/std.armv6 | 1 + sys/conf/NOTES | 3 +++ sys/conf/options | 1 + sys/i386/conf/GENERIC | 1 + sys/mips/conf/ERL | 1 + sys/mips/conf/JZ4780 | 1 + sys/mips/conf/X1000 | 1 + sys/pc98/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/MPC85XX | 1 + sys/powerpc/conf/MPC85XXSPE | 1 + sys/sparc64/conf/GENERIC | 1 + 16 files changed, 18 insertions(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index bbb2beca541..13c82b55b1c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -57,6 +57,7 @@ options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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 2caf9589376..f30fd8e9c53 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -58,6 +58,7 @@ options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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.arm b/sys/arm/conf/std.arm index 7f3e3dd34b5..d69f06c579f 100644 --- a/sys/arm/conf/std.arm +++ b/sys/arm/conf/std.arm @@ -3,6 +3,7 @@ # $FreeBSD$ options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 # Debugging support. Always need this: makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 81a8f661375..4ee9caff32e 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -42,6 +42,7 @@ options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options VFP # Enable floating point hardware support options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ebb7d424545..06143861557 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -370,6 +370,9 @@ options COMPAT_FREEBSD9 # Enable FreeBSD10 compatibility syscalls options COMPAT_FREEBSD10 +# Enable FreeBSD11 compatibility syscalls +options COMPAT_FREEBSD11 + # Enable Linux Kernel Programming Interface options COMPAT_LINUXKPI diff --git a/sys/conf/options b/sys/conf/options index 289493a5501..07d76390505 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -88,6 +88,7 @@ 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_CLOUDABI32 opt_dontuse.h COMPAT_CLOUDABI64 opt_dontuse.h COMPAT_LINUXKPI opt_compat.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 056e0649964..bdf215a9ca0 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -58,6 +58,7 @@ options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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/ERL b/sys/mips/conf/ERL index 189ba568c38..8be3b8de428 100644 --- a/sys/mips/conf/ERL +++ b/sys/mips/conf/ERL @@ -75,6 +75,7 @@ options GEOM_PART_GPT # GUID Partition Tables. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD32 # Compatible with o32 binaries options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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 c58aa15834b..b9570adc701 100644 --- a/sys/mips/conf/JZ4780 +++ b/sys/mips/conf/JZ4780 @@ -28,6 +28,7 @@ options KDB options BREAK_TO_DEBUGGER options COMPAT_FREEBSD10 +options COMPAT_FREEBSD11 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking diff --git a/sys/mips/conf/X1000 b/sys/mips/conf/X1000 index 0fd16b3b459..3161731c12b 100644 --- a/sys/mips/conf/X1000 +++ b/sys/mips/conf/X1000 @@ -28,6 +28,7 @@ options KDB options BREAK_TO_DEBUGGER options COMPAT_FREEBSD10 +options COMPAT_FREEBSD11 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 0e140c9af8d..3f9364cf30e 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -55,6 +55,7 @@ options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options EPSON_BOUNCEDMA # use bounce buffer for 15-16M #options EPSON_MEMWIN # EPSON memory window support diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 48ea76cd6d1..a48aa28069d 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -64,6 +64,7 @@ options COMPAT_FREEBSD6 #Compatible with FreeBSD6 options COMPAT_FREEBSD7 #Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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 598944473f6..7ebcb7a8f21 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -63,6 +63,7 @@ options COMPAT_FREEBSD6 #Compatible with FreeBSD6 options COMPAT_FREEBSD7 #Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 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 f3ae67d6a8f..a8b4219aca3 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -59,6 +59,7 @@ options SYSVSHM options WITNESS options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 +options COMPAT_FREEBSD11 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 f9a0bc982ab..04db9ed6053 100644 --- a/sys/powerpc/conf/MPC85XXSPE +++ b/sys/powerpc/conf/MPC85XXSPE @@ -59,6 +59,7 @@ options SYSVSHM options WITNESS options WITNESS_SKIPSPIN options COMPAT_FREEBSD10 +options COMPAT_FREEBSD11 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 4e8a31c8579..cdd7734bd27 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -55,6 +55,7 @@ options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support