From owner-p4-projects@FreeBSD.ORG  Sat Dec 28 19:40:50 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E5C438A9; Sat, 28 Dec 2013 19:40:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A79408A7
 for <perforce@freebsd.org>; Sat, 28 Dec 2013 19:40:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 932B514D6
 for <perforce@freebsd.org>; Sat, 28 Dec 2013 19:40:49 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSJenkB048434
 for <perforce@freebsd.org>; Sat, 28 Dec 2013 19:40:49 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBSJengw048431
 for perforce@freebsd.org; Sat, 28 Dec 2013 19:40:49 GMT
 (envelope-from jhb@freebsd.org)
Date: Sat, 28 Dec 2013 19:40:49 GMT
Message-Id: <201312281940.rBSJengw048431@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1189575 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Dec 2013 19:40:50 -0000

http://p4web.freebsd.org/@@1189575?ac=10

Change 1189575 by jhb@jhb_pippin on 2013/12/28 19:40:11

	Reapply this diff.

Affected files ...

.. //depot/projects/multipass/sys/x86/x86/legacy.c#2 edit

Differences ...

==== //depot/projects/multipass/sys/x86/x86/legacy.c#2 (text+ko) ====

@@ -108,7 +108,8 @@
 };
 static devclass_t legacy_devclass;
 
-DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0);
+EARLY_DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0,
+    BUS_PASS_BUS);
 
 static int
 legacy_probe(device_t dev)
@@ -296,7 +297,7 @@
 	1,		/* no softc */
 };
 static devclass_t cpu_devclass;
-DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0);
+EARLY_DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0, BUS_PASS_CPU);
 
 static void
 cpu_identify(driver_t *driver, device_t parent)
@@ -304,13 +305,8 @@
 	device_t child;
 	int i;
 
-	/*
-	 * Attach a cpuX device for each CPU.  We use an order of 150
-	 * so that these devices are attached after the Host-PCI
-	 * bridges (which are added at order 100).
-	 */
 	CPU_FOREACH(i) {
-		child = BUS_ADD_CHILD(parent, 150, "cpu", i);
+		child = BUS_ADD_CHILD(parent, 0, "cpu", i);
 		if (child == NULL)
 			panic("legacy_attach cpu");
 	}