git: 69834d6c3196 - stable/13 - linux(4): Get rid of the opt_compat.h include.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitry Chagin <dchagin_at_FreeBSD.org>
Date: Sun, 26 Feb 2023 08:11:23 UTC
The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=69834d6c319681cc6719d8b07a1fa9797edaedae

commit 69834d6c319681cc6719d8b07a1fa9797edaedae
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-02-12 17:24:32 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-02-26 08:10:44 +0000

    linux(4): Get rid of the opt_compat.h include.
    
    Since e013e369 COMPAT_LINUX, COMPAT_LINUX32 build options are removed,
    so include of opt_compat.h is no more needed.
    
    MFC after:              2 weeks
    
    (cherry picked from commit 10d16789a383a5b9e007dfd4c2e7844e044eaf7d)
---
 sys/amd64/linux32/linux32_machdep.c   | 2 --
 sys/amd64/linux32/linux32_sysvec.c    | 2 --
 sys/arm64/linux/linux_dummy_machdep.c | 2 --
 sys/compat/linux/linux_event.c        | 2 --
 sys/compat/linux/linux_file.c         | 2 --
 sys/compat/linux/linux_fork.c         | 2 --
 sys/compat/linux/linux_futex.c        | 2 --
 sys/compat/linux/linux_getcwd.c       | 2 --
 sys/compat/linux/linux_ioctl.c        | 2 --
 sys/compat/linux/linux_ipc.c          | 2 --
 sys/compat/linux/linux_misc.c         | 2 --
 sys/compat/linux/linux_signal.c       | 2 --
 sys/compat/linux/linux_socket.c       | 2 --
 sys/compat/linux/linux_stats.c        | 2 --
 sys/compat/linux/linux_sysctl.c       | 2 --
 sys/compat/linux/linux_time.c         | 2 --
 sys/compat/linux/linux_timer.c        | 2 --
 sys/compat/linux/linux_uid16.c        | 2 --
 sys/compat/linux/linux_vdso.c         | 2 --
 sys/i386/linux/linux_copyout.c        | 2 --
 sys/modules/linux/Makefile            | 1 -
 sys/modules/linux64/Makefile          | 1 -
 sys/x86/linux/linux_dummy_x86.c       | 2 --
 23 files changed, 44 deletions(-)

diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 9746c4bd7cdf..5599cbff2525 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/clock.h>
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index c2b54369552f..8afa0f848e62 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -32,8 +32,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c
index 22ad39a84eeb..40cab9baad10 100644
--- a/sys/arm64/linux/linux_dummy_machdep.c
+++ b/sys/arm64/linux/linux_dummy_machdep.c
@@ -28,8 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>
diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c
index f720c471a27b..b6c90970a6dc 100644
--- a/sys/compat/linux/linux_event.c
+++ b/sys/compat/linux/linux_event.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/imgact.h>
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 3b712cf71e60..29a0afaeedda 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -29,8 +29,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/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 2839e865e95f..7ea0f8c4225a 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -31,8 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/imgact.h>
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index d16e047f831c..7d75889d2dce 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/imgact.h>
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 4917641be5e5..304a72d06588 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -38,8 +38,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index cd89c16cad64..29edea547725 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 134e353122c1..5f0c22b49e58 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/shm.h>
 #include <sys/stat.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index b6e23cafdf9f..0e429e0a29ca 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/blist.h>
 #include <sys/fcntl.h>
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 09bcbcef4427..26da86eba9f7 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <security/audit/audit.h>
 
-#include "opt_compat.h"
-
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index a5dd6de9134d..c828be1598a1 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/* XXX we use functions that might not exist. */
-#include "opt_compat.h"
 #include "opt_inet6.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index a1cc2bb7bf8b..1049cb54748b 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/dirent.h>
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 36f76c088ca3..abf2c898902d 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index 32db84a570b9..c35d257cd78c 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$");
 __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $");
 #endif
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c
index 3e844704f132..4b888eac7718 100644
--- a/sys/compat/linux/linux_timer.c
+++ b/sys/compat/linux/linux_timer.c
@@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/signal.h>
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index 4dd4129cfa0b..149d75459bc8 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/fcntl.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c
index dc82f614e5f0..9b013b0b7fe8 100644
--- a/sys/compat/linux/linux_vdso.c
+++ b/sys/compat/linux/linux_vdso.c
@@ -26,8 +26,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
 #define	__ELF_WORD_SIZE	32
 #else
diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c
index 5672787d5df7..3227d904a235 100644
--- a/sys/i386/linux/linux_copyout.c
+++ b/sys/i386/linux/linux_copyout.c
@@ -31,8 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/imgact.h>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index dd6536f1c174..d23be5421b16 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -34,7 +34,6 @@ SRCS=	linux${SFX}_dummy_machdep.c \
 	linux_timer.c \
 	linux_uid16.c \
 	linux_vdso.c \
-	opt_compat.h \
 	opt_inet6.h \
 	opt_ktrace.h \
 	opt_posix.h \
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index 0857f4e7126f..a9bb4d2e8f73 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -29,7 +29,6 @@ SRCS=	linux_dummy_machdep.c \
 	linux_time.c \
 	linux_vdso.c \
 	linux_timer.c \
-	opt_compat.h \
 	opt_ktrace.h \
 	opt_inet6.h \
 	opt_posix.h \
diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c
index c48443096180..54799c1f0df2 100644
--- a/sys/x86/linux/linux_dummy_x86.c
+++ b/sys/x86/linux/linux_dummy_x86.c
@@ -28,8 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>