Index: sys/amd64/include/param.h
===================================================================
--- sys/amd64/include/param.h
+++ sys/amd64/include/param.h
@@ -65,13 +65,13 @@
 #define	MACHINE_ARCH32	"i386"
 #endif
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define MAXCPU		256
 #endif
 #else
 #define MAXCPU		1
-#endif
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	8
Index: sys/arm/include/param.h
===================================================================
--- sys/arm/include/param.h
+++ sys/arm/include/param.h
@@ -75,13 +75,13 @@
 #define	MACHINE_ARCH	"arm" _V_SUFFIX _EB_SUFFIX
 #endif
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define	MAXCPU		4
 #endif
 #else
 #define	MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1
Index: sys/arm64/include/param.h
===================================================================
--- sys/arm64/include/param.h
+++ sys/arm64/include/param.h
@@ -54,13 +54,13 @@
 #define	MACHINE_ARCH32	"armv7"
 #endif
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define	MAXCPU		256
 #endif
 #else
 #define	MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	2
Index: sys/i386/include/param.h
===================================================================
--- sys/i386/include/param.h
+++ sys/i386/include/param.h
@@ -58,13 +58,13 @@
 #endif
 #define MID_MACHINE	MID_I386
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define MAXCPU		32
 #endif
 #else
 #define MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1
Index: sys/mips/include/param.h
===================================================================
--- sys/mips/include/param.h
+++ sys/mips/include/param.h
@@ -104,7 +104,7 @@
 #else
 #define	MAXSMPCPU	1
 #define	MAXCPU		1
-#endif
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1
Index: sys/powerpc/include/param.h
===================================================================
--- sys/powerpc/include/param.h
+++ sys/powerpc/include/param.h
@@ -73,13 +73,13 @@
 #endif
 #endif
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define	MAXCPU		256
 #endif
 #else
 #define	MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1
Index: sys/riscv/include/param.h
===================================================================
--- sys/riscv/include/param.h
+++ sys/riscv/include/param.h
@@ -49,13 +49,13 @@
 #define	MACHINE_ARCH	"riscv64"
 #endif
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define	MAXCPU		16
 #endif
 #else
 #define	MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1
Index: sys/sparc64/include/param.h
===================================================================
--- sys/sparc64/include/param.h
+++ sys/sparc64/include/param.h
@@ -51,13 +51,13 @@
 #endif
 #define MID_MACHINE	MID_SPARC64
 
-#if defined(SMP) || defined(KLD_MODULE)
+#if defined(SMP)
 #ifndef MAXCPU
 #define MAXCPU		64
 #endif
 #else
 #define MAXCPU		1
-#endif /* SMP || KLD_MODULE */
+#endif /* SMP */
 
 #ifndef MAXMEMDOM
 #define	MAXMEMDOM	1