Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision 219c5302a8e32d74160ae65c1fbfa490273226d9)
+++ kernel/arch/ia32/src/smp/smp.c	(revision 55b56f4f973ad09f0bdbf190d1197e8c4ed8ef6a)
@@ -39,4 +39,5 @@
 #include <arch/boot/boot.h>
 #include <assert.h>
+#include <errno.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -178,5 +179,5 @@
 			 */
 			if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
-			    SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
+			    SYNCH_FLAGS_NONE, NULL) == ETIMEOUT) {
 				log(LF_ARCH, LVL_NOTE, "%s: waiting for cpu%u "
 				    "(APIC ID = %d) timed out", __FUNCTION__,
Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 219c5302a8e32d74160ae65c1fbfa490273226d9)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 55b56f4f973ad09f0bdbf190d1197e8c4ed8ef6a)
@@ -106,6 +106,6 @@
 	waking_up_mid = mid;
 		
-	if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) ==
-	    ESYNCH_TIMEOUT)
+	if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
+	    SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
 		log(LF_ARCH, LVL_NOTE, "%s: waiting for processor (mid = %" PRIu32
 		    ") timed out", __func__, mid);
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 219c5302a8e32d74160ae65c1fbfa490273226d9)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 55b56f4f973ad09f0bdbf190d1197e8c4ed8ef6a)
@@ -373,6 +373,6 @@
 #endif
 	
-	if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
-	    ESYNCH_TIMEOUT)
+	if (waitq_sleep_timeout(&ap_completion_wq, 10000000,
+	    SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
 		printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
 		    __func__, cpuid);