--- ./sys/conf/options.old	Sun Apr 23 20:24:01 2006
+++ ./sys/conf/options	Sun Apr 23 20:06:54 2006
@@ -530,6 +530,7 @@
 
 # Standard SMP options
 SMP			opt_global.h
+MAXCPU
 
 # Size of the kernel message buffer
 MSGBUF_SIZE		opt_msgbuf.h
--- ./sys/amd64/include/param.h.old	Wed Jun 29 15:13:25 2005
+++ ./sys/amd64/include/param.h	Sun Apr 23 20:03:32 2006
@@ -71,6 +71,15 @@
 #define	_MACHINE_ARCH	amd64
 #endif
 
+#ifndef MAXCPU
+#ifdef SMP
+#define MAXCPU          16
+#else
+#define MAXCPU          1
+#endif
+#endif
+
+
 #ifndef _NO_NAMESPACE_POLLUTION
 
 #ifndef _MACHINE_PARAM_H_
@@ -81,12 +90,6 @@
 #endif
 #ifndef MACHINE_ARCH
 #define	MACHINE_ARCH	"amd64"
-
-#ifdef SMP
-#define MAXCPU		16
-#else
-#define MAXCPU		1
 #endif
 
 #define	ALIGNBYTES		_ALIGNBYTES
--- ./sys/alpha/include/param.h.old	Wed Jan  5 20:05:50 2005
+++ ./sys/alpha/include/param.h	Sun Apr 23 21:10:02 2006
@@ -88,10 +88,12 @@
 #include <machine/cpu.h>
 
 #define MAXSMPCPU	8
+#ifndef MAXCPU
 #ifdef SMP
 #define MAXCPU		MAXSMPCPU
 #else
 #define MAXCPU		1
+#endif
 #endif
 
 #define	ALIGNBYTES		_ALIGNBYTES
--- ./sys/arm/include/param.h.old	Sat Nov 20 16:51:32 2004
+++ ./sys/arm/include/param.h	Sun Apr 23 19:33:26 2006
@@ -76,11 +76,13 @@
 #endif
 #define	MID_MACHINE	MID_ARM6 
 
+#ifndef MAXCPU
 #ifdef SMP
-#define	MAXCPU		2
+#define MAXCPU		2
 #else
-#define	MAXCPU		1
-#endif /* SMP */
+#define MAXCPU		1
+#endif
+#endif
 
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)
--- ./sys/i386/include/param.h.old	Sat Nov 20 02:29:49 2004
+++ ./sys/i386/include/param.h	Sun Apr 23 20:04:00 2006
@@ -69,12 +69,6 @@
 #endif
 #define MID_MACHINE	MID_I386
 
-#ifdef SMP
-#define MAXCPU		16
-#else
-#define MAXCPU		1
-#endif /* SMP */
-
 #define ALIGNBYTES	_ALIGNBYTES
 #define ALIGN(p)	_ALIGN(p)
 
@@ -82,6 +76,14 @@
 #define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
 #define PAGE_MASK	(PAGE_SIZE-1)
 #define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
+
+#ifndef MAXCPU
+#ifdef SMP
+#define MAXCPU		16
+#else
+#define	MAXCPU		1
+#endif
+#endif
 
 #ifdef PAE
 #define NPGPTD		4
--- ./sys/ia64/include/param.h.old	Sun Apr 23 21:04:10 2006
+++ ./sys/ia64/include/param.h	Sun Apr 23 21:02:12 2006
@@ -82,11 +82,14 @@
 #define	MACHINE_ARCH	"ia64"
 #endif
 
+#define MAXSMPCPU       4
+#ifndef MAXCPU
 #ifdef SMP
-#define MAXCPU          4
+#define MAXCPU          MAXSMPCPU
 #else
 #define MAXCPU          1
-#endif /* SMP */
+#endif
+#endif
 
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value for all
--- ./sys/sparc64/include/param.h.old	Mon Oct 17 00:19:00 2005
+++ ./sys/sparc64/include/param.h	Sun Apr 23 21:06:10 2006
@@ -66,11 +66,14 @@
 #endif
 #define MID_MACHINE	MID_SPARC64
 
+#ifndef MAXCPU
 #ifdef SMP
-#define MAXCPU		16
+#define MAXCPU          16
 #else
-#define MAXCPU		1
-#endif /* SMP */
+#define MAXCPU          1
+#endif
+#endif
+
 
 #define	INT_SHIFT	2
 #define	PTR_SHIFT	3