Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Feb 2023 16:08:07 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 06c07e120332 - main - Complete removal of opt_compat.h
Message-ID:  <202302131608.31DG875C026218@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=06c07e1203324bfe8ab4526c82dbb750864272d5

commit 06c07e1203324bfe8ab4526c82dbb750864272d5
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-02-13 16:07:38 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-02-13 16:07:38 +0000

    Complete removal of opt_compat.h
    
    Since Linux emulation layer build options was removed there is no reason
    to keep opt_compat.h.
    
    Reviewed by:            emaste
    Differential Revision:  https://reviews.freebsd.org/D38548
    MFC after:              2 weeks
---
 sys/amd64/amd64/trap.c      | 1 -
 sys/conf/options            | 1 -
 sys/i386/i386/trap.c        | 1 -
 sys/modules/crypto/Makefile | 1 -
 sys/opencrypto/crypto.c     | 1 -
 5 files changed, 5 deletions(-)

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 39a2ef1d373f..28ee3a3b6959 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_clock.h"
-#include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
diff --git a/sys/conf/options b/sys/conf/options
index 3b2be66ba602..7855a2f3f20e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -100,7 +100,6 @@ 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
 CY_PCI_FASTINTR
 DEADLKRES	opt_watchdog.h
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index f4f6e7109a16..d80b809eccb5 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_clock.h"
-#include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index b93f8d55c41c..a31a266d7e6d 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -98,7 +98,6 @@ SRCS	+= curve25519.c
 CFLAGS.curve25519.c		+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT}
 
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
-SRCS	+= opt_compat.h
 SRCS	+= opt_ddb.h
 SRCS	+= cbc_mac.c
 SRCS	+= xform_cbc_mac.c
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index 0baa61c089d3..75d00ccb9832 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
  * PURPOSE.
  */
 
-#include "opt_compat.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302131608.31DG875C026218>