Index: sys/dev/nvme/nvme_qpair.c
===================================================================
--- sys/dev/nvme/nvme_qpair.c
+++ sys/dev/nvme/nvme_qpair.c
@@ -34,6 +34,7 @@
 #include <sys/conf.h>
 #include <sys/domainset.h>
 #include <sys/proc.h>
+#include <sys/smp.h>
 
 #include <dev/pci/pcivar.h>
 
@@ -1061,6 +1062,12 @@
 		tr->deadline = getsbinuptime() + timeout * SBT_1S;
 		if (!qpair->timer_armed) {
 			qpair->timer_armed = true;
+#if !defined(EARLY_AP_STARTUP) && defined(SMP)
+			if (!smp_started)
+				callout_reset(&qpair->timer, hz / 2,
+				    nvme_qpair_timeout, qpair);
+			else
+#endif
 			callout_reset_on(&qpair->timer, hz / 2,
 			    nvme_qpair_timeout, qpair, qpair->cpu);
 		}