Index: sys/arm/include/param.h
===================================================================
--- sys/arm/include/param.h	(revision 224185)
+++ sys/arm/include/param.h	(working copy)
@@ -61,7 +61,9 @@
 #define	MID_MACHINE	MID_ARM6 
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		2
+#endif
 #else
 #define	MAXCPU		1
 #endif /* SMP || KLD_MODULE */
Index: sys/powerpc/include/param.h
===================================================================
--- sys/powerpc/include/param.h	(revision 224185)
+++ sys/powerpc/include/param.h	(working copy)
@@ -68,7 +68,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		8
+#endif
 #else
 #define	MAXCPU		1
 #endif /* SMP || KLD_MODULE */
Index: sys/sparc64/include/param.h
===================================================================
--- sys/sparc64/include/param.h	(revision 224185)
+++ sys/sparc64/include/param.h	(working copy)
@@ -50,7 +50,9 @@
 #define MID_MACHINE	MID_SPARC64
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		16
+#endif
 #else
 #define MAXCPU		1
 #endif /* SMP || KLD_MODULE */
Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES	(revision 224185)
+++ sys/conf/NOTES	(working copy)
@@ -213,6 +213,10 @@
 # Mandatory:
 options 	SMP			# Symmetric MultiProcessor Kernel
 
+# MAXCPU defines the maximum number of CPUs that can boot in the system.
+# A default value should be already present, for every architecture.
+options 	MAXCPU=32
+
 # ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin
 # if the thread that currently owns the mutex is executing on another
 # CPU.  This behaviour is enabled by default, so this option can be used
Index: sys/conf/options
===================================================================
--- sys/conf/options	(revision 224185)
+++ sys/conf/options	(working copy)
@@ -570,6 +570,7 @@
 DIAGNOSTIC		opt_global.h
 INVARIANT_SUPPORT	opt_global.h
 INVARIANTS		opt_global.h
+MAXCPU			opt_global.h
 MAXPHYS			opt_global.h
 MCLSHIFT		opt_global.h
 MUTEX_DEBUG		opt_global.h
Index: sys/ia64/include/param.h
===================================================================
--- sys/ia64/include/param.h	(revision 224185)
+++ sys/ia64/include/param.h	(working copy)
@@ -62,7 +62,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif
Index: sys/mips/include/param.h
===================================================================
--- sys/mips/include/param.h	(revision 224185)
+++ sys/mips/include/param.h	(working copy)
@@ -87,7 +87,9 @@
 
 #ifdef SMP
 #define	MAXSMPCPU	32
+#ifndef MAXCPU
 #define	MAXCPU		MAXSMPCPU
+#endif
 #else
 #define	MAXSMPCPU	1
 #define	MAXCPU		1
Index: sys/i386/include/param.h
===================================================================
--- sys/i386/include/param.h	(revision 224185)
+++ sys/i386/include/param.h	(working copy)
@@ -68,7 +68,9 @@
 #define MID_MACHINE	MID_I386
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif /* SMP || KLD_MODULE */
Index: sys/amd64/include/param.h
===================================================================
--- sys/amd64/include/param.h	(revision 224185)
+++ sys/amd64/include/param.h	(working copy)
@@ -64,7 +64,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif