1 files changed, 18 insertions, 16 deletions

diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 227c7fb676c31..cff99c398e5f1 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -585,22 +585,6 @@ alpha_init(pfn, ptb, bim, bip, biv)
 	}
 	snprintf(cpu_model, sizeof(cpu_model), "%s", platform.model);
 
-	/*
-	 * Initalize the real console, so the the bootstrap console is
-	 * no longer necessary.
-	 */
-#ifndef NO_SIO
-	if (platform.cons_init) {
-		platform.cons_init();
-		promcndetach();
-	}
-#else
-	if (platform.cons_init)
-		platform.cons_init();
-	promcndetach();
-	cninit();
-#endif
-
 	/* NO MORE FIRMWARE ACCESS ALLOWED */
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 	/*
@@ -892,6 +876,24 @@ alpha_init(pfn, ptb, bim, bip, biv)
 	}
 
 	/*
+	 * Initalize the real console, so the the bootstrap console is
+	 * no longer necessary.  Note this now involves mutexes as part
+	 * of some operations so needs to be after proc0/thread0/curthread
+	 * become valid.
+	 */
+#ifndef NO_SIO
+	if (platform.cons_init) {
+		platform.cons_init();
+		promcndetach();
+	}
+#else
+	if (platform.cons_init)
+		platform.cons_init();
+	promcndetach();
+	cninit();
+#endif
+
+	/*
 	 * Check to see if promcons needs to make_dev() now,
 	 * doing it before now crashes with kernel stack issues.
 	 */