Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile
+++ sys/modules/Makefile
@@ -8,6 +8,8 @@
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
+.include "${SYSDIR}/conf/config.mk"
+
 .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .else
@@ -712,9 +714,11 @@
 _smartpqi=	smartpqi
 
 .if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
+.if ${KERN_OPTS:MSMP}
 _vmm=		vmm
 .endif
 .endif
+.endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
@@ -799,8 +803,6 @@
 	fi
 .endif
 
-.include "${SYSDIR}/conf/config.mk"
-
 SUBDIR:= ${SUBDIR:u:O}
 
 .include <bsd.subdir.mk>
Index: sys/modules/dtrace/Makefile
===================================================================
--- sys/modules/dtrace/Makefile
+++ sys/modules/dtrace/Makefile
@@ -2,6 +2,8 @@
 
 .include "Makefile.inc"
 
+.include "${SYSDIR}/conf/config.mk"
+
 SUBDIR=		dtaudit		\
 		dtmalloc	\
 		dtnfscl		\
@@ -10,19 +12,22 @@
 		dtrace_test	\
 		profile		\
 		prototype	\
-		sdt		\
-		systrace
+		sdt
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-SUBDIR+=	fasttrap fbt systrace_linux
+SUBDIR+=	fasttrap fbt
+.if ${KERN_OPTS:MKDTRACE_HOOKS}
+SUBDIR+=	systrace_linux
+.endif
 .endif
-.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64" && ${KERN_OPTS:MKDTRACE_HOOKS}
 SUBDIR+=	systrace_linux32
 .endif
-.if ${MACHINE_CPUARCH} == "amd64" || \
+.if (${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_ARCH} == "mips64" || \
-    ${MACHINE_ARCH} == "powerpc64"
+    ${MACHINE_ARCH} == "powerpc64") && \
+    ${KERN_OPTS:MKDTRACE_HOOKS}
 SUBDIR+=	systrace_freebsd32
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64" || \
@@ -32,5 +37,8 @@
     ${MACHINE_CPUARCH} == "riscv"
 SUBDIR+=	fbt
 .endif
+.if ${KERN_OPTS:MKDTRACE_HOOKS}
+SUBDIR+=	systrace
+.endif
 
 .include <bsd.subdir.mk>