diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 6e2c3d1ed670..aceb6e1da793 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -1,181 +1,179 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1994 Christos Zoulas
  * Copyright (c) 1995 Frank van der Linden
  * Copyright (c) 1995 Scott Bartram
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
  * $FreeBSD$
  */
 
 #ifndef	_LINUX_UTIL_H_
 #define	_LINUX_UTIL_H_
 
 #include <sys/uio.h>
 
 extern int linux_debug;
 
 MALLOC_DECLARE(M_LINUX);
 MALLOC_DECLARE(M_EPOLL);
 
-extern char linux_emul_path[];
-
 int linux_pwd_onexec(struct thread *);
 void linux_pwd_onexec_native(struct thread *);
 
 #define DUMMY(s)							\
 LIN_SDT_PROBE_DEFINE0(dummy, s, not_implemented);			\
 int									\
 linux_ ## s(struct thread *td, struct linux_ ## s ## _args *args)	\
 {									\
 	static pid_t pid;						\
 									\
 	if (pid != td->td_proc->p_pid) {				\
 		linux_msg(td, "syscall %s not implemented", #s);	\
 		LIN_SDT_PROBE0(dummy, s, not_implemented);		\
 		pid = td->td_proc->p_pid;				\
 	};								\
 									\
 	return (ENOSYS);						\
 }									\
 struct __hack
 
 /*
  * This is for the syscalls that are not even yet implemented in Linux.
  *
  * They're marked as UNIMPL in syscall.master so it will
  * have nosys record in linux_sysent[].
  */
 #define UNIMPLEMENTED(s)
 
 void linux_msg(const struct thread *td, const char *fmt, ...)
 	__printflike(2, 3);
 
 struct linux_device_handler {
 	char	*bsd_driver_name;
 	char	*linux_driver_name;
 	char	*bsd_device_name;
 	char	*linux_device_name;
 	int	linux_major;
 	int	linux_minor;
 	int	linux_char_device;
 };
 
 struct stat;
 
 int	linux_device_register_handler(struct linux_device_handler *h);
 int	linux_device_unregister_handler(struct linux_device_handler *h);
 char	*linux_driver_get_name_dev(device_t dev);
 int	linux_driver_get_major_minor(const char *node, int *major, int *minor);
 int	linux_vn_get_major_minor(const struct vnode *vn, int *major, int *minor);
 char	*linux_get_char_devices(void);
 void	linux_free_get_char_devices(char *string);
 void	translate_vnhook_major_minor(struct vnode *vp, struct stat *sb);
 
 #if defined(KTR)
 
 #define	KTR_LINUX				KTR_SUBSYS
 #define	LINUX_CTRFMT(nm, fmt)	#nm"("fmt")"
 
 #define	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) do {			\
 		CTR6(KTR_LINUX, LINUX_CTRFMT(f, m),			\
 		    p1, p2, p3, p4, p5, p6);				\
 } while (0)
 
 #define	LINUX_CTR(f)			LINUX_CTR6(f, "", 0, 0, 0, 0, 0, 0)
 #define	LINUX_CTR0(f, m)		LINUX_CTR6(f, m, 0, 0, 0, 0, 0, 0)
 #define	LINUX_CTR1(f, m, p1)		LINUX_CTR6(f, m, p1, 0, 0, 0, 0, 0)
 #define	LINUX_CTR2(f, m, p1, p2)	LINUX_CTR6(f, m, p1, p2, 0, 0, 0, 0)
 #define	LINUX_CTR3(f, m, p1, p2, p3)	LINUX_CTR6(f, m, p1, p2, p3, 0, 0, 0)
 #define	LINUX_CTR4(f, m, p1, p2, p3, p4)	LINUX_CTR6(f, m, p1, p2, p3, p4, 0, 0)
 #define	LINUX_CTR5(f, m, p1, p2, p3, p4, p5)	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, 0)
 #else
 #define	LINUX_CTR(f)
 #define	LINUX_CTR0(f, m)
 #define	LINUX_CTR1(f, m, p1)
 #define	LINUX_CTR2(f, m, p1, p2)
 #define	LINUX_CTR3(f, m, p1, p2, p3)
 #define	LINUX_CTR4(f, m, p1, p2, p3, p4)
 #define	LINUX_CTR5(f, m, p1, p2, p3, p4, p5)
 #define	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6)
 #endif
 
 /*
  * Some macros for rate limiting messages:
  *  - noisy if compat.linux.debug = 1
  *  - print only once if compat.linux.debug > 1
  */
 #define LINUX_RATELIMIT_MSG_NOTTESTED(_what)			\
 	do {						\
 		static int seen = 0;			\
 							\
 		if (seen == 0 && linux_debug >= 2) {			\
 			linux_msg(curthread, "%s is not tested, please report on emulation@FreeBSD.org how it works", _what);	\
 							\
 			if (linux_debug < 3)		\
 				seen = 1;		\
 		}					\
 	} while (0)
 
 #define LINUX_RATELIMIT_MSG(_message)				\
 	do {							\
 		static int seen = 0;				\
 								\
 		if (seen == 0) {				\
 			linux_msg(curthread, _message);		\
 								\
 			if (linux_debug < 3)			\
 				seen = 1;			\
 		}						\
 	} while (0)
 
 #define LINUX_RATELIMIT_MSG_OPT1(_message, _opt1)	 	\
 	do {							\
 		static int seen = 0;				\
 								\
 		if (seen == 0) {				\
 			linux_msg(curthread, _message, _opt1);	\
 								\
 			if (linux_debug < 3)			\
 				seen = 1;			\
 		}						\
 	} while (0)
 
 #define LINUX_RATELIMIT_MSG_OPT2(_message, _opt1, _opt2)	\
 	do {							\
 		static int seen = 0;				\
 								\
 		if (seen == 0) {				\
 			linux_msg(curthread, _message, _opt1, _opt2); \
 								\
 			if (linux_debug < 3)			\
 				seen = 1;			\
 		}						\
 	} while (0)
 
 #endif /* ! _LINUX_UTIL_H_ */
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 2c6aa41a1a18..294a7d595cc6 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,148 +1,147 @@
 # $FreeBSD$
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SFX= 32
 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
 .endif
 
 .PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX}
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 .PATH: ${SRCTOP}/sys/x86/linux
 .endif
 
 KMOD=	linux
 SRCS=	linux${SFX}_dummy_machdep.c \
 	linux_elf32.c \
 	linux_event.c \
 	linux_file.c \
 	linux_fork.c \
 	linux_futex.c \
 	linux_getcwd.c \
 	linux_ioctl.c \
 	linux_ipc.c \
 	linux${SFX}_machdep.c \
 	linux_misc.c \
 	linux_rseq.c \
 	linux_signal.c \
 	linux_socket.c \
 	linux_stats.c \
 	linux${SFX}_syscalls.c \
 	linux_sysctl.c \
 	linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c \
 	linux_time.c \
 	linux_timer.c \
 	linux_uid16.c \
 	linux_vdso.c \
 	opt_inet6.h \
 	opt_ktrace.h \
 	opt_posix.h \
 	bus_if.h \
 	device_if.h \
 	vnode_if.h
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	linux_dummy_x86.c
 VDSODEPS=linux_vdso_gettc_x86.inc
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	linux${SFX}_support.S
 .endif
 DPSRCS=	assym.inc linux${SFX}_genassym.c
 
 # XXX: for assym.inc
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	opt_apic.h opt_cpu.h
 .endif
 
 OBJS=	linux${SFX}_vdso.so
 
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	imgact_linux.c \
 	linux.c \
 	linux_dummy.c \
 	linux_emul.c \
 	linux_errno.c \
 	linux_mib.c \
 	linux_mmap.c \
 	linux_ptrace_machdep.c \
 	linux_util.c \
 	linux_vdso_selector_x86.c \
 	linux_x86.c \
 	linux_copyout.c \
 	linux_netlink.c \
 	opt_netlink.h
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 EXPORT_SYMS=
-EXPORT_SYMS+=	linux_emul_path
 EXPORT_SYMS+=	linux_get_osname
 EXPORT_SYMS+=	linux_get_osrelease
 EXPORT_SYMS+=	linux_ioctl_register_handler
 EXPORT_SYMS+=	linux_ioctl_unregister_handler
 .endif
 
 CLEANFILES=	linux${SFX}_assym.h linux${SFX}_genassym.o linux${SFX}_locore.o \
 		genassym.o linux${SFX}_vdso_gtod.o linux${SFX}_vdso.so.o
 
 linux${SFX}_assym.h: linux${SFX}_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 VDSOFLAGS=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 -m32
 .else
 VDSOFLAGS=-mregparm=0
 .endif
 
 linux${SFX}_locore.o: linux${SFX}_assym.h assym.inc
 	${CC} -c -x assembler-with-cpp -DLOCORE -fPIC -pipe -O2 -Werror \
 	-msoft-float \
 	-fno-common -nostdinc -fasynchronous-unwind-tables \
 	-fno-omit-frame-pointer -foptimize-sibling-calls ${VDSOFLAGS} \
 	-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux${SFX}_vdso_gtod.o: linux_vdso_gtod.inc ${VDSODEPS}
 	${CC} -c -fPIC -pipe -O2 -Werror -msoft-float \
 	-fno-common -nostdinc -fasynchronous-unwind-tables \
 	-fno-omit-frame-pointer -foptimize-sibling-calls ${VDSOFLAGS} \
 	-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux${SFX}_vdso.so.o: linux${SFX}_locore.o linux${SFX}_vdso_gtod.o
 	${LD} -m elf_i386 --shared --eh-frame-hdr -soname=linux-gate.so.1 \
 	--no-undefined --hash-style=both -warn-common -nostdlib \
 	--strip-debug -s --build-id=sha1 --Bsymbolic \
 	-T${SRCTOP}/sys/${MACHINE}/linux${SFX}/linux${SFX}_vdso.lds.s \
 	-o ${.TARGET} ${.ALLSRC:M*.o}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 OBJCOPY_TARGET=--output-target elf64-x86-64-freebsd --binary-architecture i386
 .elif ${MACHINE_CPUARCH} == "i386"
 OBJCOPY_TARGET=--output-target elf32-i386-freebsd --binary-architecture i386
 .else
 .error ${MACHINE_CPUARCH} not yet supported by linux
 .endif
 
 linux${SFX}_vdso.so: linux${SFX}_vdso.so.o
 	${OBJCOPY} --input-target binary ${OBJCOPY_TARGET} \
 	    linux${SFX}_vdso.so.o ${.TARGET}
 	${STRIPBIN} -N _binary_linux${SFX}_vdso_so_o_size ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 linux${SFX}_support.o: linux${SFX}_support.S linux${SFX}_assym.h assym.inc
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.ALLSRC:M*.S:u} -o ${.TARGET}
 .endif
 
 linux${SFX}_genassym.o: offset.inc
 	${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
 .warning Building Linuxulator outside of a kernel does not make sense
 .endif
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile
index b7e59e0ac764..402d3ebc937e 100644
--- a/sys/modules/linux_common/Makefile
+++ b/sys/modules/linux_common/Makefile
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/compat/linux
 .if ${MACHINE_CPUARCH} == "amd64"
 .PATH: ${SRCTOP}/sys/x86/linux
 .endif
 
 KMOD=	linux_common
 SRCS=	linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \
 	linux_dummy.c linux_errno.c linux_netlink.c \
 	linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \
 	opt_netlink.h
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	linux_x86.c linux_vdso_selector_x86.c
 .endif
 
 EXPORT_SYMS=
-EXPORT_SYMS+=	linux_emul_path
 EXPORT_SYMS+=	linux_get_osname
 EXPORT_SYMS+=	linux_get_osrelease
 EXPORT_SYMS+=	linux_use_real_ifname
 
 .if !defined(KERNBUILDDIR)
 .warning Building Linuxulator outside of a kernel does not make sense
 .endif
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>