--- ./sys/cddl/cyclic/i386/cyclic_machdep.c.ORIG	2008-02-02 23:20:07.000000000 -0500
+++ ./sys/cddl/cyclic/i386/cyclic_machdep.c	2008-02-02 23:20:59.000000000 -0500
@@ -73,7 +73,7 @@
 	cyclic_uninit();
 }
 
-static hrtime_t exp_due[SMP_MAXCPU];
+static hrtime_t exp_due[MAXCPU];
 
 /*
  * This function is the one registered by the machine dependent
--- ./sys/cddl/dev/fasttrap/fasttrap.c.ORIG	2008-02-02 23:19:50.000000000 -0500
+++ ./sys/cddl/dev/fasttrap/fasttrap.c	2008-02-02 23:20:36.000000000 -0500
@@ -279,7 +279,7 @@
 
 	fasttrap_mod_gen++;
 
-	for (i = 0; i < SMP_MAXCPU; i++) {
+	for (i = 0; i < MAXCPU; i++) {
 		mtx_lock(&cpu_core[i].cpuc_pid_lock);
 		mtx_unlock(&cpu_core[i].cpuc_pid_lock);
 	}