From owner-p4-projects@FreeBSD.ORG  Sat Jul 21 22:39:43 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AE3816A41F; Sat, 21 Jul 2007 22:39:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2A4716A41B
	for <perforce@freebsd.org>; Sat, 21 Jul 2007 22:39:42 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A047113C459
	for <perforce@freebsd.org>; Sat, 21 Jul 2007 22:39:42 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6LMdgih038019
	for <perforce@freebsd.org>; Sat, 21 Jul 2007 22:39:42 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LMdgHQ038016
	for perforce@freebsd.org; Sat, 21 Jul 2007 22:39:42 GMT
	(envelope-from peter@freebsd.org)
Date: Sat, 21 Jul 2007 22:39:42 GMT
Message-Id: <200707212239.l6LMdgHQ038016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 123870 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 21 Jul 2007 22:39:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=123870

Change 123870 by peter@peter_overcee on 2007/07/21 22:39:35

	Fix startup order bug that causes local apic startup to happen
	in an indeterminate order relative to cpu_startup/printcpuinfo.
	If it happens before printcpuinfo, then the CPUID_HTT turnoff
	won't have happened yet, and it can put both physical cores into
	a htt group.  This is kind of a bandaid.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#73 edit
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#30 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#73 (text+ko) ====

@@ -1065,7 +1065,7 @@
 	mp_topology();
 #endif
 }
-SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
+SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL)
 
 /*
  * Setup the I/O APICs.

==== //depot/projects/hammer/sys/i386/i386/local_apic.c#30 (text+ko) ====

@@ -1069,7 +1069,7 @@
 	mp_topology();
 #endif
 }
-SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL)
+SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL)
 
 /*
  * Setup the I/O APICs.