Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision d9ec808b547e5990edc7280d9d8399acd2a5d86f)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 10aaa2ca7463bc8619cc966aae944ce9236cb461)
@@ -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 d9ec808b547e5990edc7280d9d8399acd2a5d86f)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 10aaa2ca7463bc8619cc966aae944ce9236cb461)
@@ -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);