Attach pvbus(4) later just before pci(4). Same change was done for amd64.

Tested on VMware-GENERIC-i386.

OK mlarkin@

1 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 9a471600571..29d17e73a34 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.51 2015/07/21 03:38:22 reyk Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.52 2015/07/23 06:21:37 reyk Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $	*/
 
 /*
@@ -167,14 +167,6 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 	}
 #endif
 
-#if NPVBUS > 0
-	/* Probe first to hide the "not configured" message */
-	if (pvbus_probe()) {
-		mba.mba_pvba.pvba_busname = "pvbus";
-		config_found(self, &mba.mba_pvba.pvba_busname, mainbus_print);
-	}
-#endif
-
 	if ((cpu_info_primary.ci_flags & CPUF_PRESENT) == 0) {
 		struct cpu_attach_args caa;
 
@@ -228,6 +220,14 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 	}
 #endif
 
+#if NPVBUS > 0
+	/* Probe first to hide the "not configured" message */
+	if (pvbus_probe()) {
+		mba.mba_pvba.pvba_busname = "pvbus";
+		config_found(self, &mba.mba_pvba.pvba_busname, mainbus_print);
+	}
+#endif
+
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be